Skip to content

Commit

Permalink
Preprod to main for release v1.6.7 (#622)
Browse files Browse the repository at this point in the history
  • Loading branch information
@loleg
loleg authored Aug 9, 2024
1 parent dccb432 commit 0fa2229
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 56 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/h2non/filetype v1.1.3
github.com/imkira/go-interpol v1.1.0 // indirect
github.com/labstack/gommon v0.4.2
github.com/onsi/gomega v1.33.1
github.com/onsi/gomega v1.34.1
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/robertkrimen/otto v0.4.0
Expand Down Expand Up @@ -101,7 +101,7 @@ require (
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
github.com/yudai/gojsondiff v1.0.0 // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,11 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g=
github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc=
github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down Expand Up @@ -335,8 +335,8 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
Expand Down Expand Up @@ -393,8 +393,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
4 changes: 2 additions & 2 deletions ui/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
"js-sha3": "^0.9.3",
"moment": "^2.30.1",
"popper.js": "^1.14.4",
"sass": "^1.77.6",
"sass": "^1.77.8",
"sortablejs": "^1.15.2",
"tippy.js": "^6.3.7",
"underscore": "^1.8.3",
"underscore": "^1.13.7",
"v-tooltip": "^2.0.0-rc.33",
"velocity-animate": "^1.5.1",
"vis": "^4.21.0",
Expand Down
68 changes: 34 additions & 34 deletions ui/core/src/baseApp.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import WalletInterface from './libs/WalletAdapter'

export default {
data() {
data () {
return {
me: null,
meta: null,
Expand All @@ -16,7 +16,7 @@ export default {
}
},
methods: {
makeURL(uri) {
makeURL (uri) {
let origin = location.origin
if (/.*\/$/.test(origin)) {
origin = origin.substring(0, origin.length - 1)
Expand All @@ -26,7 +26,7 @@ export default {
}
return origin + uri
},
isLangAvailable(lang) {
isLangAvailable (lang) {
if (this.meta && this.meta.activeLangs) {
for (let i = 0; i < this.meta.activeLangs.length; i++) {
if (this.meta.activeLangs[i] &&
Expand All @@ -37,37 +37,37 @@ export default {
}
return false
},
userIsRoot() {
userIsRoot () {
if (this.me) {
return this.me.role === 100
}
return false
},
userIsSuperAdmin() {
userIsSuperAdmin () {
if (this.me) {
return this.me.role > 10
}
return false
},
userIsAdminOrHigher() {
userIsAdminOrHigher () {
if (this.me) {
return this.me.role >= 10
}
return false
},
userIsCreatorOrHigher() {
userIsCreatorOrHigher () {
if (this.me) {
return this.me.role >= 7
}
return false
},
userIsUserOrHigher() {
userIsUserOrHigher () {
if (this.me) {
return this.me.role >= 5
}
return false
},
amIWriteGrantedFor(item) {
amIWriteGrantedFor (item) {
try {
// check authority
if (this.me.role >= 100) {
Expand Down Expand Up @@ -110,7 +110,7 @@ export default {
} catch (e) {}
return false
},
handleError(o) {
handleError (o) {
if (this.isConToServerLostError(o)) {
// couldn't reach the server
if (!this.intervalID) {
Expand All @@ -119,15 +119,15 @@ export default {
}
}
},
isConToServerLostError(o) {
isConToServerLostError (o) {
let txt = ''
try {
txt = o.data || o.request.response || o.request.responseText
} catch (e) {}
return (o.request && !o.response) ||
(window.webpackHotUpdate && /^.*\(ECONNREFUSED\)\.$/m.test(txt))
},
pingService() {
pingService () {
console.log('pingService')
axios.get('/api/config').then((r) => {
if (r.data) {
Expand All @@ -142,10 +142,10 @@ export default {
this.handleError(err)
})
},
getSelectedLang() {
getSelectedLang () {
return this.$cookie.get('lang') || this.fallbackLang()
},
setSelectedLang(lang) {
setSelectedLang (lang) {
if (lang) {
this.$cookie.set('lang', lang, {
expires: '1Y'
Expand All @@ -156,10 +156,10 @@ export default {
this.$i18n.set(this.fallbackLang())
}
},
checkUserHasSession() {
checkUserHasSession () {
return !!localStorage.getItem('userhassession')
},
initUserHasSession(redirectTo) {
initUserHasSession (redirectTo) {
localStorage.setItem('userhassession', true)

const hasRequestedRedirect = new URLSearchParams(window.location.search).get('redirect')
Expand All @@ -170,13 +170,13 @@ export default {
window.location.href = redirectTo
}
},
deleteUserHasSession() {
deleteUserHasSession () {
localStorage.removeItem('userhassession')
},
redirectToLogin (backUrl) {
window.location.href = `/login?redirect=${backUrl}`
},
loadMe(clb) {
loadMe (clb) {
if (!this.checkUserHasSession()) {
return
}
Expand All @@ -196,7 +196,7 @@ export default {
this.handleError(err)
})
},
loadLastExportResults(clb, delParams) {
loadLastExportResults (clb, delParams) {
let url = '/api/export/results'
if (delParams) {
url += '?' + delParams
Expand All @@ -215,7 +215,7 @@ export default {
this.handleError(err)
})
},
loadLastImportResults(clb, delParams) {
loadLastImportResults (clb, delParams) {
let url = '/api/import/results'
if (delParams) {
url += '?' + delParams
Expand All @@ -234,7 +234,7 @@ export default {
this.handleError(err)
})
},
exportData(params, cb, url, name) {
exportData (params, cb, url, name) {
if (!url) {
url = '/api/export?include=' + params
} else {
Expand Down Expand Up @@ -289,7 +289,7 @@ export default {
})
})
},
importData(file, skipExisting, cb) {
importData (file, skipExisting, cb) {
if (!file) {
return
}
Expand Down Expand Up @@ -327,10 +327,10 @@ export default {
this.handleError(err)
})
},
async validateSessionCookie() {
async validateSessionCookie () {
return axios.get('/api/session/validate')
},
loadMeta(clb) {
loadMeta (clb) {
axios.get('/api/i18n/meta').then((response) => {
this.meta = response.data
if (this.meta && this.meta.langFallback) {
Expand All @@ -349,7 +349,7 @@ export default {
this.handleError(err)
})
},
updateLangLabel() {
updateLangLabel () {
if (this.meta && this.meta.activeLangs) {
for (let i = 0; i < this.meta.activeLangs.length; i++) {
this.meta.activeLangs[i].label = this.$t(
Expand All @@ -358,13 +358,13 @@ export default {
return this.meta.activeLangs
}
},
fallbackLang() {
fallbackLang () {
if (this.meta) {
return this.meta.langFallback
}
return null
},
getSelectedLangIndex() {
getSelectedLangIndex () {
if (this.meta && this.meta.activeLangs) {
for (let i = 0; i < this.meta.activeLangs.length; i++) {
if (this.meta.activeLangs[i].Code === this.getSelectedLang()) {
Expand All @@ -374,7 +374,7 @@ export default {
}
return null
},
reloadI18n() {
reloadI18n () {
axios.get('/api/i18n/all').then(
(response) => {
this.$i18n.add(this.getSelectedLang(), response.data)
Expand All @@ -385,7 +385,7 @@ export default {
this.handleError(err)
})
},
loadConfig() {
loadConfig () {
axios.get('/api/config').then(r => {
if (r.data) {
this.setConfig(r.data)
Expand All @@ -394,7 +394,7 @@ export default {
this.handleError(err)
})
},
async setConfig(d) {
async setConfig (d) {
if (d.blockchainNet) {
this.blockchainNet = d.blockchainNet
}
Expand All @@ -410,7 +410,7 @@ export default {
await this.wallet.validateUserNetwork(() => this.$root.$emit('service-off'), () => this.$root.$emit('service-on'))
}
},
acknowledgeFirstLogin() {
acknowledgeFirstLogin () {
// Show the following overlays starting now (they can be delayed)
localStorage.setItem('showFirstLoginMessageOn-documents', new Date())
if (this.userIsCreatorOrHigher()) {
Expand All @@ -420,13 +420,13 @@ export default {
},
computed: {
app: {
get() {
get () {
return this.$root.$children[0]
},
set(a) {}
set (a) {}
}
},
created() {
created () {
const tmpLangToPreventFromWarnings = 'en'
this.$i18n.fallback(tmpLangToPreventFromWarnings)
this.$i18n.set(tmpLangToPreventFromWarnings)
Expand Down
4 changes: 2 additions & 2 deletions ui/wallet/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
"js-sha3": "^0.9.3",
"moment": "^2.30.1",
"popper.js": "^1.14.4",
"sass": "^1.77.6",
"sass": "^1.77.8",
"sortablejs": "^1.15.2",
"tippy.js": "^6.3.7",
"truffle-assertions": "^0.9.1",
"typeahead": "^0.2.2",
"underscore": "^1.8.3",
"underscore": "^1.13.7",
"v-money": "^0.8.1",
"v-tooltip": "^2.0.0-rc.33",
"velocity-animate": "^1.5.1",
Expand Down
16 changes: 8 additions & 8 deletions ui/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10313,10 +10313,10 @@ sass-loader@^10.1.1:
schema-utils "^3.0.0"
semver "^7.3.2"

sass@^1.77.6:
version "1.77.6"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.6.tgz#898845c1348078c2e6d1b64f9ee06b3f8bd489e4"
integrity sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==
sass@^1.77.8:
version "1.77.8"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.8.tgz#9f18b449ea401759ef7ec1752a16373e296b52bd"
integrity sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
Expand Down Expand Up @@ -11504,10 +11504,10 @@ unbox-primitive@^1.0.2:
has-symbols "^1.0.3"
which-boxed-primitive "^1.0.2"

underscore@^1.8.3:
version "1.13.6"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
underscore@^1.13.7:
version "1.13.7"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.7.tgz#970e33963af9a7dda228f17ebe8399e5fbe63a10"
integrity sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==

unicode-canonical-property-names-ecmascript@^2.0.0:
version "2.0.0"
Expand Down

0 comments on commit 0fa2229

Please sign in to comment.