valitydev/dashboard
14
0
Fork 0
mirror of https://github.com/valitydev/dashboard.git synced 2024-11-06 02:25:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FR-712: Fix bugs, bump sentry (#543)

Browse Source
This commit is contained in:
Ildar Galeev 2021-08-11 18:30:58 +03:00 committed by GitHub
parent 4394ce9742
commit f9ee7154ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 164 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

199
package-lock.json generated
View File

@ -30,9 +30,9 @@
"@s-libs/micro-dash": "^12.0.0",
"@s-libs/ng-core": "^12.0.0",
"@s-libs/rxjs-core": "^12.0.0",
"@sentry/angular": "^6.4.1",
"@sentry/integrations": "^6.4.1",
"@sentry/tracing": "^6.4.1",
"@sentry/angular": "^6.11.0",
"@sentry/integrations": "^6.11.0",
"@sentry/tracing": "^6.11.0",
"angular-epic-spinners": "^2.0.0",
"angular-file": "^3.0.1",
"angular2-text-mask": "^9.0.0",
@ -4210,13 +4210,14 @@
}
},
"node_modules/@sentry/angular": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-6.4.1.tgz",
"integrity": "sha512-lpbc1nA19SYKzaaYd/kn/xqvxI8oRForAR+lM1iE0yru/56ZrFKoUreqQQjCgtMD5aKfI9cT4VrtIq5PVkfOeA==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-6.11.0.tgz",
"integrity": "sha512-rTfqPdBdnfbYZjq3rDnCUTiu9dSOxLrhSlKM5GTVnUaGH5xTrTmE2vJwfjT+kw46MB5KhcJNok7Ahq9HLuZB3Q==",
"license": "MIT",
"dependencies": {
"@sentry/browser": "6.4.1",
"@sentry/types": "6.4.1",
"@sentry/utils": "6.4.1",
"@sentry/browser": "6.11.0",
"@sentry/types": "6.11.0",
"@sentry/utils": "6.11.0",
"rxjs": "^6.6.0",
"tslib": "^1.9.3"
},
@ -4235,13 +4236,13 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@sentry/browser": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.4.1.tgz",
"integrity": "sha512-3cDud6GWutnJqcnheIq0lPNTsUJbrRLevQ+g1YfawVXFUxfmmY2bOsGd/Mxq17LxYeBHgKTitXv3DU1bsQ+WBQ==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.11.0.tgz",
"integrity": "sha512-Qr2QRA0t5/S9QQqxzYKvM9W8prvmiWuldfwRX4hubovXzcXLgUi4WK0/H612wSbYZ4dNAEcQbtlxFWJNN4wxdg==",
"dependencies": {
"@sentry/core": "6.4.1",
"@sentry/types": "6.4.1",
"@sentry/utils": "6.4.1",
"@sentry/core": "6.11.0",
"@sentry/types": "6.11.0",
"@sentry/utils": "6.11.0",
"tslib": "^1.9.3"
},
"engines": {
@ -4254,14 +4255,14 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@sentry/core": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.4.1.tgz",
"integrity": "sha512-Lx13oTiP+Tjvm5VxulcCszNVd2S1wY4viSnr+ygq62ySVERR+t7uOZDSARZ0rZ259GwW6nkbMh9dDmD0d6VCGQ==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.11.0.tgz",
"integrity": "sha512-09TB+f3pqEq8LFahFWHO6I/4DxHo+NcS52OkbWMDqEi6oNZRD7PhPn3i14LfjsYVv3u3AESU8oxSEGbFrr2UjQ==",
"dependencies": {
"@sentry/hub": "6.4.1",
"@sentry/minimal": "6.4.1",
"@sentry/types": "6.4.1",
"@sentry/utils": "6.4.1",
"@sentry/hub": "6.11.0",
"@sentry/minimal": "6.11.0",
"@sentry/types": "6.11.0",
"@sentry/utils": "6.11.0",
"tslib": "^1.9.3"
},
"engines": {
@ -4274,12 +4275,12 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@sentry/hub": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.4.1.tgz",
"integrity": "sha512-7IZRP5buDE6s/c3vWzzPR/ySE+8GUuHPgTEPiDCPOCWwUN11zXDafJDKkJqY3muJfebUKmC/JG67RyBx+XlnlQ==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.11.0.tgz",
"integrity": "sha512-pT9hf+ZJfVFpoZopoC+yJmFNclr4NPqPcl2cgguqCHb69DklD1NxgBNWK8D6X05qjnNFDF991U6t1mxP9HrGuw==",
"dependencies": {
"@sentry/types": "6.4.1",
"@sentry/utils": "6.4.1",
"@sentry/types": "6.11.0",
"@sentry/utils": "6.11.0",
"tslib": "^1.9.3"
},
"engines": {
@ -4292,12 +4293,12 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@sentry/integrations": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-6.4.1.tgz",
"integrity": "sha512-3kw6NcrFGXW+qlfT112EkYt7jdFX55m9yJN5eCt7Iad59YzA8ji8Pio5ohy9Pl+OfYXlKRFOvnYPpZZn80UjlQ==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-6.11.0.tgz",
"integrity": "sha512-CtSMW+PJlw+EunDJ+9LCWxRcXQIsUDlcUZOhFyAdmM5YIbg2V0IqHtnYg8X2sSGRO3aTEc7lOG5nF4lqr3R0yg==",
"dependencies": {
"@sentry/types": "6.4.1",
"@sentry/utils": "6.4.1",
"@sentry/types": "6.11.0",
"@sentry/utils": "6.11.0",
"localforage": "^1.8.1",
"tslib": "^1.9.3"
},
@ -4311,12 +4312,12 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@sentry/minimal": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.4.1.tgz",
"integrity": "sha512-4x/PRbDZACCKJqjta9EkhiIMyGMf7VgBX13EEWEDVWLP7ymFukBuTr4ap/Tz9429kB/yXZuDGGMIZp/G618H3g==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.11.0.tgz",
"integrity": "sha512-XkZ7qrdlGp4IM/gjGxf1Q575yIbl5RvPbg+WFeekpo16Ufvzx37Mr8c2xsZaWosISVyE6eyFpooORjUlzy8EDw==",
"dependencies": {
"@sentry/hub": "6.4.1",
"@sentry/types": "6.4.1",
"@sentry/hub": "6.11.0",
"@sentry/types": "6.11.0",
"tslib": "^1.9.3"
},
"engines": {
@ -4329,14 +4330,14 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@sentry/tracing": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.4.1.tgz",
"integrity": "sha512-EPRadE9n/wpUjx4jqP/8vXdOAZBk7vjlzRKniJgKgQUO3v03i0ui6xydaal2mvhplIyOCI2muXdGhjUO7ga4uw==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.11.0.tgz",
"integrity": "sha512-9VA1/SY++WeoMQI4K6n/sYgIdRtCu9NLWqmGqu/5kbOtESYFgAt1DqSyqGCr00ZjQiC2s7tkDkTNZb38K6KytQ==",
"dependencies": {
"@sentry/hub": "6.4.1",
"@sentry/minimal": "6.4.1",
"@sentry/types": "6.4.1",
"@sentry/utils": "6.4.1",
"@sentry/hub": "6.11.0",
"@sentry/minimal": "6.11.0",
"@sentry/types": "6.11.0",
"@sentry/utils": "6.11.0",
"tslib": "^1.9.3"
},
"engines": {
@ -4349,19 +4350,19 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@sentry/types": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.4.1.tgz",
"integrity": "sha512-sTu/GaLsLYk1AkAqpkMT4+4q665LtZjhV0hkgiTD4N3zPl5uSf1pCIzxPRYjOpe7NEANmWv8U4PaGKGtc2eMfA==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.11.0.tgz",
"integrity": "sha512-gm5H9eZhL6bsIy/h3T+/Fzzz2vINhHhqd92CjHle3w7uXdTdFV98i2pDpErBGNTSNzbntqOMifYEB5ENtZAvcg==",
"engines": {
"node": ">=6"
}
},
"node_modules/@sentry/utils": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.4.1.tgz",
"integrity": "sha512-xJ1uVa5fvg23pXQfulvCIBb9pQ3p1awyd1PapK2AYi+wKjTuYl4B9edmhjRREEQEExznl/d2OVm78fRXLq7M9Q==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.11.0.tgz",
"integrity": "sha512-IOvyFHcnbRQxa++jO+ZUzRvFHEJ1cZjrBIQaNVc0IYF0twUOB5PTP6joTcix38ldaLeapaPZ9LGfudbvYvxkdg==",
"dependencies": {
"@sentry/types": "6.4.1",
"@sentry/types": "6.11.0",
"tslib": "^1.9.3"
},
"engines": {
@ -25445,13 +25446,13 @@
}
},
"@sentry/angular": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-6.4.1.tgz",
"integrity": "sha512-lpbc1nA19SYKzaaYd/kn/xqvxI8oRForAR+lM1iE0yru/56ZrFKoUreqQQjCgtMD5aKfI9cT4VrtIq5PVkfOeA==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-6.11.0.tgz",
"integrity": "sha512-rTfqPdBdnfbYZjq3rDnCUTiu9dSOxLrhSlKM5GTVnUaGH5xTrTmE2vJwfjT+kw46MB5KhcJNok7Ahq9HLuZB3Q==",
"requires": {
"@sentry/browser": "6.4.1",
"@sentry/types": "6.4.1",
"@sentry/utils": "6.4.1",
"@sentry/browser": "6.11.0",
"@sentry/types": "6.11.0",
"@sentry/utils": "6.11.0",
"rxjs": "^6.6.0",
"tslib": "^1.9.3"
},
@ -25464,13 +25465,13 @@
}
},
"@sentry/browser": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.4.1.tgz",
"integrity": "sha512-3cDud6GWutnJqcnheIq0lPNTsUJbrRLevQ+g1YfawVXFUxfmmY2bOsGd/Mxq17LxYeBHgKTitXv3DU1bsQ+WBQ==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.11.0.tgz",
"integrity": "sha512-Qr2QRA0t5/S9QQqxzYKvM9W8prvmiWuldfwRX4hubovXzcXLgUi4WK0/H612wSbYZ4dNAEcQbtlxFWJNN4wxdg==",
"requires": {
"@sentry/core": "6.4.1",
"@sentry/types": "6.4.1",
"@sentry/utils": "6.4.1",
"@sentry/core": "6.11.0",
"@sentry/types": "6.11.0",
"@sentry/utils": "6.11.0",
"tslib": "^1.9.3"
},
"dependencies": {
@ -25482,14 +25483,14 @@
}
},
"@sentry/core": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.4.1.tgz",
"integrity": "sha512-Lx13oTiP+Tjvm5VxulcCszNVd2S1wY4viSnr+ygq62ySVERR+t7uOZDSARZ0rZ259GwW6nkbMh9dDmD0d6VCGQ==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.11.0.tgz",
"integrity": "sha512-09TB+f3pqEq8LFahFWHO6I/4DxHo+NcS52OkbWMDqEi6oNZRD7PhPn3i14LfjsYVv3u3AESU8oxSEGbFrr2UjQ==",
"requires": {
"@sentry/hub": "6.4.1",
"@sentry/minimal": "6.4.1",
"@sentry/types": "6.4.1",
"@sentry/utils": "6.4.1",
"@sentry/hub": "6.11.0",
"@sentry/minimal": "6.11.0",
"@sentry/types": "6.11.0",
"@sentry/utils": "6.11.0",
"tslib": "^1.9.3"
},
"dependencies": {
@ -25501,12 +25502,12 @@
}
},
"@sentry/hub": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.4.1.tgz",
"integrity": "sha512-7IZRP5buDE6s/c3vWzzPR/ySE+8GUuHPgTEPiDCPOCWwUN11zXDafJDKkJqY3muJfebUKmC/JG67RyBx+XlnlQ==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.11.0.tgz",
"integrity": "sha512-pT9hf+ZJfVFpoZopoC+yJmFNclr4NPqPcl2cgguqCHb69DklD1NxgBNWK8D6X05qjnNFDF991U6t1mxP9HrGuw==",
"requires": {
"@sentry/types": "6.4.1",
"@sentry/utils": "6.4.1",
"@sentry/types": "6.11.0",
"@sentry/utils": "6.11.0",
"tslib": "^1.9.3"
},
"dependencies": {
@ -25518,12 +25519,12 @@
}
},
"@sentry/integrations": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-6.4.1.tgz",
"integrity": "sha512-3kw6NcrFGXW+qlfT112EkYt7jdFX55m9yJN5eCt7Iad59YzA8ji8Pio5ohy9Pl+OfYXlKRFOvnYPpZZn80UjlQ==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-6.11.0.tgz",
"integrity": "sha512-CtSMW+PJlw+EunDJ+9LCWxRcXQIsUDlcUZOhFyAdmM5YIbg2V0IqHtnYg8X2sSGRO3aTEc7lOG5nF4lqr3R0yg==",
"requires": {
"@sentry/types": "6.4.1",
"@sentry/utils": "6.4.1",
"@sentry/types": "6.11.0",
"@sentry/utils": "6.11.0",
"localforage": "^1.8.1",
"tslib": "^1.9.3"
},
@ -25536,12 +25537,12 @@
}
},
"@sentry/minimal": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.4.1.tgz",
"integrity": "sha512-4x/PRbDZACCKJqjta9EkhiIMyGMf7VgBX13EEWEDVWLP7ymFukBuTr4ap/Tz9429kB/yXZuDGGMIZp/G618H3g==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.11.0.tgz",
"integrity": "sha512-XkZ7qrdlGp4IM/gjGxf1Q575yIbl5RvPbg+WFeekpo16Ufvzx37Mr8c2xsZaWosISVyE6eyFpooORjUlzy8EDw==",
"requires": {
"@sentry/hub": "6.4.1",
"@sentry/types": "6.4.1",
"@sentry/hub": "6.11.0",
"@sentry/types": "6.11.0",
"tslib": "^1.9.3"
},
"dependencies": {
@ -25553,14 +25554,14 @@
}
},
"@sentry/tracing": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.4.1.tgz",
"integrity": "sha512-EPRadE9n/wpUjx4jqP/8vXdOAZBk7vjlzRKniJgKgQUO3v03i0ui6xydaal2mvhplIyOCI2muXdGhjUO7ga4uw==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.11.0.tgz",
"integrity": "sha512-9VA1/SY++WeoMQI4K6n/sYgIdRtCu9NLWqmGqu/5kbOtESYFgAt1DqSyqGCr00ZjQiC2s7tkDkTNZb38K6KytQ==",
"requires": {
"@sentry/hub": "6.4.1",
"@sentry/minimal": "6.4.1",
"@sentry/types": "6.4.1",
"@sentry/utils": "6.4.1",
"@sentry/hub": "6.11.0",
"@sentry/minimal": "6.11.0",
"@sentry/types": "6.11.0",
"@sentry/utils": "6.11.0",
"tslib": "^1.9.3"
},
"dependencies": {
@ -25572,16 +25573,16 @@
}
},
"@sentry/types": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.4.1.tgz",
"integrity": "sha512-sTu/GaLsLYk1AkAqpkMT4+4q665LtZjhV0hkgiTD4N3zPl5uSf1pCIzxPRYjOpe7NEANmWv8U4PaGKGtc2eMfA=="
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.11.0.tgz",
"integrity": "sha512-gm5H9eZhL6bsIy/h3T+/Fzzz2vINhHhqd92CjHle3w7uXdTdFV98i2pDpErBGNTSNzbntqOMifYEB5ENtZAvcg=="
},
"@sentry/utils": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.4.1.tgz",
"integrity": "sha512-xJ1uVa5fvg23pXQfulvCIBb9pQ3p1awyd1PapK2AYi+wKjTuYl4B9edmhjRREEQEExznl/d2OVm78fRXLq7M9Q==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.11.0.tgz",
"integrity": "sha512-IOvyFHcnbRQxa++jO+ZUzRvFHEJ1cZjrBIQaNVc0IYF0twUOB5PTP6joTcix38ldaLeapaPZ9LGfudbvYvxkdg==",
"requires": {
"@sentry/types": "6.4.1",
"@sentry/types": "6.11.0",
"tslib": "^1.9.3"
},
"dependencies": {

8
package.json
View File

@ -9,7 +9,7 @@
"build": "ng build --extra-webpack-config webpack.extra.js",
"test": "ng test",
"coverage": "npx http-server -c-1 -o -p 9875 ./coverage",
"lint-cmd": "eslint \"src/**/*.{ts,js,html}\" --max-warnings 1807",
"lint-cmd": "eslint \"src/**/*.{ts,js,html}\" --max-warnings 1801",
"lint-cache-cmd": "npm run lint-cmd -- --cache",
"lint": "npm run lint-cache-cmd",
"lint-fix": "npm run lint-cache-cmd -- --fix",
@ -51,9 +51,9 @@
"@s-libs/micro-dash": "^12.0.0",
"@s-libs/ng-core": "^12.0.0",
"@s-libs/rxjs-core": "^12.0.0",
"@sentry/angular": "^6.4.1",
"@sentry/integrations": "^6.4.1",
"@sentry/tracing": "^6.4.1",
"@sentry/angular": "^6.11.0",
"@sentry/integrations": "^6.11.0",
"@sentry/tracing": "^6.11.0",
"angular-epic-spinners": "^2.0.0",
"angular-file": "^3.0.1",
"angular2-text-mask": "^9.0.0",

6
src/app/home/actionbar/components/user/user.component.html
View File

@ -2,8 +2,8 @@
<dsh-organizations-list (selected)="selected.emit()"></dsh-organizations-list>
<mat-divider></mat-divider>
<span class="dsh-body-2">{{ username }}</span>
<dsh-menu-item (click)="navigateToChangePassword()">{{ t('user.changePassword') }}</dsh-menu-item>
<dsh-menu-item (click)="navigateToSessions()">{{ t('user.sessions') }}</dsh-menu-item>
<dsh-menu-item (click)="navigateTo2FA()">{{ t('user.twoFactorAuth') }}</dsh-menu-item>
<dsh-menu-item *ngFor="let linkConfig of userLinksConfig" (click)="openBlank(linkConfig.href)">
{{ t(linkConfig.translocoPath) }}
</dsh-menu-item>
<dsh-menu-item (click)="logout()">{{ t('user.logout') }}</dsh-menu-item>
</dsh-dropdown-actions>

29
src/app/home/actionbar/components/user/user.component.ts
View File

@ -12,22 +12,29 @@ export class UserComponent {
@Output() selected = new EventEmitter<void>();
username = this.keycloakService.getUsername();
keycloakAccountEndpoint = `${this.config.keycloakEndpoint}/auth/realms/external/account/`;
userLinksConfig = [
{
translocoPath: 'user.changePassword',
href: `${this.keycloakAccountEndpoint}/password`,
},
{
translocoPath: 'user.sessions',
href: `${this.keycloakAccountEndpoint}/sessions`,
},
{
translocoPath: 'user.twoFactorAuth',
href: `${this.keycloakAccountEndpoint}/totp`,
},
];
constructor(private keycloakService: KeycloakService, private config: ConfigService) {}
navigateToChangePassword(): void {
window.open(this.config.keycloak.resetPassword, '_blank');
openBlank(href: string): void {
window.open(href, '_blank');
}
navigateToSessions(): void {
window.open(this.config.keycloak.sessions, '_blank');
}
navigateTo2FA(): void {
window.open(this.config.keycloak.twoFactorAuth, '_blank');
}
async logout() {
async logout(): Promise<void> {
await this.keycloakService.logout();
}
}

2
src/app/home/welcome-image/welcome-image.component.scss
View File

@ -1,4 +1,4 @@
$dsh-welcome-image-height: 500px;
$dsh-welcome-image-height: 650px;
.dsh-welcome-image {
height: $dsh-welcome-image-height;

8
src/app/sections/landing/landing.component.html
View File

@ -6,9 +6,11 @@
fxLayoutGap="48px"
>
<h1 class="dsh-display-2">{{ t('dashboard') }}</h1>
<div fxLayout fxLayoutGap="24px">
<a class="dsh-subheading-2" [href]="docsEndpoint" target="_blank">{{ t('documentation') }}</a>
<a class="dsh-subheading-2" [href]="supportMailto">{{ t('support') }}</a>
<div fxLayout="column" fxLayoutGap="24px">
<a class="dsh-subheading-2" [href]="manualLink" target="_blank">{{ t('docs.manual') }}</a>
<a class="dsh-subheading-2" [href]="orgLink" target="_blank">{{ t('docs.org') }}</a>
<a class="dsh-subheading-2" [href]="integrationLink" target="_blank">{{ t('docs.integration') }}</a>
<a class="dsh-subheading-2" [href]="pluginsLink" target="_blank">{{ t('docs.plugins') }}</a>
</div>
</div>
<div gdColumns="1fr" gdColumns.gt-sm="1fr 1fr" gdGap="32px">

8
src/app/sections/landing/landing.component.ts
View File

@ -11,12 +11,16 @@ import { ThemeManager } from '../../theme-manager';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class LandingComponent {
docsEndpoint = this.configService.ext.docsEndpoint;
supportMailto = `mailto:${this.configService.ext.supportEmail}`;
hasWallets$ = this.walletsService.hasWallets$;
inverted = this.themeManager.isMainBackgroundImages;
currentThemeName = this.themeManager.current;
docsEndpoints = this.configService.docsEndpoints;
manualLink = `${this.docsEndpoints.help}/lk/lk`;
orgLink = `${this.docsEndpoints.help}/lk/access_rights`;
integrationLink = this.docsEndpoints.developer;
pluginsLink = `${this.docsEndpoints.rbk}/plagin-oplaty`;
constructor(
private configService: ConfigService,
private walletsService: WalletService,

2
src/app/sections/landing/parts/documentation/documentation.component.ts
View File

@ -15,6 +15,6 @@ export class DocumentationComponent {
constructor(private config: ConfigService) {}
goToDocumentation(): void {
window.open(this.config.ext.lkDocsEndpoint, '_blank');
window.open(`${this.config.docsEndpoints.help}/lk/lk`, '_blank');
}
}

2
src/app/sections/payment-section/integrations/api-key/api-key.component.ts
View File

@ -12,7 +12,7 @@ import { ConfigService } from '../../../../config';
})
export class ApiKeyComponent {
token$ = from(this.keycloakService.getToken());
paymentsApiSpecEndpoint = this.configService.ext.paymentsApiSpecEndpoint;
paymentsApiSpecEndpoint = `${this.configService.docsEndpoints.developer}/api`;
constructor(
private keycloakService: KeycloakService,

4
src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.component.html
View File

@ -3,8 +3,8 @@
fxLayout="column"
fxLayoutGap="24px"
>
<div class="mat-title">{{ t('title') }}</div>
<div fxLayout="column" fxLayoutGap="32px">
<div class="dsh-title">{{ t('title') }}</div>
<div class="dsh-body-1" fxLayout="column" fxLayoutGap="32px">
<div class="hold-details-info">
{{ t('holdDate') }} {{ holdDate | date: 'd MMMM yyyy, HH:mm'
}}{{

2
src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-main-info.component.html
View File

@ -1,5 +1,5 @@
<ng-container *transloco="let t; scope: 'payment-details'; read: 'paymentDetails.details'">
<div gdColumns="1fr" gdColumns.gt-md="1fr 1fr 1fr" gdGap="24px">
<div gdColumns="1fr" gdColumns.gt-sm="1fr 1fr 1fr" gdGap="24px">
<div class="payment-main-info-amount mat-body-1">
{{ payment.amount | toMajor | currency: payment.currency }}
</div>

2
src/app/sections/payment-section/payouts/payouts-details/payout-actions/payout-actions.component.html
View File

@ -1,7 +1,7 @@
<div fxLayout="column" fxLayoutGap="24px" *transloco="let t; scope: 'payouts'; read: 'payouts.panel'">
<div class="dsh-title">{{ t('actions') }}</div>
<div>
<button dsh-stroked-button color="accent" (click)="createPayoutReport.emit(payout)">
<button dsh-stroked-button color="accent" (click)="createReport.emit()">
{{ t('createReport') }}
</button>
</div>

7
src/app/sections/payment-section/payouts/payouts-details/payout-actions/payout-actions.component.ts
View File

@ -1,6 +1,4 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
import { Payout } from '@dsh/api-codegen/anapi/swagger-codegen';
import { ChangeDetectionStrategy, Component, EventEmitter, Output } from '@angular/core';
@Component({
selector: 'dsh-payout-actions',
@ -8,6 +6,5 @@ import { Payout } from '@dsh/api-codegen/anapi/swagger-codegen';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class PayoutActionsComponent {
@Input() payout: Payout;
@Output() createPayoutReport: EventEmitter<Payout> = new EventEmitter();
@Output() createReport: EventEmitter<void> = new EventEmitter<void>();
}

9
src/app/sections/payment-section/payouts/payouts-details/payouts-details.component.html
View File

@ -3,11 +3,6 @@
<mat-divider></mat-divider>
<div class="dsh-title">{{ payout?.payoutToolDetails?.detailsType | payoutToolDetailsType }}</div>
<dsh-payout-tool-details [payoutToolDetails]="payout?.payoutToolDetails"></dsh-payout-tool-details>
<ng-container *ngIf="payout.payoutSummary.length">
<mat-divider></mat-divider>
<dsh-payout-actions
[payout]="payout"
(createPayoutReport)="createPayoutReport.emit($event)"
></dsh-payout-actions>
</ng-container>
<mat-divider></mat-divider>
<dsh-payout-actions (createReport)="createReport()"></dsh-payout-actions>
</div>

6
src/app/sections/payment-section/payouts/payouts-details/payouts-details.component.ts
View File

@ -9,5 +9,9 @@ import { Payout } from '@dsh/api-codegen/anapi';
})
export class PayoutsDetailsComponent {
@Input() payout: Payout;
@Output() createPayoutReport: EventEmitter<Payout> = new EventEmitter();
@Output() createPayoutReport: EventEmitter<Payout> = new EventEmitter<Payout>();
createReport(): void {
this.createPayoutReport.emit(this.payout);
}
}

2
src/app/shared/pipes/api-model-types/payout-tool-details-type.pipe.ts
View File

@ -8,7 +8,7 @@ export class PayoutToolDetailsTypePipe implements PipeTransform {
constructor(private transloco: TranslocoService) {}
transform(value: string): string {
let path;
let path: string;
switch (value) {
case 'PayoutToolDetailsBankAccount':
path = 'payoutToolDetailsBankAccount';

15
src/appConfig.json
View File

@ -2,11 +2,10 @@
"apiEndpoint": "https://api.rbk.money",
"urlShortenerEndpoint": "https://rbk.mn",
"checkoutEndpoint": "https://checkout.rbk.money",
"ext": {
"docsEndpoint": "https://rbkmoney.github.io/docs",
"lkDocsEndpoint": "https://help.rbkmoney.com/lk/lk/",
"supportEmail": "support@rbkmoney.com",
"paymentsApiSpecEndpoint": "https://developer.rbk.money/api/"
"docsEndpoints": {
"help": "https://help.rbkmoney.com",
"developer": "https://developer.rbk.money",
"rbk": "https://rbk.money"
},
"yandexMetrika": {
"id": null,
@ -21,9 +20,5 @@
"logoName": "rbkmoney"
},
"sentryDsn": "https://4dccca7930e44a9a9eadf3c7f76f4b60@o572161.ingest.sentry.io/5721202",
"keycloak": {
"resetPassword": "https://auth.rbk.money/auth/realms/external/account/password",
"sessions": "https://auth.rbk.money/auth/realms/external/account/sessions",
"twoFactorAuth": "https://auth.rbk.money/auth/realms/external/account/totp"
}
"keycloakEndpoint": "https://auth.rbk.money"
}

9
src/assets/i18n/main/ru.json
View File

@ -1,9 +1,12 @@
{
"header": {
"documentation": "Документация",
"support": "Поддержка",
"dashboard": "Личный кабинет",
"returnToTheOldVersion": "Вернуться к прежней версии"
"docs": {
"manual": "Руководство пользователя ЛК",
"org": "Управление доступом сотрудников в ЛК",
"integration": "Интеграция с платежной платформой",
"plugins": "Плагины для распространенных CMS, CRM"
}
},
"wallets": {
"title": "Кошельки",