Skip to content

Commit 0fa2229

Browse files
authored
Preprod to main for release v1.6.7 (#622)
1 parent dccb432 commit 0fa2229

File tree

6 files changed

+56
-56
lines changed

6 files changed

+56
-56
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/h2non/filetype v1.1.3
2323
github.com/imkira/go-interpol v1.1.0 // indirect
2424
github.com/labstack/gommon v0.4.2
25-
github.com/onsi/gomega v1.33.1
25+
github.com/onsi/gomega v1.34.1
2626
github.com/patrickmn/go-cache v2.1.0+incompatible
2727
github.com/pkg/errors v0.9.1
2828
github.com/robertkrimen/otto v0.4.0
@@ -101,7 +101,7 @@ require (
101101
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
102102
github.com/yudai/gojsondiff v1.0.0 // indirect
103103
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
104-
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
104+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
105105
golang.org/x/sync v0.7.0 // indirect
106106
golang.org/x/sys v0.22.0 // indirect
107107
golang.org/x/text v0.16.0 // indirect

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,11 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6
219219
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
220220
github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
221221
github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
222-
github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g=
223-
github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc=
222+
github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
223+
github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
224224
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
225-
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
226-
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
225+
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
226+
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
227227
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
228228
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
229229
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -335,8 +335,8 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5
335335
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
336336
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
337337
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
338-
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
339-
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
338+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
339+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
340340
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
341341
golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
342342
golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
@@ -393,8 +393,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
393393
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
394394
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
395395
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
396-
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
397-
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
396+
golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
397+
golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
398398
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
399399
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
400400
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

ui/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
"js-sha3": "^0.9.3",
3939
"moment": "^2.30.1",
4040
"popper.js": "^1.14.4",
41-
"sass": "^1.77.6",
41+
"sass": "^1.77.8",
4242
"sortablejs": "^1.15.2",
4343
"tippy.js": "^6.3.7",
44-
"underscore": "^1.8.3",
44+
"underscore": "^1.13.7",
4545
"v-tooltip": "^2.0.0-rc.33",
4646
"velocity-animate": "^1.5.1",
4747
"vis": "^4.21.0",

ui/core/src/baseApp.js

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import WalletInterface from './libs/WalletAdapter'
22

33
export default {
4-
data() {
4+
data () {
55
return {
66
me: null,
77
meta: null,
@@ -16,7 +16,7 @@ export default {
1616
}
1717
},
1818
methods: {
19-
makeURL(uri) {
19+
makeURL (uri) {
2020
let origin = location.origin
2121
if (/.*\/$/.test(origin)) {
2222
origin = origin.substring(0, origin.length - 1)
@@ -26,7 +26,7 @@ export default {
2626
}
2727
return origin + uri
2828
},
29-
isLangAvailable(lang) {
29+
isLangAvailable (lang) {
3030
if (this.meta && this.meta.activeLangs) {
3131
for (let i = 0; i < this.meta.activeLangs.length; i++) {
3232
if (this.meta.activeLangs[i] &&
@@ -37,37 +37,37 @@ export default {
3737
}
3838
return false
3939
},
40-
userIsRoot() {
40+
userIsRoot () {
4141
if (this.me) {
4242
return this.me.role === 100
4343
}
4444
return false
4545
},
46-
userIsSuperAdmin() {
46+
userIsSuperAdmin () {
4747
if (this.me) {
4848
return this.me.role > 10
4949
}
5050
return false
5151
},
52-
userIsAdminOrHigher() {
52+
userIsAdminOrHigher () {
5353
if (this.me) {
5454
return this.me.role >= 10
5555
}
5656
return false
5757
},
58-
userIsCreatorOrHigher() {
58+
userIsCreatorOrHigher () {
5959
if (this.me) {
6060
return this.me.role >= 7
6161
}
6262
return false
6363
},
64-
userIsUserOrHigher() {
64+
userIsUserOrHigher () {
6565
if (this.me) {
6666
return this.me.role >= 5
6767
}
6868
return false
6969
},
70-
amIWriteGrantedFor(item) {
70+
amIWriteGrantedFor (item) {
7171
try {
7272
// check authority
7373
if (this.me.role >= 100) {
@@ -110,7 +110,7 @@ export default {
110110
} catch (e) {}
111111
return false
112112
},
113-
handleError(o) {
113+
handleError (o) {
114114
if (this.isConToServerLostError(o)) {
115115
// couldn't reach the server
116116
if (!this.intervalID) {
@@ -119,15 +119,15 @@ export default {
119119
}
120120
}
121121
},
122-
isConToServerLostError(o) {
122+
isConToServerLostError (o) {
123123
let txt = ''
124124
try {
125125
txt = o.data || o.request.response || o.request.responseText
126126
} catch (e) {}
127127
return (o.request && !o.response) ||
128128
(window.webpackHotUpdate && /^.*\(ECONNREFUSED\)\.$/m.test(txt))
129129
},
130-
pingService() {
130+
pingService () {
131131
console.log('pingService')
132132
axios.get('/api/config').then((r) => {
133133
if (r.data) {
@@ -142,10 +142,10 @@ export default {
142142
this.handleError(err)
143143
})
144144
},
145-
getSelectedLang() {
145+
getSelectedLang () {
146146
return this.$cookie.get('lang') || this.fallbackLang()
147147
},
148-
setSelectedLang(lang) {
148+
setSelectedLang (lang) {
149149
if (lang) {
150150
this.$cookie.set('lang', lang, {
151151
expires: '1Y'
@@ -156,10 +156,10 @@ export default {
156156
this.$i18n.set(this.fallbackLang())
157157
}
158158
},
159-
checkUserHasSession() {
159+
checkUserHasSession () {
160160
return !!localStorage.getItem('userhassession')
161161
},
162-
initUserHasSession(redirectTo) {
162+
initUserHasSession (redirectTo) {
163163
localStorage.setItem('userhassession', true)
164164

165165
const hasRequestedRedirect = new URLSearchParams(window.location.search).get('redirect')
@@ -170,13 +170,13 @@ export default {
170170
window.location.href = redirectTo
171171
}
172172
},
173-
deleteUserHasSession() {
173+
deleteUserHasSession () {
174174
localStorage.removeItem('userhassession')
175175
},
176176
redirectToLogin (backUrl) {
177177
window.location.href = `/login?redirect=${backUrl}`
178178
},
179-
loadMe(clb) {
179+
loadMe (clb) {
180180
if (!this.checkUserHasSession()) {
181181
return
182182
}
@@ -196,7 +196,7 @@ export default {
196196
this.handleError(err)
197197
})
198198
},
199-
loadLastExportResults(clb, delParams) {
199+
loadLastExportResults (clb, delParams) {
200200
let url = '/api/export/results'
201201
if (delParams) {
202202
url += '?' + delParams
@@ -215,7 +215,7 @@ export default {
215215
this.handleError(err)
216216
})
217217
},
218-
loadLastImportResults(clb, delParams) {
218+
loadLastImportResults (clb, delParams) {
219219
let url = '/api/import/results'
220220
if (delParams) {
221221
url += '?' + delParams
@@ -234,7 +234,7 @@ export default {
234234
this.handleError(err)
235235
})
236236
},
237-
exportData(params, cb, url, name) {
237+
exportData (params, cb, url, name) {
238238
if (!url) {
239239
url = '/api/export?include=' + params
240240
} else {
@@ -289,7 +289,7 @@ export default {
289289
})
290290
})
291291
},
292-
importData(file, skipExisting, cb) {
292+
importData (file, skipExisting, cb) {
293293
if (!file) {
294294
return
295295
}
@@ -327,10 +327,10 @@ export default {
327327
this.handleError(err)
328328
})
329329
},
330-
async validateSessionCookie() {
330+
async validateSessionCookie () {
331331
return axios.get('/api/session/validate')
332332
},
333-
loadMeta(clb) {
333+
loadMeta (clb) {
334334
axios.get('/api/i18n/meta').then((response) => {
335335
this.meta = response.data
336336
if (this.meta && this.meta.langFallback) {
@@ -349,7 +349,7 @@ export default {
349349
this.handleError(err)
350350
})
351351
},
352-
updateLangLabel() {
352+
updateLangLabel () {
353353
if (this.meta && this.meta.activeLangs) {
354354
for (let i = 0; i < this.meta.activeLangs.length; i++) {
355355
this.meta.activeLangs[i].label = this.$t(
@@ -358,13 +358,13 @@ export default {
358358
return this.meta.activeLangs
359359
}
360360
},
361-
fallbackLang() {
361+
fallbackLang () {
362362
if (this.meta) {
363363
return this.meta.langFallback
364364
}
365365
return null
366366
},
367-
getSelectedLangIndex() {
367+
getSelectedLangIndex () {
368368
if (this.meta && this.meta.activeLangs) {
369369
for (let i = 0; i < this.meta.activeLangs.length; i++) {
370370
if (this.meta.activeLangs[i].Code === this.getSelectedLang()) {
@@ -374,7 +374,7 @@ export default {
374374
}
375375
return null
376376
},
377-
reloadI18n() {
377+
reloadI18n () {
378378
axios.get('/api/i18n/all').then(
379379
(response) => {
380380
this.$i18n.add(this.getSelectedLang(), response.data)
@@ -385,7 +385,7 @@ export default {
385385
this.handleError(err)
386386
})
387387
},
388-
loadConfig() {
388+
loadConfig () {
389389
axios.get('/api/config').then(r => {
390390
if (r.data) {
391391
this.setConfig(r.data)
@@ -394,7 +394,7 @@ export default {
394394
this.handleError(err)
395395
})
396396
},
397-
async setConfig(d) {
397+
async setConfig (d) {
398398
if (d.blockchainNet) {
399399
this.blockchainNet = d.blockchainNet
400400
}
@@ -410,7 +410,7 @@ export default {
410410
await this.wallet.validateUserNetwork(() => this.$root.$emit('service-off'), () => this.$root.$emit('service-on'))
411411
}
412412
},
413-
acknowledgeFirstLogin() {
413+
acknowledgeFirstLogin () {
414414
// Show the following overlays starting now (they can be delayed)
415415
localStorage.setItem('showFirstLoginMessageOn-documents', new Date())
416416
if (this.userIsCreatorOrHigher()) {
@@ -420,13 +420,13 @@ export default {
420420
},
421421
computed: {
422422
app: {
423-
get() {
423+
get () {
424424
return this.$root.$children[0]
425425
},
426-
set(a) {}
426+
set (a) {}
427427
}
428428
},
429-
created() {
429+
created () {
430430
const tmpLangToPreventFromWarnings = 'en'
431431
this.$i18n.fallback(tmpLangToPreventFromWarnings)
432432
this.$i18n.set(tmpLangToPreventFromWarnings)

ui/wallet/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
"js-sha3": "^0.9.3",
3030
"moment": "^2.30.1",
3131
"popper.js": "^1.14.4",
32-
"sass": "^1.77.6",
32+
"sass": "^1.77.8",
3333
"sortablejs": "^1.15.2",
3434
"tippy.js": "^6.3.7",
3535
"truffle-assertions": "^0.9.1",
3636
"typeahead": "^0.2.2",
37-
"underscore": "^1.8.3",
37+
"underscore": "^1.13.7",
3838
"v-money": "^0.8.1",
3939
"v-tooltip": "^2.0.0-rc.33",
4040
"velocity-animate": "^1.5.1",

ui/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10313,10 +10313,10 @@ sass-loader@^10.1.1:
1031310313
schema-utils "^3.0.0"
1031410314
semver "^7.3.2"
1031510315

10316-
sass@^1.77.6:
10317-
version "1.77.6"
10318-
resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.6.tgz#898845c1348078c2e6d1b64f9ee06b3f8bd489e4"
10319-
integrity sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==
10316+
sass@^1.77.8:
10317+
version "1.77.8"
10318+
resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.8.tgz#9f18b449ea401759ef7ec1752a16373e296b52bd"
10319+
integrity sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==
1032010320
dependencies:
1032110321
chokidar ">=3.0.0 <4.0.0"
1032210322
immutable "^4.0.0"
@@ -11504,10 +11504,10 @@ unbox-primitive@^1.0.2:
1150411504
has-symbols "^1.0.3"
1150511505
which-boxed-primitive "^1.0.2"
1150611506

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

1151211512
unicode-canonical-property-names-ecmascript@^2.0.0:
1151311513
version "2.0.0"

0 commit comments

Comments
 (0)