diff --git a/console/.eslintrc.json b/console/.eslintrc.json new file mode 100644 index 0000000000..e2899f97b9 --- /dev/null +++ b/console/.eslintrc.json @@ -0,0 +1,53 @@ +{ + "root": true, + "ignorePatterns": [ + "projects/**/*" + ], + "overrides": [ + { + "files": [ + "*.ts" + ], + "parserOptions": { + "project": [ + "tsconfig.json", + "e2e/tsconfig.json" + ], + "createDefaultProgram": true + }, + "extends": [ + "plugin:@angular-eslint/recommended", + "plugin:@angular-eslint/template/process-inline-templates" + ], + "rules": { + "@angular-eslint/no-conflicting-lifecycle": "off", + "@angular-eslint/no-host-metadata-property": "off", + "@angular-eslint/component-selector": [ + "error", + { + "prefix": "cnsl", + "style": "kebab-case", + "type": "element" + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + "prefix": "cnsl", + "style": "camelCase", + "type": "attribute" + } + ] + } + }, + { + "files": [ + "*.html" + ], + "extends": [ + "plugin:@angular-eslint/template/recommended" + ], + "rules": {} + } + ] +} diff --git a/console/angular.json b/console/angular.json index 899f531a63..584ced17f6 100644 --- a/console/angular.json +++ b/console/angular.json @@ -28,19 +28,19 @@ "src/manifest.webmanifest" ], "styles": [ - "src/styles.scss" + "src/styles.scss" ], "scripts": [ "./node_modules/tinycolor2/dist/tinycolor-min.js" ], "allowedCommonJsDependencies": [ - "@angular/common/locales/de", - "src/app/proto/generated/zitadel/admin_pb", - "src/app/proto/generated/zitadel/management_pb", - "src/app/proto/generated/**", - "file-saver", - "qrcode" - ], + "@angular/common/locales/de", + "src/app/proto/generated/zitadel/admin_pb", + "src/app/proto/generated/zitadel/management_pb", + "src/app/proto/generated/**", + "file-saver", + "qrcode" + ], "vendorChunk": true, "extractLicenses": false, "buildOptimizer": false, @@ -84,8 +84,8 @@ "budgets": [ { "type": "initial", - "maximumWarning": "4mb", - "maximumError": "5mb" + "maximumWarning": "5mb", + "maximumError": "6mb" }, { "type": "anyComponentStyle", @@ -102,8 +102,7 @@ }, "serve": { "builder": "@angular-devkit/build-angular:dev-server", - "options": { - }, + "options": {}, "configurations": { "production": { "browserTarget": "console:build:production" @@ -142,15 +141,11 @@ } }, "lint": { - "builder": "@angular-devkit/build-angular:tslint", + "builder": "@angular-eslint/builder:lint", "options": { - "tsConfig": [ - "tsconfig.app.json", - "tsconfig.spec.json" - ], - "exclude": [ - "**/node_modules/**", - "**/proto/generated/**" + "lintFilePatterns": [ + "src/**/*.ts", + "src/**/*.html" ] } }, @@ -174,6 +169,7 @@ }, "defaultProject": "console", "cli": { - "analytics": "2b4e8e6c-f053-4562-b7a6-00c6c06a6791" + "analytics": "2b4e8e6c-f053-4562-b7a6-00c6c06a6791", + "defaultCollection": "@angular-eslint/schematics" } -} \ No newline at end of file +} diff --git a/console/e2e/src/app.po.ts b/console/e2e/src/app.po.ts index b8498c26f2..1072de0b64 100644 --- a/console/e2e/src/app.po.ts +++ b/console/e2e/src/app.po.ts @@ -6,6 +6,6 @@ export class AppPage { } getTitleText() { - return element(by.css('app-root .content span')).getText() as Promise; + return element(by.css('cnsl-root .content span')).getText() as Promise; } } diff --git a/console/package-lock.json b/console/package-lock.json index 09332abba8..9d7ea9ba1c 100644 --- a/console/package-lock.json +++ b/console/package-lock.json @@ -47,13 +47,21 @@ }, "devDependencies": { "@angular-devkit/build-angular": "~12.2.8", + "@angular-eslint/builder": "12.5.0", + "@angular-eslint/eslint-plugin": "12.5.0", + "@angular-eslint/eslint-plugin-template": "12.5.0", + "@angular-eslint/schematics": "12.5.0", + "@angular-eslint/template-parser": "12.5.0", "@angular/cli": "~12.2.8", "@angular/compiler-cli": "~12.2.8", "@angular/language-service": "~12.2.8", "@types/jasmine": "~3.9.1", "@types/jasminewd2": "~2.0.10", "@types/node": "^16.10.2", + "@typescript-eslint/eslint-plugin": "4.28.2", + "@typescript-eslint/parser": "4.28.2", "codelyzer": "^6.0.0", + "eslint": "^7.26.0", "jasmine-core": "~3.9.0", "jasmine-spec-reporter": "~7.0.0", "karma": "~6.3.2", @@ -67,7 +75,6 @@ "stylelint-config-standard": "^22.0.0", "stylelint-scss": "^3.21.0", "ts-node": "~10.2.1", - "tslint": "~6.1.3", "typescript": "^4.2.4" } }, @@ -389,6 +396,125 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true }, + "node_modules/@angular-eslint/builder": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-12.5.0.tgz", + "integrity": "sha512-abex1KdqEvUYbJqLkqhEeW4r0DuJPDzlMZYODMyBDDFTcBFYQCzLFUkhIjRNet9Vjto3Y3DbkkFUfS4DEEwjTw==", + "dev": true, + "dependencies": { + "@nrwl/devkit": "12.6.0" + }, + "peerDependencies": { + "@angular/cli": ">= 12.0.0 < 13.0.0", + "eslint": "*", + "typescript": "*" + } + }, + "node_modules/@angular-eslint/eslint-plugin": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-12.5.0.tgz", + "integrity": "sha512-BugzzvgghcaxHMvUFQBdu6dwB167CwiTxjIBT9KxIYYm0IY3RUKiyVQDdSs4tcwZqsyWNWuiju4ZfGPNHGjcWw==", + "dev": true, + "dependencies": { + "@angular-eslint/utils": "12.5.0", + "@typescript-eslint/experimental-utils": "4.28.2" + }, + "peerDependencies": { + "@angular/compiler": ">= 12.0.0 < 13.0.0", + "eslint": "*", + "typescript": "*" + } + }, + "node_modules/@angular-eslint/eslint-plugin-template": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-12.5.0.tgz", + "integrity": "sha512-qvgJieWFiK61kyuGPbRWBBmsP2J/bRjYply/aAuqpctnlLnae1/+GCsosWWP/AzOlR2TvHN62j7ZW6GSxTkUOg==", + "dev": true, + "dependencies": { + "@typescript-eslint/experimental-utils": "4.28.2", + "aria-query": "^4.2.2", + "axobject-query": "^2.2.0" + }, + "peerDependencies": { + "@angular/compiler": ">= 12.0.0 < 13.0.0", + "eslint": "*", + "typescript": "*" + } + }, + "node_modules/@angular-eslint/eslint-plugin-template/node_modules/aria-query": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz", + "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==", + "dev": true, + "dependencies": { + "@babel/runtime": "^7.10.2", + "@babel/runtime-corejs3": "^7.10.2" + }, + "engines": { + "node": ">=6.0" + } + }, + "node_modules/@angular-eslint/eslint-plugin-template/node_modules/axobject-query": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", + "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==", + "dev": true + }, + "node_modules/@angular-eslint/schematics": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-12.5.0.tgz", + "integrity": "sha512-918oLA4Z/sQl/WWzeQNPmy23VgU1fAdlqKnZmBWFE6Mrpstoa8emX9dIl4mbQT1UbS9XtzI2OglmbX2lQR0jRw==", + "dev": true, + "dependencies": { + "@angular-eslint/eslint-plugin": "12.5.0", + "@angular-eslint/eslint-plugin-template": "12.5.0", + "ignore": "5.1.8", + "strip-json-comments": "3.1.1", + "tmp": "0.2.1" + }, + "peerDependencies": { + "@angular/cli": ">= 12.0.0 < 13.0.0" + } + }, + "node_modules/@angular-eslint/schematics/node_modules/tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "dependencies": { + "rimraf": "^3.0.0" + }, + "engines": { + "node": ">=8.17.0" + } + }, + "node_modules/@angular-eslint/template-parser": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-12.5.0.tgz", + "integrity": "sha512-aAcwoy0X6B2IUvuH6i0zK7leKqM1Lx3QqzFI2gyOWLIgtT81182Wm0VT+3GWwr4pudw+L6n4NhDVDvxBkRJFtA==", + "dev": true, + "dependencies": { + "eslint-scope": "^5.1.0" + }, + "peerDependencies": { + "@angular/compiler": ">= 12.0.0 < 13.0.0", + "eslint": "*", + "typescript": "*" + } + }, + "node_modules/@angular-eslint/utils": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-12.5.0.tgz", + "integrity": "sha512-h3ayDMxndrWRwX4sSe3Xs4QpGz+wIa6cAYtDKGu3H9HPlEacQCkKkTPCDy1d+993iL+9XynWIKuNCK9pX9YHgA==", + "dev": true, + "dependencies": { + "@typescript-eslint/experimental-utils": "4.28.2" + }, + "peerDependencies": { + "eslint": "*", + "typescript": "*" + } + }, "node_modules/@angular/animations": { "version": "12.2.8", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-12.2.8.tgz", @@ -2251,6 +2377,19 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/runtime-corejs3": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz", + "integrity": "sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==", + "dev": true, + "dependencies": { + "core-js-pure": "^3.16.0", + "regenerator-runtime": "^0.13.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/template": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", @@ -2368,6 +2507,84 @@ "node": ">=10.0.0" } }, + "node_modules/@eslint/eslintrc": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", + "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^13.9.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/@eslint/eslintrc/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/eslintrc/node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/@eslint/eslintrc/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@grpc/grpc-js": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.2.tgz", @@ -2379,6 +2596,26 @@ "node": "^8.13.0 || >=10.10.0" } }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", + "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", + "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", + "dev": true + }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", @@ -2574,6 +2811,243 @@ "read-package-json-fast": "^2.0.1" } }, + "node_modules/@nrwl/devkit": { + "version": "12.6.0", + "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-12.6.0.tgz", + "integrity": "sha512-tvw/4n2JD/38UuzdxFCoj1+x02BAKK4EvtLhwUK5XSBF0wDYFBp5rHfxvUD9ZcoiRRrZA4QGFjhDljrfj95F2A==", + "dev": true, + "dependencies": { + "@nrwl/tao": "12.6.0", + "ejs": "^3.1.5", + "ignore": "^5.0.4", + "rxjs": "^6.5.4", + "semver": "7.3.4", + "tslib": "^2.0.0" + } + }, + "node_modules/@nrwl/devkit/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@nrwl/devkit/node_modules/rxjs/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "node_modules/@nrwl/devkit/node_modules/semver": { + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nrwl/tao": { + "version": "12.6.0", + "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-12.6.0.tgz", + "integrity": "sha512-h6X+mqmTlZjA9nqlyPAu9TFNORHAMcC1BD8H8kA8lTHN1nktLHQ266qpHVLsxcqww2EYsVqQaKaOpUacck49+w==", + "dev": true, + "dependencies": { + "chalk": "4.1.0", + "enquirer": "~2.3.6", + "fs-extra": "^9.1.0", + "jsonc-parser": "3.0.0", + "rxjs": "^6.5.4", + "rxjs-for-await": "0.0.2", + "semver": "7.3.4", + "tmp": "~0.2.1", + "tslib": "^2.0.0", + "yargs-parser": "20.0.0" + }, + "bin": { + "tao": "index.js" + } + }, + "node_modules/@nrwl/tao/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@nrwl/tao/node_modules/chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@nrwl/tao/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@nrwl/tao/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/@nrwl/tao/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nrwl/tao/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@nrwl/tao/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@nrwl/tao/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@nrwl/tao/node_modules/rxjs-for-await": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/rxjs-for-await/-/rxjs-for-await-0.0.2.tgz", + "integrity": "sha512-IJ8R/ZCFMHOcDIqoABs82jal00VrZx8Xkgfe7TOKoaRPAW5nH/VFlG23bXpeGdrmtqI9UobFPgUKgCuFc7Lncw==", + "dev": true, + "peerDependencies": { + "rxjs": "^6.0.0" + } + }, + "node_modules/@nrwl/tao/node_modules/rxjs/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "node_modules/@nrwl/tao/node_modules/semver": { + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nrwl/tao/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@nrwl/tao/node_modules/tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "dependencies": { + "rimraf": "^3.0.0" + }, + "engines": { + "node": ">=8.17.0" + } + }, + "node_modules/@nrwl/tao/node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@nrwl/tao/node_modules/yargs-parser": { + "version": "20.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.0.0.tgz", + "integrity": "sha512-8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, "node_modules/@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -2890,6 +3364,204 @@ "node": ">=0.10.0" } }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.2.tgz", + "integrity": "sha512-PGqpLLzHSxq956rzNGasO3GsAPf2lY9lDUBXhS++SKonglUmJypaUtcKzRtUte8CV7nruwnDxtLUKpVxs0wQBw==", + "dev": true, + "dependencies": { + "@typescript-eslint/experimental-utils": "4.28.2", + "@typescript-eslint/scope-manager": "4.28.2", + "debug": "^4.3.1", + "functional-red-black-tree": "^1.0.1", + "regexpp": "^3.1.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^4.0.0", + "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/@typescript-eslint/experimental-utils": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.2.tgz", + "integrity": "sha512-MwHPsL6qo98RC55IoWWP8/opTykjTp4JzfPu1VfO2Z0MshNP0UZ1GEV5rYSSnZSUI8VD7iHvtIPVGW5Nfh7klQ==", + "dev": true, + "dependencies": { + "@types/json-schema": "^7.0.7", + "@typescript-eslint/scope-manager": "4.28.2", + "@typescript-eslint/types": "4.28.2", + "@typescript-eslint/typescript-estree": "4.28.2", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "*" + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.2.tgz", + "integrity": "sha512-Q0gSCN51eikAgFGY+gnd5p9bhhCUAl0ERMiDKrTzpSoMYRubdB8MJrTTR/BBii8z+iFwz8oihxd0RAdP4l8w8w==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "4.28.2", + "@typescript-eslint/types": "4.28.2", + "@typescript-eslint/typescript-estree": "4.28.2", + "debug": "^4.3.1" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.2.tgz", + "integrity": "sha512-MqbypNjIkJFEFuOwPWNDjq0nqXAKZvDNNs9yNseoGBB1wYfz1G0WHC2AVOy4XD7di3KCcW3+nhZyN6zruqmp2A==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "4.28.2", + "@typescript-eslint/visitor-keys": "4.28.2" + }, + "engines": { + "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/types": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.2.tgz", + "integrity": "sha512-Gr15fuQVd93uD9zzxbApz3wf7ua3yk4ZujABZlZhaxxKY8ojo448u7XTm/+ETpy0V0dlMtj6t4VdDvdc0JmUhA==", + "dev": true, + "engines": { + "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.2.tgz", + "integrity": "sha512-86lLstLvK6QjNZjMoYUBMMsULFw0hPHJlk1fzhAVoNjDBuPVxiwvGuPQq3fsBMCxuDJwmX87tM/AXoadhHRljg==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "4.28.2", + "@typescript-eslint/visitor-keys": "4.28.2", + "debug": "^4.3.1", + "globby": "^11.0.3", + "is-glob": "^4.0.1", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.2.tgz", + "integrity": "sha512-aT2B4PLyyRDUVUafXzpZFoc0C9t0za4BJAKP5sgWIhG+jHECQZUEjuQSCIwZdiJJ4w4cgu5r3Kh20SOdtEBl0w==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "4.28.2", + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, "node_modules/@webassemblyjs/ast": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", @@ -3100,6 +3772,15 @@ "acorn": "^8" } }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, "node_modules/acorn-walk": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz", @@ -3536,6 +4217,15 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", @@ -4073,6 +4763,7 @@ "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -4968,6 +5659,17 @@ "semver": "bin/semver.js" } }, + "node_modules/core-js-pure": { + "version": "3.18.2", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.18.2.tgz", + "integrity": "sha512-4hMMLUlZhKJKOWbbGD1/VDUxGPEhEoN/T01k7bx271WiBKCvCfkgPzy0IeRS4PB50p6/N1q/SZL4B/TRsTE5bA==", + "dev": true, + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, "node_modules/core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -5861,6 +6563,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, "node_modules/default-gateway": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", @@ -6078,6 +6786,18 @@ "buffer-indexof": "^1.0.0" } }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/dom-serialize": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", @@ -6162,6 +6882,21 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, + "node_modules/ejs": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz", + "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==", + "dev": true, + "dependencies": { + "jake": "^10.6.1" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/electron-to-chromium": { "version": "1.3.750", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz", @@ -6267,6 +7002,18 @@ "node": ">=10.13.0" } }, + "node_modules/enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, + "dependencies": { + "ansi-colors": "^4.1.1" + }, + "engines": { + "node": ">=8.6" + } + }, "node_modules/ent": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", @@ -6383,6 +7130,63 @@ "node": ">=0.8.0" } }, + "node_modules/eslint": { + "version": "7.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", + "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", + "dev": true, + "dependencies": { + "@babel/code-frame": "7.12.11", + "@eslint/eslintrc": "^0.4.3", + "@humanwhocodes/config-array": "^0.5.0", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "enquirer": "^2.3.5", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.1", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.1.2", + "globals": "^13.6.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "progress": "^2.0.0", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", + "table": "^6.0.9", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -6396,6 +7200,300 @@ "node": ">=8.0.0" } }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint/node_modules/@babel/code-frame": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.10.4" + } + }, + "node_modules/eslint/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/eslint/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/eslint/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/eslint/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/eslint/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/eslint/node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint/node_modules/globals": { + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/eslint/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/eslint/node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/espree": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", + "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "dev": true, + "dependencies": { + "acorn": "^7.4.0", + "acorn-jsx": "^5.3.1", + "eslint-visitor-keys": "^1.3.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/espree/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -6409,6 +7507,27 @@ "node": ">=4" } }, + "node_modules/esquery": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", + "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esquery/node_modules/estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, "node_modules/esrecurse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", @@ -6866,6 +7985,12 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, "node_modules/fast-sha256": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/fast-sha256/-/fast-sha256-1.3.0.tgz", @@ -6943,6 +8068,15 @@ "dev": true, "optional": true }, + "node_modules/filelist": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz", + "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==", + "dev": true, + "dependencies": { + "minimatch": "^3.0.4" + } + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -7189,6 +8323,12 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, "node_modules/gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -9012,6 +10152,30 @@ "node": ">=8" } }, + "node_modules/jake": { + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", + "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==", + "dev": true, + "dependencies": { + "async": "0.9.x", + "chalk": "^2.4.2", + "filelist": "^1.0.1", + "minimatch": "^3.0.4" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": "*" + } + }, + "node_modules/jake/node_modules/async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "dev": true + }, "node_modules/jasmine": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz", @@ -9155,6 +10319,12 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, "node_modules/json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -9520,6 +10690,19 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/libphonenumber-js": { "version": "1.9.34", "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.34.tgz", @@ -9623,6 +10806,12 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "dev": true }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, "node_modules/lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", @@ -10521,6 +11710,12 @@ "node": ">=0.10.0" } }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, "node_modules/needle": { "version": "2.9.1", "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz", @@ -11171,6 +12366,23 @@ "node": ">=4" } }, + "node_modules/optionator": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "dev": true, + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/ora": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", @@ -14173,6 +15385,15 @@ "node": ">=6.14.4" } }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/prettier": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", @@ -14203,6 +15424,15 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -15025,6 +16255,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, "node_modules/regexpu-core": { "version": "4.7.1", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz", @@ -16769,6 +18011,18 @@ "node": ">=8" } }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/style-loader": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.2.1.tgz", @@ -17631,6 +18885,7 @@ "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==", "deprecated": "TSLint has been deprecated in favor of ESLint. Please see https://github.com/palantir/tslint/issues/4534 for more information.", "dev": true, + "peer": true, "dependencies": { "@babel/code-frame": "^7.0.0", "builtin-modules": "^1.1.1", @@ -17661,6 +18916,7 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, + "peer": true, "dependencies": { "minimist": "^1.2.5" }, @@ -17673,6 +18929,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true, + "peer": true, "bin": { "semver": "bin/semver" } @@ -17681,13 +18938,15 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "dev": true, + "peer": true }, "node_modules/tsutils": { "version": "2.29.0", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", "dev": true, + "peer": true, "dependencies": { "tslib": "^1.8.1" }, @@ -17699,7 +18958,8 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "dev": true, + "peer": true }, "node_modules/tunnel-agent": { "version": "0.6.0", @@ -17719,6 +18979,18 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "dev": true }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/type-fest": { "version": "0.21.3", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", @@ -19504,6 +20776,15 @@ "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", "dev": true }, + "node_modules/word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -19938,6 +21219,96 @@ } } }, + "@angular-eslint/builder": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-12.5.0.tgz", + "integrity": "sha512-abex1KdqEvUYbJqLkqhEeW4r0DuJPDzlMZYODMyBDDFTcBFYQCzLFUkhIjRNet9Vjto3Y3DbkkFUfS4DEEwjTw==", + "dev": true, + "requires": { + "@nrwl/devkit": "12.6.0" + } + }, + "@angular-eslint/eslint-plugin": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-12.5.0.tgz", + "integrity": "sha512-BugzzvgghcaxHMvUFQBdu6dwB167CwiTxjIBT9KxIYYm0IY3RUKiyVQDdSs4tcwZqsyWNWuiju4ZfGPNHGjcWw==", + "dev": true, + "requires": { + "@angular-eslint/utils": "12.5.0", + "@typescript-eslint/experimental-utils": "4.28.2" + } + }, + "@angular-eslint/eslint-plugin-template": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-12.5.0.tgz", + "integrity": "sha512-qvgJieWFiK61kyuGPbRWBBmsP2J/bRjYply/aAuqpctnlLnae1/+GCsosWWP/AzOlR2TvHN62j7ZW6GSxTkUOg==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "4.28.2", + "aria-query": "^4.2.2", + "axobject-query": "^2.2.0" + }, + "dependencies": { + "aria-query": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz", + "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==", + "dev": true, + "requires": { + "@babel/runtime": "^7.10.2", + "@babel/runtime-corejs3": "^7.10.2" + } + }, + "axobject-query": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", + "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==", + "dev": true + } + } + }, + "@angular-eslint/schematics": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-12.5.0.tgz", + "integrity": "sha512-918oLA4Z/sQl/WWzeQNPmy23VgU1fAdlqKnZmBWFE6Mrpstoa8emX9dIl4mbQT1UbS9XtzI2OglmbX2lQR0jRw==", + "dev": true, + "requires": { + "@angular-eslint/eslint-plugin": "12.5.0", + "@angular-eslint/eslint-plugin-template": "12.5.0", + "ignore": "5.1.8", + "strip-json-comments": "3.1.1", + "tmp": "0.2.1" + }, + "dependencies": { + "tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "requires": { + "rimraf": "^3.0.0" + } + } + } + }, + "@angular-eslint/template-parser": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-12.5.0.tgz", + "integrity": "sha512-aAcwoy0X6B2IUvuH6i0zK7leKqM1Lx3QqzFI2gyOWLIgtT81182Wm0VT+3GWwr4pudw+L6n4NhDVDvxBkRJFtA==", + "dev": true, + "requires": { + "eslint-scope": "^5.1.0" + } + }, + "@angular-eslint/utils": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-12.5.0.tgz", + "integrity": "sha512-h3ayDMxndrWRwX4sSe3Xs4QpGz+wIa6cAYtDKGu3H9HPlEacQCkKkTPCDy1d+993iL+9XynWIKuNCK9pX9YHgA==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "4.28.2" + } + }, "@angular/animations": { "version": "12.2.8", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-12.2.8.tgz", @@ -21206,6 +22577,16 @@ "regenerator-runtime": "^0.13.4" } }, + "@babel/runtime-corejs3": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz", + "integrity": "sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==", + "dev": true, + "requires": { + "core-js-pure": "^3.16.0", + "regenerator-runtime": "^0.13.4" + } + }, "@babel/template": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", @@ -21295,6 +22676,64 @@ "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==", "dev": true }, + "@eslint/eslintrc": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", + "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", + "dev": true, + "requires": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^13.9.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "globals": { + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "dev": true, + "requires": { + "type-fest": "^0.20.2" + } + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true + } + } + }, "@grpc/grpc-js": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.2.tgz", @@ -21303,6 +22742,23 @@ "@types/node": ">=12.12.47" } }, + "@humanwhocodes/config-array": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", + "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "dev": true, + "requires": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + } + }, + "@humanwhocodes/object-schema": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", + "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", + "dev": true + }, "@istanbuljs/schema": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", @@ -21452,6 +22908,193 @@ "read-package-json-fast": "^2.0.1" } }, + "@nrwl/devkit": { + "version": "12.6.0", + "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-12.6.0.tgz", + "integrity": "sha512-tvw/4n2JD/38UuzdxFCoj1+x02BAKK4EvtLhwUK5XSBF0wDYFBp5rHfxvUD9ZcoiRRrZA4QGFjhDljrfj95F2A==", + "dev": true, + "requires": { + "@nrwl/tao": "12.6.0", + "ejs": "^3.1.5", + "ignore": "^5.0.4", + "rxjs": "^6.5.4", + "semver": "7.3.4", + "tslib": "^2.0.0" + }, + "dependencies": { + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, + "semver": { + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, + "@nrwl/tao": { + "version": "12.6.0", + "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-12.6.0.tgz", + "integrity": "sha512-h6X+mqmTlZjA9nqlyPAu9TFNORHAMcC1BD8H8kA8lTHN1nktLHQ266qpHVLsxcqww2EYsVqQaKaOpUacck49+w==", + "dev": true, + "requires": { + "chalk": "4.1.0", + "enquirer": "~2.3.6", + "fs-extra": "^9.1.0", + "jsonc-parser": "3.0.0", + "rxjs": "^6.5.4", + "rxjs-for-await": "0.0.2", + "semver": "7.3.4", + "tmp": "~0.2.1", + "tslib": "^2.0.0", + "yargs-parser": "20.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, + "rxjs-for-await": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/rxjs-for-await/-/rxjs-for-await-0.0.2.tgz", + "integrity": "sha512-IJ8R/ZCFMHOcDIqoABs82jal00VrZx8Xkgfe7TOKoaRPAW5nH/VFlG23bXpeGdrmtqI9UobFPgUKgCuFc7Lncw==", + "dev": true, + "requires": {} + }, + "semver": { + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "requires": { + "rimraf": "^3.0.0" + } + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true + }, + "yargs-parser": { + "version": "20.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.0.0.tgz", + "integrity": "sha512-8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA==", + "dev": true + } + } + }, "@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -21748,6 +23391,122 @@ } } }, + "@typescript-eslint/eslint-plugin": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.2.tgz", + "integrity": "sha512-PGqpLLzHSxq956rzNGasO3GsAPf2lY9lDUBXhS++SKonglUmJypaUtcKzRtUte8CV7nruwnDxtLUKpVxs0wQBw==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "4.28.2", + "@typescript-eslint/scope-manager": "4.28.2", + "debug": "^4.3.1", + "functional-red-black-tree": "^1.0.1", + "regexpp": "^3.1.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + } + } + }, + "@typescript-eslint/experimental-utils": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.2.tgz", + "integrity": "sha512-MwHPsL6qo98RC55IoWWP8/opTykjTp4JzfPu1VfO2Z0MshNP0UZ1GEV5rYSSnZSUI8VD7iHvtIPVGW5Nfh7klQ==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.7", + "@typescript-eslint/scope-manager": "4.28.2", + "@typescript-eslint/types": "4.28.2", + "@typescript-eslint/typescript-estree": "4.28.2", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" + } + }, + "@typescript-eslint/parser": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.2.tgz", + "integrity": "sha512-Q0gSCN51eikAgFGY+gnd5p9bhhCUAl0ERMiDKrTzpSoMYRubdB8MJrTTR/BBii8z+iFwz8oihxd0RAdP4l8w8w==", + "dev": true, + "requires": { + "@typescript-eslint/scope-manager": "4.28.2", + "@typescript-eslint/types": "4.28.2", + "@typescript-eslint/typescript-estree": "4.28.2", + "debug": "^4.3.1" + } + }, + "@typescript-eslint/scope-manager": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.2.tgz", + "integrity": "sha512-MqbypNjIkJFEFuOwPWNDjq0nqXAKZvDNNs9yNseoGBB1wYfz1G0WHC2AVOy4XD7di3KCcW3+nhZyN6zruqmp2A==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.28.2", + "@typescript-eslint/visitor-keys": "4.28.2" + } + }, + "@typescript-eslint/types": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.2.tgz", + "integrity": "sha512-Gr15fuQVd93uD9zzxbApz3wf7ua3yk4ZujABZlZhaxxKY8ojo448u7XTm/+ETpy0V0dlMtj6t4VdDvdc0JmUhA==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.2.tgz", + "integrity": "sha512-86lLstLvK6QjNZjMoYUBMMsULFw0hPHJlk1fzhAVoNjDBuPVxiwvGuPQq3fsBMCxuDJwmX87tM/AXoadhHRljg==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.28.2", + "@typescript-eslint/visitor-keys": "4.28.2", + "debug": "^4.3.1", + "globby": "^11.0.3", + "is-glob": "^4.0.1", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + } + } + }, + "@typescript-eslint/visitor-keys": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.2.tgz", + "integrity": "sha512-aT2B4PLyyRDUVUafXzpZFoc0C9t0za4BJAKP5sgWIhG+jHECQZUEjuQSCIwZdiJJ4w4cgu5r3Kh20SOdtEBl0w==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.28.2", + "eslint-visitor-keys": "^2.0.0" + } + }, "@webassemblyjs/ast": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", @@ -21947,6 +23706,13 @@ "dev": true, "requires": {} }, + "acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "requires": {} + }, "acorn-walk": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz", @@ -22291,6 +24057,12 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, + "at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true + }, "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", @@ -22707,7 +24479,8 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true + "dev": true, + "peer": true }, "builtins": { "version": "1.0.3", @@ -23415,6 +25188,12 @@ } } }, + "core-js-pure": { + "version": "3.18.2", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.18.2.tgz", + "integrity": "sha512-4hMMLUlZhKJKOWbbGD1/VDUxGPEhEoN/T01k7bx271WiBKCvCfkgPzy0IeRS4PB50p6/N1q/SZL4B/TRsTE5bA==", + "dev": true + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -24077,6 +25856,12 @@ "regexp.prototype.flags": "^1.2.0" } }, + "deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, "default-gateway": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", @@ -24257,6 +26042,15 @@ "buffer-indexof": "^1.0.0" } }, + "doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, "dom-serialize": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", @@ -24334,6 +26128,15 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, + "ejs": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz", + "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==", + "dev": true, + "requires": { + "jake": "^10.6.1" + } + }, "electron-to-chromium": { "version": "1.3.750", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz", @@ -24423,6 +26226,15 @@ "tapable": "^2.2.0" } }, + "enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, + "requires": { + "ansi-colors": "^4.1.1" + } + }, "ent": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", @@ -24517,6 +26329,217 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, + "eslint": { + "version": "7.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", + "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", + "dev": true, + "requires": { + "@babel/code-frame": "7.12.11", + "@eslint/eslintrc": "^0.4.3", + "@humanwhocodes/config-array": "^0.5.0", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "enquirer": "^2.3.5", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.1", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.1.2", + "globals": "^13.6.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "progress": "^2.0.0", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", + "table": "^6.0.9", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true + }, + "eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + } + } + }, + "globals": { + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "dev": true, + "requires": { + "type-fest": "^0.20.2" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -24527,12 +26550,69 @@ "estraverse": "^4.1.1" } }, + "eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^2.0.0" + } + }, + "eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true + }, + "espree": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", + "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "dev": true, + "requires": { + "acorn": "^7.4.0", + "acorn-jsx": "^5.3.1", + "eslint-visitor-keys": "^1.3.0" + }, + "dependencies": { + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true + }, + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + } + } + }, "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, + "esquery": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", + "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "dev": true, + "requires": { + "estraverse": "^5.1.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } + } + }, "esrecurse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", @@ -24912,6 +26992,12 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, "fast-sha256": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/fast-sha256/-/fast-sha256-1.3.0.tgz", @@ -24977,6 +27063,15 @@ "dev": true, "optional": true }, + "filelist": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz", + "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==", + "dev": true, + "requires": { + "minimatch": "^3.0.4" + } + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -25164,6 +27259,12 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -26561,6 +28662,26 @@ "istanbul-lib-report": "^3.0.0" } }, + "jake": { + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", + "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==", + "dev": true, + "requires": { + "async": "0.9.x", + "chalk": "^2.4.2", + "filelist": "^1.0.1", + "minimatch": "^3.0.4" + }, + "dependencies": { + "async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "dev": true + } + } + }, "jasmine": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz", @@ -26681,6 +28802,12 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -26972,6 +29099,16 @@ "klona": "^2.0.4" } }, + "levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + } + }, "libphonenumber-js": { "version": "1.9.34", "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.34.tgz", @@ -27058,6 +29195,12 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "dev": true }, + "lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, "lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", @@ -27740,6 +29883,12 @@ "to-regex": "^3.0.1" } }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, "needle": { "version": "2.9.1", "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz", @@ -28239,6 +30388,20 @@ } } }, + "optionator": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "dev": true, + "requires": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + } + }, "ora": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", @@ -30426,6 +32589,12 @@ "uniq": "^1.0.1" } }, + "prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true + }, "prettier": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", @@ -30444,6 +32613,12 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -31091,6 +33266,12 @@ "define-properties": "^1.1.3" } }, + "regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true + }, "regexpu-core": { "version": "4.7.1", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz", @@ -32481,6 +34662,12 @@ "min-indent": "^1.0.0" } }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, "style-loader": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.2.1.tgz", @@ -33125,6 +35312,7 @@ "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz", "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==", "dev": true, + "peer": true, "requires": { "@babel/code-frame": "^7.0.0", "builtin-modules": "^1.1.1", @@ -33146,6 +35334,7 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, + "peer": true, "requires": { "minimist": "^1.2.5" } @@ -33154,13 +35343,15 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true + "dev": true, + "peer": true }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "dev": true, + "peer": true } } }, @@ -33169,6 +35360,7 @@ "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", "dev": true, + "peer": true, "requires": { "tslib": "^1.8.1" }, @@ -33177,7 +35369,8 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "dev": true, + "peer": true } } }, @@ -33196,6 +35389,15 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "dev": true }, + "type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1" + } + }, "type-fest": { "version": "0.21.3", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", @@ -34596,6 +36798,12 @@ "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", "dev": true }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true + }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", diff --git a/console/package.json b/console/package.json index c01316e45c..d1b8bc3eb8 100644 --- a/console/package.json +++ b/console/package.json @@ -48,6 +48,14 @@ "zone.js": "~0.11.4" }, "devDependencies": { + "@angular-eslint/builder": "12.5.0", + "@angular-eslint/eslint-plugin": "12.5.0", + "@angular-eslint/eslint-plugin-template": "12.5.0", + "@angular-eslint/schematics": "12.5.0", + "@angular-eslint/template-parser": "12.5.0", + "@typescript-eslint/eslint-plugin": "4.28.2", + "@typescript-eslint/parser": "4.28.2", + "eslint": "^7.26.0", "@angular-devkit/build-angular": "~12.2.8", "@angular/cli": "~12.2.8", "@angular/compiler-cli": "~12.2.8", @@ -69,7 +77,6 @@ "stylelint-config-standard": "^22.0.0", "stylelint-scss": "^3.21.0", "ts-node": "~10.2.1", - "tslint": "~6.1.3", "typescript": "^4.2.4" } } \ No newline at end of file diff --git a/console/src/app/app.component.html b/console/src/app/app.component.html index 13d0a3d765..76820770e6 100644 --- a/console/src/app/app.component.html +++ b/console/src/app/app.component.html @@ -1,4 +1,4 @@ - + - +
- - +
{{session.displayName ? session.displayName : session.userName}} diff --git a/console/src/app/modules/accounts-card/accounts-card.component.ts b/console/src/app/modules/accounts-card/accounts-card.component.ts index 52e338b279..5f2bcceb7d 100644 --- a/console/src/app/modules/accounts-card/accounts-card.component.ts +++ b/console/src/app/modules/accounts-card/accounts-card.component.ts @@ -6,15 +6,15 @@ import { AuthenticationService } from 'src/app/services/authentication.service'; import { GrpcAuthService } from 'src/app/services/grpc-auth.service'; @Component({ - selector: 'app-accounts-card', + selector: 'cnsl-accounts-card', templateUrl: './accounts-card.component.html', styleUrls: ['./accounts-card.component.scss'], }) export class AccountsCardComponent implements OnInit { @Input() public user!: User.AsObject; - @Input() public iamuser: boolean = false; + @Input() public iamuser: boolean | null = false; - @Output() public close: EventEmitter = new EventEmitter(); + @Output() public closedCard: EventEmitter = new EventEmitter(); public sessions: Session.AsObject[] = []; public loadingUsers: boolean = false; constructor(public authService: AuthenticationService, private router: Router, private userService: GrpcAuthService) { @@ -37,12 +37,12 @@ export class AccountsCardComponent implements OnInit { public editUserProfile(): void { this.router.navigate(['users/me']); - this.close.emit(); + this.closedCard.emit(); } public closeCard(element: HTMLElement): void { if (!element.classList.contains('dontcloseonclick')) { - this.close.emit(); + this.closedCard.emit(); } } @@ -69,6 +69,6 @@ export class AccountsCardComponent implements OnInit { public logout(): void { this.authService.signout(); - this.close.emit(); + this.closedCard.emit(); } } diff --git a/console/src/app/modules/add-key-dialog/add-key-dialog.component.html b/console/src/app/modules/add-key-dialog/add-key-dialog.component.html index 3e14142f0c..5cee8b3837 100644 --- a/console/src/app/modules/add-key-dialog/add-key-dialog.component.html +++ b/console/src/app/modules/add-key-dialog/add-key-dialog.component.html @@ -27,7 +27,7 @@ {{'ACTIONS.CANCEL' | translate}} - diff --git a/console/src/app/modules/add-key-dialog/add-key-dialog.component.ts b/console/src/app/modules/add-key-dialog/add-key-dialog.component.ts index 9fcbe11581..c49e02d087 100644 --- a/console/src/app/modules/add-key-dialog/add-key-dialog.component.ts +++ b/console/src/app/modules/add-key-dialog/add-key-dialog.component.ts @@ -4,36 +4,36 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { KeyType } from 'src/app/proto/generated/zitadel/auth_n_key_pb'; export enum AddKeyDialogType { - MACHINE = 'MACHINE', - AUTHNKEY = 'AUTHNKEY', + MACHINE = 'MACHINE', + AUTHNKEY = 'AUTHNKEY', } @Component({ - selector: 'app-add-key-dialog', - templateUrl: './add-key-dialog.component.html', - styleUrls: ['./add-key-dialog.component.scss'], + selector: 'cnsl-add-key-dialog', + templateUrl: './add-key-dialog.component.html', + styleUrls: ['./add-key-dialog.component.scss'], }) export class AddKeyDialogComponent { - public startDate: Date = new Date(); - types: KeyType[] = []; - public type!: KeyType; - public dateControl: FormControl = new FormControl('', []); + public startDate: Date = new Date(); + types: KeyType[] = []; + public type!: KeyType; + public dateControl: FormControl = new FormControl('', []); - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any, - ) { - this.types = [KeyType.KEY_TYPE_JSON]; - this.type = KeyType.KEY_TYPE_JSON; - const today = new Date(); - this.startDate.setDate(today.getDate() + 1); - } + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any, + ) { + this.types = [KeyType.KEY_TYPE_JSON]; + this.type = KeyType.KEY_TYPE_JSON; + const today = new Date(); + this.startDate.setDate(today.getDate() + 1); + } - public closeDialog(): void { - this.dialogRef.close(false); - } + public closeDialog(): void { + this.dialogRef.close(false); + } - public closeDialogWithSuccess(): void { - this.dialogRef.close({ type: this.type, date: this.dateControl.value }); - } + public closeDialogWithSuccess(): void { + this.dialogRef.close({ type: this.type, date: this.dateControl.value }); + } } diff --git a/console/src/app/modules/add-member-dialog/member-create-dialog.component.html b/console/src/app/modules/add-member-dialog/member-create-dialog.component.html index f1714b6dbe..c30e388d9b 100644 --- a/console/src/app/modules/add-member-dialog/member-create-dialog.component.html +++ b/console/src/app/modules/add-member-dialog/member-create-dialog.component.html @@ -10,7 +10,7 @@ {{ 'MEMBER.CREATIONTYPE' | translate }} + [disabled]="(type.disabled$ | async) === false"> {{ 'MEMBER.CREATIONTYPES.'+type.type | translate}} @@ -19,16 +19,16 @@

{{'PROJECT.GRANT.CREATE.SEL_PROJECT' | translate}}

- - + - - + + @@ -41,8 +41,8 @@ - - + +
@@ -51,7 +51,7 @@ {{'ACTIONS.CANCEL' | translate}} - diff --git a/console/src/app/modules/add-member-dialog/member-create-dialog.component.ts b/console/src/app/modules/add-member-dialog/member-create-dialog.component.ts index 2d7fe4092b..d807e7a135 100644 --- a/console/src/app/modules/add-member-dialog/member-create-dialog.component.ts +++ b/console/src/app/modules/add-member-dialog/member-create-dialog.component.ts @@ -11,115 +11,115 @@ import { ToastService } from 'src/app/services/toast.service'; import { ProjectAutocompleteType } from '../search-project-autocomplete/search-project-autocomplete.component'; export enum CreationType { - PROJECT_OWNED = 0, - PROJECT_GRANTED = 1, - ORG = 2, - IAM = 3, + PROJECT_OWNED = 0, + PROJECT_GRANTED = 1, + ORG = 2, + IAM = 3, } @Component({ - selector: 'app-member-create-dialog', - templateUrl: './member-create-dialog.component.html', - styleUrls: ['./member-create-dialog.component.scss'], + selector: 'cnsl-member-create-dialog', + templateUrl: './member-create-dialog.component.html', + styleUrls: ['./member-create-dialog.component.scss'], }) export class MemberCreateDialogComponent { - private projectId: string = ''; - private grantId: string = ''; - public preselectedUsers: Array = []; + private projectId: string = ''; + private grantId: string = ''; + public preselectedUsers: Array = []; - public creationType!: CreationType; + public creationType!: CreationType; - /** - * Specifies options for creating members, - * without ending $, to enable write event permission even if user is allowed - * to create members for only one specific project. - */ - public creationTypes: Array<{ type: CreationType, disabled$: Observable; }> = [ - { type: CreationType.IAM, disabled$: this.authService.isAllowed(['iam.member.write$']) }, - { type: CreationType.ORG, disabled$: this.authService.isAllowed(['org.member.write$']) }, - { type: CreationType.PROJECT_OWNED, disabled$: this.authService.isAllowed(['project.member.write']) }, - { type: CreationType.PROJECT_GRANTED, disabled$: this.authService.isAllowed(['project.grant.member.write']) }, - ]; - public users: Array = []; - public roles: Array | string[] = []; - public CreationType: any = CreationType; - public ProjectAutocompleteType: any = ProjectAutocompleteType; - public memberRoleOptions: string[] = []; + /** + * Specifies options for creating members, + * without ending $, to enable write event permission even if user is allowed + * to create members for only one specific project. + */ + public creationTypes: Array<{ type: CreationType, disabled$: Observable; }> = [ + { type: CreationType.IAM, disabled$: this.authService.isAllowed(['iam.member.write$']) }, + { type: CreationType.ORG, disabled$: this.authService.isAllowed(['org.member.write$']) }, + { type: CreationType.PROJECT_OWNED, disabled$: this.authService.isAllowed(['project.member.write']) }, + { type: CreationType.PROJECT_GRANTED, disabled$: this.authService.isAllowed(['project.grant.member.write']) }, + ]; + public users: Array = []; + public roles: Array | string[] = []; + public CreationType: any = CreationType; + public ProjectAutocompleteType: any = ProjectAutocompleteType; + public memberRoleOptions: string[] = []; - public showCreationTypeSelector: boolean = false; - constructor( - private mgmtService: ManagementService, - private adminService: AdminService, - private authService: GrpcAuthService, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any, - private toastService: ToastService, - ) { - if (data?.projectId) { - this.projectId = data.projectId; - } - if (data?.user) { - this.preselectedUsers = [data.user]; - this.users = [data.user]; - } - - if (data?.creationType !== undefined) { - this.creationType = data.creationType; - this.loadRoles(); - } else { - this.showCreationTypeSelector = true; - } + public showCreationTypeSelector: boolean = false; + constructor( + private mgmtService: ManagementService, + private adminService: AdminService, + private authService: GrpcAuthService, + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any, + private toastService: ToastService, + ) { + if (data?.projectId) { + this.projectId = data.projectId; + } + if (data?.user) { + this.preselectedUsers = [data.user]; + this.users = [data.user]; } - public loadRoles(): void { - switch (this.creationType) { - case CreationType.PROJECT_GRANTED: - this.mgmtService.listProjectGrantMemberRoles().then(resp => { - this.memberRoleOptions = resp.resultList; - }).catch(error => { - this.toastService.showError(error); - }); - break; - case CreationType.PROJECT_OWNED: - this.mgmtService.listProjectMemberRoles().then(resp => { - this.memberRoleOptions = resp.resultList; - }).catch(error => { - this.toastService.showError(error); - }); - break; - case CreationType.IAM: - this.adminService.listIAMMemberRoles().then(resp => { - this.memberRoleOptions = resp.rolesList; - }).catch(error => { - this.toastService.showError(error); - }); - break; - } + if (data?.creationType !== undefined) { + this.creationType = data.creationType; + this.loadRoles(); + } else { + this.showCreationTypeSelector = true; } + } - public selectProject(project: Project.AsObject | GrantedProject.AsObject | any): void { - if (project.projectId && project.grantId) { - this.projectId = project.projectId; - this.grantId = project.grantId; - } else if (project.id) { - this.projectId = project.id; - } - } - - public closeDialog(): void { - this.dialogRef.close(false); - } - - public closeDialogWithSuccess(): void { - this.dialogRef.close({ - users: this.users, - roles: this.roles, - creationType: this.creationType, - projectId: this.projectId, - grantId: this.grantId, + public loadRoles(): void { + switch (this.creationType) { + case CreationType.PROJECT_GRANTED: + this.mgmtService.listProjectGrantMemberRoles().then(resp => { + this.memberRoleOptions = resp.resultList; + }).catch(error => { + this.toastService.showError(error); }); + break; + case CreationType.PROJECT_OWNED: + this.mgmtService.listProjectMemberRoles().then(resp => { + this.memberRoleOptions = resp.resultList; + }).catch(error => { + this.toastService.showError(error); + }); + break; + case CreationType.IAM: + this.adminService.listIAMMemberRoles().then(resp => { + this.memberRoleOptions = resp.rolesList; + }).catch(error => { + this.toastService.showError(error); + }); + break; } + } - public setOrgMemberRoles(roles: string[]): void { - this.roles = roles; + public selectProject(project: Project.AsObject | GrantedProject.AsObject | any): void { + if (project.projectId && project.grantId) { + this.projectId = project.projectId; + this.grantId = project.grantId; + } else if (project.id) { + this.projectId = project.id; } + } + + public closeDialog(): void { + this.dialogRef.close(false); + } + + public closeDialogWithSuccess(): void { + this.dialogRef.close({ + users: this.users, + roles: this.roles, + creationType: this.creationType, + projectId: this.projectId, + grantId: this.grantId, + }); + } + + public setOrgMemberRoles(roles: string[]): void { + this.roles = roles; + } } diff --git a/console/src/app/modules/app-card/app-card.component.html b/console/src/app/modules/app-card/app-card.component.html index 530b71e5b9..da406741a6 100644 --- a/console/src/app/modules/app-card/app-card.component.html +++ b/console/src/app/modules/app-card/app-card.component.html @@ -1,5 +1,5 @@ -
+
\ No newline at end of file diff --git a/console/src/app/modules/app-card/app-card.component.ts b/console/src/app/modules/app-card/app-card.component.ts index 1ab0af6578..d83c0db5ca 100644 --- a/console/src/app/modules/app-card/app-card.component.ts +++ b/console/src/app/modules/app-card/app-card.component.ts @@ -2,13 +2,13 @@ import { Component, Input } from '@angular/core'; import { OIDCAppType } from 'src/app/proto/generated/zitadel/app_pb'; @Component({ - selector: 'cnsl-app-card', - templateUrl: './app-card.component.html', - styleUrls: ['./app-card.component.scss'], + selector: 'cnsl-app-card', + templateUrl: './app-card.component.html', + styleUrls: ['./app-card.component.scss'], }) export class AppCardComponent { - @Input() public outline: boolean = false; - @Input() public type!: OIDCAppType; - @Input() public isApiApp: boolean = false; - public OIDCAppType: any = OIDCAppType; + @Input() public outline: boolean = false; + @Input() public type: OIDCAppType | undefined = undefined; + @Input() public isApiApp: boolean = false; + public OIDCAppType: any = OIDCAppType; } diff --git a/console/src/app/modules/app-radio/app-auth-method-radio/app-auth-method-radio.component.html b/console/src/app/modules/app-radio/app-auth-method-radio/app-auth-method-radio.component.html index dca80f54df..9a5c3b0820 100644 --- a/console/src/app/modules/app-radio/app-auth-method-radio/app-auth-method-radio.component.html +++ b/console/src/app/modules/app-radio/app-auth-method-radio/app-auth-method-radio.component.html @@ -2,7 +2,7 @@ -
@@ -11,25 +11,25 @@
{{method.prefix}} -
{{'APP.OIDC.CURRENT' | translate}}
+
{{'APP.OIDC.CURRENT' | translate}}

{{method.titleI18nKey | translate}}

{{method.descI18nKey | translate}}

-
+
{{'APP.OIDC.RESPONSETYPE' | translate}} {{('APP.OIDC.RESPONSE.'+method.responseType.toString()) | translate}}
-
+
{{'APP.GRANT' | translate}} {{('APP.OIDC.GRANT.'+method.grantType.toString()) | translate}}
-
+
{{'APP.AUTHMETHOD' | translate}} {{('APP.OIDC.AUTHMETHOD.'+method.authMethod.toString()) | translate}}
-
+
{{'APP.AUTHMETHOD' | translate}} {{('APP.API.AUTHMETHOD.'+method.apiAuthMethod.toString()) | translate}}
diff --git a/console/src/app/modules/app-radio/app-auth-method-radio/app-auth-method-radio.component.ts b/console/src/app/modules/app-radio/app-auth-method-radio/app-auth-method-radio.component.ts index 2a2002913c..b719116c5a 100644 --- a/console/src/app/modules/app-radio/app-auth-method-radio/app-auth-method-radio.component.ts +++ b/console/src/app/modules/app-radio/app-auth-method-radio/app-auth-method-radio.component.ts @@ -1,39 +1,39 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { - APIAuthMethodType, - OIDCAuthMethodType, - OIDCGrantType, - OIDCResponseType, + APIAuthMethodType, + OIDCAuthMethodType, + OIDCGrantType, + OIDCResponseType, } from 'src/app/proto/generated/zitadel/app_pb'; export interface RadioItemAuthType { - key: string; - titleI18nKey: string; - descI18nKey: string; - disabled: boolean; - prefix: string; - background: string; - responseType?: OIDCResponseType; - grantType?: OIDCGrantType; - authMethod?: OIDCAuthMethodType; - apiAuthMethod?: | APIAuthMethodType; - recommended?: boolean; - notRecommended?: boolean; + key: string; + titleI18nKey: string; + descI18nKey: string; + disabled: boolean; + prefix: string; + background: string; + responseType?: OIDCResponseType; + grantType?: OIDCGrantType; + authMethod?: OIDCAuthMethodType; + apiAuthMethod?: | APIAuthMethodType; + recommended?: boolean; + notRecommended?: boolean; } @Component({ - selector: 'app-auth-method-radio', - templateUrl: './app-auth-method-radio.component.html', - styleUrls: ['./app-auth-method-radio.component.scss'], + selector: 'cnsl-auth-method-radio', + templateUrl: './app-auth-method-radio.component.html', + styleUrls: ['./app-auth-method-radio.component.scss'], }) export class AppAuthMethodRadioComponent { - @Input() current: string = ''; - @Input() selected: string = ''; - @Input() authMethods!: RadioItemAuthType[]; - @Input() isOIDC: boolean = false; - @Output() selectedMethod: EventEmitter = new EventEmitter(); + @Input() current: string = ''; + @Input() selected: string = ''; + @Input() authMethods!: RadioItemAuthType[]; + @Input() isOIDC: boolean = false; + @Output() selectedMethod: EventEmitter = new EventEmitter(); - public emitChange(): void { - this.selectedMethod.emit(this.selected); - } + public emitChange(): void { + this.selectedMethod.emit(this.selected); + } } diff --git a/console/src/app/modules/app-radio/app-type-radio/app-type-radio.component.ts b/console/src/app/modules/app-radio/app-type-radio/app-type-radio.component.ts index 5fe566ae12..de1d112bdd 100644 --- a/console/src/app/modules/app-radio/app-type-radio/app-type-radio.component.ts +++ b/console/src/app/modules/app-radio/app-type-radio/app-type-radio.component.ts @@ -2,16 +2,16 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { RadioItemAppType, WEB_TYPE } from 'src/app/pages/projects/apps/authtypes'; @Component({ - selector: 'app-type-radio', - templateUrl: './app-type-radio.component.html', - styleUrls: ['./app-type-radio.component.scss'], + selector: 'cnsl-type-radio', + templateUrl: './app-type-radio.component.html', + styleUrls: ['./app-type-radio.component.scss'], }) export class AppTypeRadioComponent { - @Input() selected: RadioItemAppType = WEB_TYPE; - @Input() types!: RadioItemAppType[]; - @Output() selectedType: EventEmitter = new EventEmitter(); + @Input() selected: RadioItemAppType = WEB_TYPE; + @Input() types!: RadioItemAppType[]; + @Output() selectedType: EventEmitter = new EventEmitter(); - public emitChange(): void { - this.selectedType.emit(this.selected); - } + public emitChange(): void { + this.selectedType.emit(this.selected); + } } diff --git a/console/src/app/modules/avatar/avatar.component.html b/console/src/app/modules/avatar/avatar.component.html index f2b7cd1feb..ec145e611e 100644 --- a/console/src/app/modules/avatar/avatar.component.html +++ b/console/src/app/modules/avatar/avatar.component.html @@ -1,5 +1,5 @@ -
diff --git a/console/src/app/modules/avatar/avatar.component.ts b/console/src/app/modules/avatar/avatar.component.ts index d258f24ed0..775908d360 100644 --- a/console/src/app/modules/avatar/avatar.component.ts +++ b/console/src/app/modules/avatar/avatar.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; @Component({ - selector: 'app-avatar', + selector: 'cnsl-avatar', templateUrl: './avatar.component.html', styleUrls: ['./avatar.component.scss'], }) @@ -77,7 +77,7 @@ export class AvatarComponent implements OnInit { return colors[hash % colors.length]; } - // tslint:disable + /* eslint-disable */ private hashCode(str: string, seed: number = 0): number { let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed; for (let i = 0, ch; i < str.length; i++) { @@ -89,5 +89,5 @@ export class AvatarComponent implements OnInit { h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^ Math.imul(h1 ^ (h1 >>> 13), 3266489909); return 4294967296 * (2097151 & h2) + (h1 >>> 0); } - // tslint:enable + /* eslint-enable */ } diff --git a/console/src/app/modules/card/card.component.ts b/console/src/app/modules/card/card.component.ts index 3ae89b775d..204aceefba 100644 --- a/console/src/app/modules/card/card.component.ts +++ b/console/src/app/modules/card/card.component.ts @@ -2,7 +2,7 @@ import { animate, style, transition, trigger } from '@angular/animations'; import { Component, Input } from '@angular/core'; @Component({ - selector: 'app-card', + selector: 'cnsl-card', templateUrl: './card.component.html', styleUrls: ['./card.component.scss'], animations: [ diff --git a/console/src/app/modules/changes/changes.component.html b/console/src/app/modules/changes/changes.component.html index 1583dca63d..4856f314ea 100644 --- a/console/src/app/modules/changes/changes.component.html +++ b/console/src/app/modules/changes/changes.component.html @@ -5,17 +5,18 @@
-
+
  • - {{ - hist.values[0]?.dates[0]| timestampToDate | localizedDate: 'dd. MMMM YYYY' }} + + {{ hist.values[0].dates[0]| timestampToDate | localizedDate: 'dd. MMMM YYYY' }} +
    - - +
    diff --git a/console/src/app/modules/changes/changes.component.ts b/console/src/app/modules/changes/changes.component.ts index b1c4b269ba..29927f7eba 100644 --- a/console/src/app/modules/changes/changes.component.ts +++ b/console/src/app/modules/changes/changes.component.ts @@ -29,6 +29,9 @@ export interface MappedChange { dates: Timestamp.AsObject[]; editorId: string; editorName: string; + editorDisplayName: string; + editorAvatarUrl: string; + editorPreferredLoginName: string; eventTypes: Array<{ key: string; localizedMessage: string; }>; sequences: number[]; }>; @@ -41,7 +44,7 @@ type ListChanges = ListMyUserChangesResponse.AsObject | ListAppChangesResponse.AsObject; @Component({ - selector: 'app-changes', + selector: 'cnsl-changes', templateUrl: './changes.component.html', styleUrls: ['./changes.component.scss'], }) @@ -253,7 +256,7 @@ export class ChangesComponent implements OnInit, OnDestroy { } // Order by ascending property value - // tslint:disable + /* eslint-disable */ valueAscOrder = (a: KeyValue, b: KeyValue): number => { return a.value.localeCompare(b.value); }; @@ -262,5 +265,5 @@ export class ChangesComponent implements OnInit, OnDestroy { keyDescOrder = (a: KeyValue, b: KeyValue): number => { return a.key > b.key ? -1 : (b.key > a.key ? 1 : 0); }; - // tslint:enable + /* eslint-enable */ } diff --git a/console/src/app/modules/client-keys/client-keys.component.html b/console/src/app/modules/client-keys/client-keys.component.html index b7c9d3de69..80411219de 100644 --- a/console/src/app/modules/client-keys/client-keys.component.html +++ b/console/src/app/modules/client-keys/client-keys.component.html @@ -1,7 +1,7 @@ -
    - add{{ 'ACTIONS.NEW' | translate }} @@ -51,7 +51,7 @@
    -     \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/modules/client-keys/client-keys.component.ts b/console/src/app/modules/client-keys/client-keys.component.ts index db593f166a..cd2a70fe30 100644 --- a/console/src/app/modules/client-keys/client-keys.component.ts +++ b/console/src/app/modules/client-keys/client-keys.component.ts @@ -16,7 +16,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { PageEvent, PaginatorComponent } from '../paginator/paginator.component'; @Component({ - selector: 'app-client-keys', + selector: 'cnsl-client-keys', templateUrl: './client-keys.component.html', styleUrls: ['./client-keys.component.scss'], }) @@ -79,7 +79,7 @@ export class ClientKeysComponent implements OnInit { width: '400px', }); - dialogRef.afterClosed().subscribe(resp => { + dialogRef.afterClosed().subscribe((resp) => { if (resp) { const type: KeyType = resp.type; @@ -96,7 +96,7 @@ export class ClientKeysComponent implements OnInit { } if (type) { - return this.mgmtService.addAppKey( + this.mgmtService.addAppKey( this.projectId, this.appId, type, diff --git a/console/src/app/modules/contributors/contributors.component.html b/console/src/app/modules/contributors/contributors.component.html index 81485275ee..1e5d553724 100644 --- a/console/src/app/modules/contributors/contributors.component.html +++ b/console/src/app/modules/contributors/contributors.component.html @@ -6,16 +6,15 @@
    -
    - - +
    diff --git a/console/src/app/modules/contributors/contributors.component.ts b/console/src/app/modules/contributors/contributors.component.ts index 57ea2e74c5..80007dfefe 100644 --- a/console/src/app/modules/contributors/contributors.component.ts +++ b/console/src/app/modules/contributors/contributors.component.ts @@ -4,46 +4,46 @@ import { BehaviorSubject } from 'rxjs'; import { Member } from 'src/app/proto/generated/zitadel/member_pb'; @Component({ - selector: 'app-contributors', - templateUrl: './contributors.component.html', - styleUrls: ['./contributors.component.scss'], - animations: [ - trigger('cardAnimation', [ - transition('* => *', [ - query('@animate', stagger('40ms', animateChild()), { optional: true }), - ]), - ]), - trigger('animate', [ - transition(':enter', [ - animate('.2s ease-in', keyframes([ - style({ opacity: 0, offset: 0 }), - style({ opacity: .5, transform: 'scale(1.05)', offset: 0.3 }), - style({ opacity: 1, transform: 'scale(1)', offset: 1 }), - ])), - ]), - ]), - ], + selector: 'cnsl-contributors', + templateUrl: './contributors.component.html', + styleUrls: ['./contributors.component.scss'], + animations: [ + trigger('cardAnimation', [ + transition('* => *', [ + query('@animate', stagger('40ms', animateChild()), { optional: true }), + ]), + ]), + trigger('animate', [ + transition(':enter', [ + animate('.2s ease-in', keyframes([ + style({ opacity: 0, offset: 0 }), + style({ opacity: .5, transform: 'scale(1.05)', offset: 0.3 }), + style({ opacity: 1, transform: 'scale(1)', offset: 1 }), + ])), + ]), + ]), + ], }) export class ContributorsComponent { - @Input() title: string = ''; - @Input() description: string = ''; - @Input() disabled: boolean = false; - @Input() totalResult: number = 0; - @Input() loading: boolean = false; - @Input() membersSubject!: BehaviorSubject; - @Output() addClicked: EventEmitter = new EventEmitter(); - @Output() showDetailClicked: EventEmitter = new EventEmitter(); - @Output() refreshClicked: EventEmitter = new EventEmitter(); + @Input() title: string = ''; + @Input() description: string = ''; + @Input() disabled: boolean = false; + @Input() totalResult: number = 0; + @Input() loading: boolean | null = false; + @Input() membersSubject!: BehaviorSubject; + @Output() addClicked: EventEmitter = new EventEmitter(); + @Output() showDetailClicked: EventEmitter = new EventEmitter(); + @Output() refreshClicked: EventEmitter = new EventEmitter(); - public emitAddMember(): void { - this.addClicked.emit(); - } + public emitAddMember(): void { + this.addClicked.emit(); + } - public emitShowDetail(): void { - this.showDetailClicked.emit(); - } + public emitShowDetail(): void { + this.showDetailClicked.emit(); + } - public emitRefresh(): void { - this.refreshClicked.emit(); - } + public emitRefresh(): void { + this.refreshClicked.emit(); + } } diff --git a/console/src/app/modules/detail-layout/detail-layout.component.ts b/console/src/app/modules/detail-layout/detail-layout.component.ts index 7d311993e4..207a3cc890 100644 --- a/console/src/app/modules/detail-layout/detail-layout.component.ts +++ b/console/src/app/modules/detail-layout/detail-layout.component.ts @@ -1,13 +1,12 @@ import { Component, Input } from '@angular/core'; -import { RouterLink } from '@angular/router'; @Component({ - selector: 'app-detail-layout', + selector: 'cnsl-detail-layout', templateUrl: './detail-layout.component.html', styleUrls: ['./detail-layout.component.scss'], }) export class DetailLayoutComponent { - @Input() backRouterLink!: RouterLink; + @Input() backRouterLink: any = undefined; @Input() title: string | null = ''; @Input() description: string | null = ''; @Input() maxWidth: boolean = true; diff --git a/console/src/app/modules/edit-text/edit-text.component.html b/console/src/app/modules/edit-text/edit-text.component.html index c468ee9137..83ef871cb1 100644 --- a/console/src/app/modules/edit-text/edit-text.component.html +++ b/console/src/app/modules/edit-text/edit-text.component.html @@ -1,4 +1,4 @@ -
    +
    @@ -8,24 +8,24 @@ {{key.key}} -
    +
    -
    +
    {{chip.key | translate}} {{chip.value}} - - + +
    - - + +
    - {{'ACTIONS.RESETTO'| translate }} '{{warnText[key.key]}}' + {{'ACTIONS.RESETTO'| translate }} '{{warnText[key.key]}}'
    diff --git a/console/src/app/modules/edit-text/edit-text.component.ts b/console/src/app/modules/edit-text/edit-text.component.ts index 32f76d307b..623581ee7b 100644 --- a/console/src/app/modules/edit-text/edit-text.component.ts +++ b/console/src/app/modules/edit-text/edit-text.component.ts @@ -3,6 +3,8 @@ import { FormControl, FormGroup } from '@angular/forms'; import { Observable, Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; +import { InfoSectionType } from '../info-section/info-section.component'; + @Component({ selector: 'cnsl-edit-text', templateUrl: './edit-text.component.html', @@ -23,6 +25,7 @@ export class EditTextComponent implements OnInit, OnDestroy { @Input() public disabled: boolean = true; public copied: string = ''; + public InfoSectionType: any = InfoSectionType; public ngOnInit(): void { this.current$.pipe(takeUntil(this.destroy$)).subscribe(value => { diff --git a/console/src/app/modules/features/features.component.html b/console/src/app/modules/features/features.component.html index 2f959d7808..f4fcc9e2a1 100644 --- a/console/src/app/modules/features/features.component.html +++ b/console/src/app/modules/features/features.component.html @@ -1,4 +1,4 @@ -

    {{'FEATURES.TIER.TITLE' | translate}}

    @@ -17,7 +17,7 @@ -
    +

    {{'FEATURES.TIER.DETAILS' | translate}} {{'ACTIONS.EDIT' | translate}}

    @@ -32,7 +32,7 @@

    -

    {{'FEATURES.TIER.CUSTOMERINVALID' | translate}}

    +

    {{'FEATURES.TIER.CUSTOMERINVALID' | translate}}

    - +
    -
    +
    - + diff --git a/console/src/app/modules/features/features.component.ts b/console/src/app/modules/features/features.component.ts index 7791aa7730..8c6b7b5845 100644 --- a/console/src/app/modules/features/features.component.ts +++ b/console/src/app/modules/features/features.component.ts @@ -26,7 +26,7 @@ export enum FeatureServiceType { } @Component({ - selector: 'app-features', + selector: 'cnsl-features', templateUrl: './features.component.html', styleUrls: ['./features.component.scss'], }) @@ -133,15 +133,16 @@ export class FeaturesComponent implements OnDestroy { }); } - private async getData(): Promise { + private async getData(): Promise { switch (this.serviceType) { case FeatureServiceType.MGMT: return this.managementService.getFeatures(); case FeatureServiceType.ADMIN: if (this.org?.id) { return this.adminService.getDefaultFeatures(); + } else { + return Promise.reject(); } - break; } } diff --git a/console/src/app/modules/features/payment-info-dialog/payment-info-dialog.component.ts b/console/src/app/modules/features/payment-info-dialog/payment-info-dialog.component.ts index e2f34a1299..5e67b4e380 100644 --- a/console/src/app/modules/features/payment-info-dialog/payment-info-dialog.component.ts +++ b/console/src/app/modules/features/payment-info-dialog/payment-info-dialog.component.ts @@ -17,7 +17,7 @@ function compare(a: Country, b: Country): number { } @Component({ - selector: 'app-payment-info-dialog', + selector: 'cnsl-payment-info-dialog', templateUrl: './payment-info-dialog.component.html', styleUrls: ['./payment-info-dialog.component.scss'], }) diff --git a/console/src/app/modules/form-field/error.directive.ts b/console/src/app/modules/form-field/error.directive.ts index 1231f1cd02..da79173ebf 100644 --- a/console/src/app/modules/form-field/error.directive.ts +++ b/console/src/app/modules/form-field/error.directive.ts @@ -5,16 +5,16 @@ let nextUniqueId = 0; export const CNSL_ERROR = new InjectionToken('CnslError'); @Directive({ - selector: '[cnsl-error]', - host: { - 'class': 'cnsl-error', - 'role': 'alert', - '[attr.id]': 'id', - }, - providers: [{ provide: CNSL_ERROR, useExisting: CnslErrorDirective }], + selector: '[cnslError]', + host: { + 'class': 'cnsl-error', + 'role': 'alert', + '[attr.id]': 'id', + }, + providers: [{ provide: CNSL_ERROR, useExisting: CnslErrorDirective }], }) export class CnslErrorDirective { - @Input() id: string = `cnsl-error-${nextUniqueId++}`; + @Input() id: string = `cnsl-error-${nextUniqueId++}`; - constructor() { } + constructor() { } } diff --git a/console/src/app/modules/form-field/form-field.component.ts b/console/src/app/modules/form-field/form-field.component.ts index c498d6ac25..0c87b66e90 100644 --- a/console/src/app/modules/form-field/form-field.component.ts +++ b/console/src/app/modules/form-field/form-field.component.ts @@ -1,19 +1,19 @@ import { - AfterContentInit, - AfterViewInit, - ChangeDetectionStrategy, - ChangeDetectorRef, - Component, - ContentChild, - ContentChildren, - ElementRef, - HostListener, - Inject, - InjectionToken, - OnDestroy, - QueryList, - ViewChild, - ViewEncapsulation, + AfterContentInit, + AfterViewInit, + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + ContentChild, + ContentChildren, + ElementRef, + HostListener, + Inject, + InjectionToken, + OnDestroy, + QueryList, + ViewChild, + ViewEncapsulation, } from '@angular/core'; import { NgControl } from '@angular/forms'; import { MatFormFieldControl } from '@angular/material/form-field'; @@ -22,142 +22,140 @@ import { startWith, takeUntil } from 'rxjs/operators'; import { cnslFormFieldAnimations } from './animations'; import { CNSL_ERROR, CnslErrorDirective } from './error.directive'; -import { _CNSL_HINT, CnslHintDirective } from './hint.directive'; export const CNSL_FORM_FIELD = new InjectionToken('CnslFormFieldComponent'); class CnslFormFieldBase { - constructor(public _elementRef: ElementRef) { } + constructor(public _elementRef: ElementRef) { } } @Component({ - selector: 'cnsl-form-field', - templateUrl: './form-field.component.html', - styleUrls: ['./form-field.component.scss'], - providers: [ - { provide: CNSL_FORM_FIELD, useExisting: CnslFormFieldComponent }, - ], - host: { - '[class.ng-untouched]': '_shouldForward("untouched")', - '[class.ng-touched]': '_shouldForward("touched")', - '[class.ng-pristine]': '_shouldForward("pristine")', - '[class.ng-dirty]': '_shouldForward("dirty")', - '[class.ng-valid]': '_shouldForward("valid")', - '[class.ng-invalid]': '_shouldForward("invalid")', - '[class.ng-pending]': '_shouldForward("pending")', - '[class.cnsl-form-field-disabled]': '_control.disabled', - '[class.cnsl-form-field-autofilled]': '_control.autofilled', - '[class.cnsl-focused]': '_control.focused', - '[class.cnsl-form-field-invalid]': '_control.errorState', - }, - encapsulation: ViewEncapsulation.None, - changeDetection: ChangeDetectionStrategy.OnPush, - animations: [cnslFormFieldAnimations.transitionMessages], + selector: 'cnsl-form-field', + templateUrl: './form-field.component.html', + styleUrls: ['./form-field.component.scss'], + providers: [ + { provide: CNSL_FORM_FIELD, useExisting: CnslFormFieldComponent }, + ], + host: { + '[class.ng-untouched]': '_shouldForward("untouched")', + '[class.ng-touched]': '_shouldForward("touched")', + '[class.ng-pristine]': '_shouldForward("pristine")', + '[class.ng-dirty]': '_shouldForward("dirty")', + '[class.ng-valid]': '_shouldForward("valid")', + '[class.ng-invalid]': '_shouldForward("invalid")', + '[class.ng-pending]': '_shouldForward("pending")', + '[class.cnsl-form-field-disabled]': '_control.disabled', + '[class.cnsl-form-field-autofilled]': '_control.autofilled', + '[class.cnsl-focused]': '_control.focused', + '[class.cnsl-form-field-invalid]': '_control.errorState', + }, + encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.OnPush, + animations: [cnslFormFieldAnimations.transitionMessages], }) export class CnslFormFieldComponent extends CnslFormFieldBase implements OnDestroy, AfterContentInit, AfterViewInit { - focused: boolean = false; - private _destroyed: Subject = new Subject(); + focused: boolean = false; + private _destroyed: Subject = new Subject(); - @ViewChild('connectionContainer', { static: true }) _connectionContainerRef!: ElementRef; - @ViewChild('inputContainer') _inputContainerRef!: ElementRef; - @ContentChild(MatFormFieldControl) _controlNonStatic!: MatFormFieldControl; - @ContentChild(MatFormFieldControl, { static: true }) _controlStatic!: MatFormFieldControl; - get _control(): MatFormFieldControl { - return this._explicitFormFieldControl || this._controlNonStatic || this._controlStatic; + @ViewChild('connectionContainer', { static: true }) _connectionContainerRef!: ElementRef; + @ViewChild('inputContainer') _inputContainerRef!: ElementRef; + @ContentChild(MatFormFieldControl) _controlNonStatic!: MatFormFieldControl; + @ContentChild(MatFormFieldControl, { static: true }) _controlStatic!: MatFormFieldControl; + get _control(): MatFormFieldControl { + return this._explicitFormFieldControl || this._controlNonStatic || this._controlStatic; + } + set _control(value: MatFormFieldControl) { + this._explicitFormFieldControl = value; + } + private _explicitFormFieldControl!: MatFormFieldControl; + readonly stateChanges: Subject = new Subject(); + + _subscriptAnimationState: string = ''; + + @ContentChildren(CNSL_ERROR as any, { descendants: true }) _errorChildren!: QueryList; + + @HostListener('blur', ['false']) + _focusChanged(isFocused: boolean): void { + if (isFocused !== this.focused && (!isFocused)) { + this.focused = isFocused; + this.stateChanges.next(); } - set _control(value: MatFormFieldControl) { - this._explicitFormFieldControl = value; - } - private _explicitFormFieldControl!: MatFormFieldControl; - readonly stateChanges: Subject = new Subject(); + } - _subscriptAnimationState: string = ''; + constructor(public _elementRef: ElementRef, private _changeDetectorRef: ChangeDetectorRef, + @Inject(ElementRef) + // Use `ElementRef` here so Angular has something to inject. + _labelOptions: any) { + super(_elementRef); - @ContentChildren(CNSL_ERROR as any, { descendants: true }) _errorChildren!: QueryList; - @ContentChildren(_CNSL_HINT, { descendants: true }) _hintChildren!: QueryList; + } - @HostListener('blur', ['false']) - _focusChanged(isFocused: boolean): void { - if (isFocused !== this.focused && (!isFocused)) { - this.focused = isFocused; - this.stateChanges.next(); - } + public ngAfterViewInit(): void { + // Avoid animations on load. + this._subscriptAnimationState = 'enter'; + this._changeDetectorRef.detectChanges(); + } + + public ngOnDestroy(): void { + this._destroyed.next(); + this._destroyed.complete(); + } + + public ngAfterContentInit(): void { + this._validateControlChild(); + + const control = this._control; + control.stateChanges.pipe(startWith(null)).subscribe(() => { + this._syncDescribedByIds(); + this._changeDetectorRef.markForCheck(); + }); + + // Run change detection if the value changes. + if (control.ngControl && control.ngControl.valueChanges) { + control.ngControl.valueChanges + .pipe(takeUntil(this._destroyed)) + .subscribe(() => this._changeDetectorRef.markForCheck()); } - constructor(public _elementRef: ElementRef, private _changeDetectorRef: ChangeDetectorRef, - @Inject(ElementRef) - // Use `ElementRef` here so Angular has something to inject. - _labelOptions: any) { - super(_elementRef); + // Update the aria-described by when the number of errors changes. + this._errorChildren.changes.pipe(startWith(null)).subscribe(() => { + this._syncDescribedByIds(); + this._changeDetectorRef.markForCheck(); + }); + } + /** Throws an error if the form field's control is missing. */ + protected _validateControlChild(): void { + if (!this._control) { + throw Error('cnsl-form-field must contain a MatFormFieldControl.'); } + } - public ngAfterViewInit(): void { - // Avoid animations on load. - this._subscriptAnimationState = 'enter'; - this._changeDetectorRef.detectChanges(); + private _syncDescribedByIds(): void { + if (this._control) { + const ids: string[] = []; + + if (this._control.userAriaDescribedBy && + typeof this._control.userAriaDescribedBy === 'string') { + ids.push(...this._control.userAriaDescribedBy.split(' ')); + } + + if (this._errorChildren) { + ids.push(...this._errorChildren.map(error => error.id)); + } + + this._control.setDescribedByIds(ids); } + } - public ngOnDestroy(): void { - this._destroyed.next(); - this._destroyed.complete(); - } + /** Determines whether a class from the NgControl should be forwarded to the host element. */ + _shouldForward(prop: keyof NgControl): boolean { + const ngControl = this._control ? this._control.ngControl : null; + return ngControl && ngControl[prop]; + } - public ngAfterContentInit(): void { - this._validateControlChild(); - - const control = this._control; - control.stateChanges.pipe(startWith(null)).subscribe(() => { - this._syncDescribedByIds(); - this._changeDetectorRef.markForCheck(); - }); - - // Run change detection if the value changes. - if (control.ngControl && control.ngControl.valueChanges) { - control.ngControl.valueChanges - .pipe(takeUntil(this._destroyed)) - .subscribe(() => this._changeDetectorRef.markForCheck()); - } - - // Update the aria-described by when the number of errors changes. - this._errorChildren.changes.pipe(startWith(null)).subscribe(() => { - this._syncDescribedByIds(); - this._changeDetectorRef.markForCheck(); - }); - } - - /** Throws an error if the form field's control is missing. */ - protected _validateControlChild(): void { - if (!this._control) { - throw Error('cnsl-form-field must contain a MatFormFieldControl.'); - } - } - - private _syncDescribedByIds(): void { - if (this._control) { - const ids: string[] = []; - - if (this._control.userAriaDescribedBy && - typeof this._control.userAriaDescribedBy === 'string') { - ids.push(...this._control.userAriaDescribedBy.split(' ')); - } - - if (this._errorChildren) { - ids.push(...this._errorChildren.map(error => error.id)); - } - - this._control.setDescribedByIds(ids); - } - } - - /** Determines whether a class from the NgControl should be forwarded to the host element. */ - _shouldForward(prop: keyof NgControl): boolean { - const ngControl = this._control ? this._control.ngControl : null; - return ngControl && ngControl[prop]; - } - - /** Determines whether to display hints or errors. */ - _getDisplayedMessages(): 'error' | 'hint' { - return (this._errorChildren && this._errorChildren.length > 0) ? 'error' : 'hint'; - } + /** Determines whether to display hints or errors. */ + _getDisplayedMessages(): 'error' | 'hint' { + return (this._errorChildren && this._errorChildren.length > 0) ? 'error' : 'hint'; + } } diff --git a/console/src/app/modules/form-field/form-field.module.ts b/console/src/app/modules/form-field/form-field.module.ts index 0b447a7822..8d1c980723 100644 --- a/console/src/app/modules/form-field/form-field.module.ts +++ b/console/src/app/modules/form-field/form-field.module.ts @@ -6,25 +6,22 @@ import { LabelModule } from 'src/app/modules/label/label.module'; import { LabelComponent } from '../label/label.component'; import { CnslErrorDirective } from './error.directive'; import { CnslFormFieldComponent } from './form-field.component'; -import { CnslHintDirective } from './hint.directive'; @NgModule({ - declarations: [ - CnslFormFieldComponent, - CnslErrorDirective, - CnslHintDirective, - ], - imports: [ - CommonModule, - MatRippleModule, - LabelModule, - ], - exports: [ - CnslFormFieldComponent, - LabelComponent, - CnslErrorDirective, - CnslHintDirective, - ], + declarations: [ + CnslFormFieldComponent, + CnslErrorDirective, + ], + imports: [ + CommonModule, + MatRippleModule, + LabelModule, + ], + exports: [ + CnslFormFieldComponent, + LabelComponent, + CnslErrorDirective, + ], }) export class FormFieldModule { } diff --git a/console/src/app/modules/form-field/hint.directive.ts b/console/src/app/modules/form-field/hint.directive.ts deleted file mode 100644 index 0044f6dc28..0000000000 --- a/console/src/app/modules/form-field/hint.directive.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Directive, InjectionToken, Input } from '@angular/core'; - -let nextUniqueId = 0; - -/** - * Injection token that can be used to reference instances of `MatHint`. It serves as - * alternative token to the actual `MatHint` class which could cause unnecessary - * retention of the class and its directive metadata. - * - * *Note*: This is not part of the public API as the MDC-based form-field will not - * need a lightweight token for `MatHint` and we want to reduce breaking changes. - */ -export const _CNSL_HINT = new InjectionToken('CnslHintDirective'); - -/** Hint text to be shown underneath the form field control. */ -@Directive({ - selector: 'cnsl-hint', - host: { - 'class': 'cnsl-hint', - '[class.cnsl-form-field-hint-end]': 'align === "end"', - '[attr.id]': 'id', - // Remove align attribute to prevent it from interfering with layout. - '[attr.align]': 'null', - }, - providers: [{ provide: _CNSL_HINT, useExisting: CnslHintDirective }], -}) -export class CnslHintDirective { - /** Whether to align the hint label at the start or end of the line. */ - @Input() align: 'start' | 'end' = 'start'; - - /** Unique ID for the hint. Used for the aria-describedby on the form field control. */ - @Input() id: string = `mat-hint-${nextUniqueId++}`; -} diff --git a/console/src/app/modules/idp-create/idp-create.component.ts b/console/src/app/modules/idp-create/idp-create.component.ts index 07672ce961..7268018a18 100644 --- a/console/src/app/modules/idp-create/idp-create.component.ts +++ b/console/src/app/modules/idp-create/idp-create.component.ts @@ -17,7 +17,7 @@ import { PolicyComponentServiceType } from '../policies/policy-component-types.e import { JWT, OIDC, RadioItemIdpType } from './idptypes'; @Component({ - selector: 'app-idp-create', + selector: 'cnsl-idp-create', templateUrl: './idp-create.component.html', styleUrls: ['./idp-create.component.scss'], }) diff --git a/console/src/app/modules/idp-table/idp-table.component.html b/console/src/app/modules/idp-table/idp-table.component.html index 45fcaaf1a0..c73ace9cf7 100644 --- a/console/src/app/modules/idp-table/idp-table.component.html +++ b/console/src/app/modules/idp-table/idp-table.component.html @@ -1,4 +1,4 @@ -
    @@ -23,15 +23,15 @@ + [disabled]="serviceType === PolicyComponentServiceType.MGMT"> google + *ngIf="idp.stylingType === IDPSTYLINGTYPE.IDPSTYLINGTYPE_GOOGLE" alt="google" /> @@ -91,7 +91,7 @@
    -     \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/modules/idp-table/idp-table.component.ts b/console/src/app/modules/idp-table/idp-table.component.ts index 7f044059e4..24234c2f4a 100644 --- a/console/src/app/modules/idp-table/idp-table.component.ts +++ b/console/src/app/modules/idp-table/idp-table.component.ts @@ -17,7 +17,7 @@ import { PolicyComponentServiceType } from '../policies/policy-component-types.e import { WarnDialogComponent } from '../warn-dialog/warn-dialog.component'; @Component({ - selector: 'app-idp-table', + selector: 'cnsl-idp-table', templateUrl: './idp-table.component.html', styleUrls: ['./idp-table.component.scss'], }) diff --git a/console/src/app/modules/idp/idp.component.html b/console/src/app/modules/idp/idp.component.html index 27c7ea297e..8e2d6d8309 100644 --- a/console/src/app/modules/idp/idp.component.html +++ b/console/src/app/modules/idp/idp.component.html @@ -1,176 +1,173 @@ - -
    - + + + - - - - - - -
    + + + +
    -
    +
    - -
    - -
    - - - {{ 'IDP.NAME' | translate }} - - - - {{ 'IDP.STYLE' | translate }} - - - {{ 'IDP.STYLEFIELD.'+field | translate }} - - - - - -
    -

    {{'IDP.AUTOREGISTER_DESC' | translate}}

    - - {{'IDP.AUTOREGISTER' | translate}} - -
    -     -
    -     + + + +
    -
    - + + {{ 'IDP.NAME' | translate }} + + + + {{ 'IDP.STYLE' | translate }} + + + {{ 'IDP.STYLEFIELD.'+field | translate }} + + + + + +
    +

    {{'IDP.AUTOREGISTER_DESC' | translate}}

    + + {{'IDP.AUTOREGISTER' | translate}} +
    - +     +
    + - -

    {{'IDP.OIDC.TITLE' | translate}}

    -

    {{'IDP.OIDC.DESCRIPTION' | translate}}

    +
    + +
    + -
    - -
    - - {{ 'IDP.ISSUER' | translate }} - - - - {{ 'IDP.CLIENTID' | translate }} - - - - Update Client Secret - - - {{ 'IDP.CLIENTSECRET' | translate }} - - -
    - - {{ 'IDP.SCOPESLIST' | translate }} + +

    {{'IDP.OIDC.TITLE' | translate}}

    +

    {{'IDP.OIDC.DESCRIPTION' | translate}}

    - -     - -
    - - - - {{scope}} cancel - - - + + +
    + + {{ 'IDP.ISSUER' | translate }} + + + + {{ 'IDP.CLIENTID' | translate }} + + + + Update Client Secret + + + {{ 'IDP.CLIENTSECRET' | translate }} + + +
    + + {{ 'IDP.SCOPESLIST' | translate }} - - {{ 'IDP.IDPDISPLAYNAMMAPPING' | translate }} - - - {{ 'IDP.MAPPINGFIELD.'+field | translate }} - - - - - {{ 'IDP.USERNAMEMAPPING' | translate }} - - - {{ 'IDP.MAPPINGFIELD.'+field | translate }} - - - -
    - - -
    -
    - + + + + {{scope}} cancel + + + + + + {{ 'IDP.IDPDISPLAYNAMMAPPING' | translate }} + + + {{ 'IDP.MAPPINGFIELD.'+field | translate }} + + + + + {{ 'IDP.USERNAMEMAPPING' | translate }} + + + {{ 'IDP.MAPPINGFIELD.'+field | translate }} + + + +
    - -

    {{'IDP.JWT.TITLE' | translate}}

    -

    {{'IDP.JWT.DESCRIPTION' | translate}}

    +
    + +
    + +     -
    - -
    - - {{ 'IDP.ISSUER' | translate }} - - + +

    {{'IDP.JWT.TITLE' | translate}}

    +

    {{'IDP.JWT.DESCRIPTION' | translate}}

    - - {{ 'IDP.JWT.HEADERNAME' | translate }} - - + + +
    + + {{ 'IDP.ISSUER' | translate }} + + - - {{ 'IDP.JWT.JWTENDPOINT' | translate }} - - + + {{ 'IDP.JWT.HEADERNAME' | translate }} + + - - {{ 'IDP.JWT.JWTKEYSENDPOINT' | translate }} - - -
    -     + + {{ 'IDP.JWT.JWTENDPOINT' | translate }} + + -
    - -
    - -     -
    + + {{ 'IDP.JWT.JWTKEYSENDPOINT' | translate }} + + +
    +
    - \ No newline at end of file +
    + +
    + +     +
    + + \ No newline at end of file diff --git a/console/src/app/modules/idp/idp.component.ts b/console/src/app/modules/idp/idp.component.ts index 74301865d0..3d1c5f9653 100644 --- a/console/src/app/modules/idp/idp.component.ts +++ b/console/src/app/modules/idp/idp.component.ts @@ -27,7 +27,7 @@ import { PolicyComponentServiceType } from '../policies/policy-component-types.e import { WarnDialogComponent } from '../warn-dialog/warn-dialog.component'; @Component({ - selector: 'app-idp', + selector: 'cnsl-idp', templateUrl: './idp.component.html', styleUrls: ['./idp.component.scss'], }) diff --git a/console/src/app/modules/info-row/info-row.component.html b/console/src/app/modules/info-row/info-row.component.html index 76c054d621..ff6f70a1cd 100644 --- a/console/src/app/modules/info-row/info-row.component.html +++ b/console/src/app/modules/info-row/info-row.component.html @@ -2,27 +2,30 @@

    {{ 'USER.PAGES.STATE' | translate }}

    {{'USER.DATA.STATE'+user.state - | translate}}

    + [ngClass]="{'active': user.state === UserState.USER_STATE_ACTIVE, 'inactive': user.state === UserState.USER_STATE_INACTIVE}"> + {{'USER.DATA.STATE'+user.state + | translate}}

    {{ 'USER.DETAILS.DATECREATED' | translate }}

    -

    {{user?.details?.creationDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

    +

    {{user.details.creationDate | + timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

    {{ 'USER.DETAILS.DATECHANGED' | translate }}

    -

    {{user?.details?.changeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

    +

    {{user.details.changeDate | timestampToDate + | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

    {{ 'USER.PAGES.LOGINNAMES' | translate }}

    -
    @@ -32,35 +35,38 @@

    {{ 'APP.PAGES.STATE' | translate }}

    {{'APP.PAGES.DETAIL.STATE.'+app.state - | translate}}

    + [ngClass]="{'active': app.state === AppState.APP_STATE_ACTIVE, 'inactive': app.state === AppState.APP_STATE_INACTIVE}"> + {{'APP.PAGES.DETAIL.STATE.'+app.state + | translate}}

    {{ 'APP.PAGES.DATECREATED' | translate }}

    -

    {{app?.details?.creationDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

    +

    {{app.details.creationDate | timestampToDate + | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

    {{ 'APP.PAGES.DATECHANGED' | translate }}

    -

    {{app?.details?.changeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

    +

    {{app.details.changeDate | timestampToDate | + localizedDate: 'dd. MMMM YYYY, HH:mm' }}

    -
    +

    {{ 'APP.OIDC.INFO.CLIENTID' | translate }}

    -
    -
    @@ -68,15 +74,14 @@

    {{ 'APP.PAGES.URLS' | translate }}

    -
    - {{environmentV.key}} - -
    +
    + {{environmentV.key}} + +
    @@ -85,28 +90,31 @@

    {{ 'IDP.ID' | translate }}

    -

    {{ 'IDP.DETAIL.DATECREATED' | translate }}

    -

    {{idp?.details?.creationDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

    +

    {{idp.details.creationDate | timestampToDate + | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

    {{ 'IDP.DETAIL.DATECHANGED' | translate }}

    -

    {{idp?.details?.changeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

    +

    {{idp.details.changeDate | timestampToDate | + localizedDate: 'dd. MMMM YYYY, HH:mm' }}

    {{ 'IDP.STATE' | translate }}

    {{'IDP.STATES.'+idp.state - | translate}}

    + [ngClass]="{'active': idp.state === IDPState.IDP_STATE_ACTIVE, 'inactive': idp.state === IDPState.IDP_STATE_INACTIVE}"> + {{'IDP.STATES.'+idp.state + | translate}}

    -
    +
    \ No newline at end of file diff --git a/console/src/app/modules/info-section/info-section.component.html b/console/src/app/modules/info-section/info-section.component.html index 42b3912cd0..7a27c8c467 100644 --- a/console/src/app/modules/info-section/info-section.component.html +++ b/console/src/app/modules/info-section/info-section.component.html @@ -1,6 +1,6 @@ -
    - - +
    + +
    diff --git a/console/src/app/modules/info-section/info-section.component.ts b/console/src/app/modules/info-section/info-section.component.ts index 938bb26700..c85fd3e55e 100644 --- a/console/src/app/modules/info-section/info-section.component.ts +++ b/console/src/app/modules/info-section/info-section.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; -enum InfoSectionType { +export enum InfoSectionType { INFO = 'INFO', SUCCESS = 'SUCCESS', WARN = 'WARN', @@ -14,5 +14,5 @@ enum InfoSectionType { export class InfoSectionComponent { @Input() type: InfoSectionType = InfoSectionType.INFO; - @Input() featureLink: string = ''; + @Input() featureLink: string | string[] = ''; } diff --git a/console/src/app/modules/input/input.directive.ts b/console/src/app/modules/input/input.directive.ts index d048851da1..8ae5ec28f7 100644 --- a/console/src/app/modules/input/input.directive.ts +++ b/console/src/app/modules/input/input.directive.ts @@ -184,7 +184,7 @@ export class InputDirective extends _MatInputMixinBase implements MatFormFieldCo * Implemented as part of MatFormFieldControl. * @docs-private */ - // tslint:disable-next-line:no-input-rename + // eslint-disable-next-line @angular-eslint/no-input-rename @Input('aria-describedby') userAriaDescribedBy!: string; /** @@ -319,10 +319,10 @@ export class InputDirective extends _MatInputMixinBase implements MatFormFieldCo // In Ivy the `host` bindings will be merged when this class is extended, whereas in // ViewEngine they're overwritten. /** Callback for the cases where the focused state of the input changes. */ - // tslint:disable:no-host-decorator-in-concrete + /* eslint-disable */ @HostListener('focus', ['true']) @HostListener('blur', ['false']) - // tslint:enable:no-host-decorator-in-concrete + /* eslint-enable */ _focusChanged(isFocused: boolean): void { if (isFocused !== this.focused && (!this.readonly || !isFocused)) { this.focused = isFocused; @@ -333,7 +333,7 @@ export class InputDirective extends _MatInputMixinBase implements MatFormFieldCo // We have to use a `HostListener` here in order to support both Ivy and ViewEngine. // In Ivy the `host` bindings will be merged when this class is extended, whereas in // ViewEngine they're overwritten. - // tslint:disable-next-line:no-host-decorator-in-concrete + // eslint-disable-next-line @HostListener('input') _onInput(): void { // This is a noop function and is used to let Angular know whenever the value changes. @@ -441,7 +441,7 @@ export class InputDirective extends _MatInputMixinBase implements MatFormFieldCo this.focus(); } } - // tslint:disable + /* eslint-disable */ static ngAcceptInputType_disabled: BooleanInput; static ngAcceptInputType_readonly: BooleanInput; static ngAcceptInputType_required: BooleanInput; @@ -449,5 +449,5 @@ export class InputDirective extends _MatInputMixinBase implements MatFormFieldCo // Accept `any` to avoid conflicts with other directives on `` that may // accept different types. static ngAcceptInputType_value: any; - // tslint:enable + /* eslint-enable */ } diff --git a/console/src/app/modules/links/links.component.html b/console/src/app/modules/links/links.component.html index cacd027c0f..afb9ffbb90 100644 --- a/console/src/app/modules/links/links.component.html +++ b/console/src/app/modules/links/links.component.html @@ -5,7 +5,7 @@
    - +
    {{ link.i18nTitle | translate }}
    diff --git a/console/src/app/modules/links/links.component.ts b/console/src/app/modules/links/links.component.ts index 0aafd44944..2592e1e6b7 100644 --- a/console/src/app/modules/links/links.component.ts +++ b/console/src/app/modules/links/links.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; export interface CnslLinks { @@ -7,7 +7,7 @@ export interface CnslLinks { routerLink?: any; href?: string; iconClasses?: string; - withRole?: Array; + withRole?: string[] | RegExp[]; } @Component({ @@ -15,11 +15,6 @@ export interface CnslLinks { templateUrl: './links.component.html', styleUrls: ['./links.component.scss'], }) -export class LinksComponent implements OnInit { +export class LinksComponent { @Input() links: Array = []; - constructor() { } - - ngOnInit(): void { - } - } diff --git a/console/src/app/modules/machine-keys/machine-keys.component.html b/console/src/app/modules/machine-keys/machine-keys.component.html index c036e312ad..54e1fae49c 100644 --- a/console/src/app/modules/machine-keys/machine-keys.component.html +++ b/console/src/app/modules/machine-keys/machine-keys.component.html @@ -1,7 +1,7 @@ -
    - add{{ 'ACTIONS.NEW' | translate }} @@ -50,7 +50,7 @@ -
    - \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/modules/machine-keys/machine-keys.component.ts b/console/src/app/modules/machine-keys/machine-keys.component.ts index 07b850b726..280d4c7cc9 100644 --- a/console/src/app/modules/machine-keys/machine-keys.component.ts +++ b/console/src/app/modules/machine-keys/machine-keys.component.ts @@ -16,125 +16,125 @@ import { ToastService } from 'src/app/services/toast.service'; import { PageEvent, PaginatorComponent } from '../paginator/paginator.component'; @Component({ - selector: 'app-machine-keys', - templateUrl: './machine-keys.component.html', - styleUrls: ['./machine-keys.component.scss'], + selector: 'cnsl-machine-keys', + templateUrl: './machine-keys.component.html', + styleUrls: ['./machine-keys.component.scss'], }) export class MachineKeysComponent implements OnInit { - @Input() userId!: string; + @Input() userId!: string; - @ViewChild(PaginatorComponent) public paginator!: PaginatorComponent; - public dataSource: MatTableDataSource = new MatTableDataSource(); - public selection: SelectionModel = new SelectionModel(true, []); - public keyResult!: ListMachineKeysResponse.AsObject; - private loadingSubject: BehaviorSubject = new BehaviorSubject(false); - public loading$: Observable = this.loadingSubject.asObservable(); - @Input() public displayedColumns: string[] = ['select', 'id', 'type', 'creationDate', 'expirationDate', 'actions']; + @ViewChild(PaginatorComponent) public paginator!: PaginatorComponent; + public dataSource: MatTableDataSource = new MatTableDataSource(); + public selection: SelectionModel = new SelectionModel(true, []); + public keyResult!: ListMachineKeysResponse.AsObject; + private loadingSubject: BehaviorSubject = new BehaviorSubject(false); + public loading$: Observable = this.loadingSubject.asObservable(); + @Input() public displayedColumns: string[] = ['select', 'id', 'type', 'creationDate', 'expirationDate', 'actions']; - @Output() public changedSelection: EventEmitter> = new EventEmitter(); + @Output() public changedSelection: EventEmitter> = new EventEmitter(); - constructor(public translate: TranslateService, private mgmtService: ManagementService, private dialog: MatDialog, - private toast: ToastService) { - this.selection.changed.subscribe(() => { - this.changedSelection.emit(this.selection.selected); - }); - } + constructor(public translate: TranslateService, private mgmtService: ManagementService, private dialog: MatDialog, + private toast: ToastService) { + this.selection.changed.subscribe(() => { + this.changedSelection.emit(this.selection.selected); + }); + } - public ngOnInit(): void { - this.getData(10, 0); - } + public ngOnInit(): void { + this.getData(10, 0); + } - public isAllSelected(): boolean { - const numSelected = this.selection.selected.length; - const numRows = this.dataSource.data.length; - return numSelected === numRows; - } + public isAllSelected(): boolean { + const numSelected = this.selection.selected.length; + const numRows = this.dataSource.data.length; + return numSelected === numRows; + } - public masterToggle(): void { - this.isAllSelected() ? - this.selection.clear() : - this.dataSource.data.forEach(row => this.selection.select(row)); - } + public masterToggle(): void { + this.isAllSelected() ? + this.selection.clear() : + this.dataSource.data.forEach(row => this.selection.select(row)); + } - public changePage(event: PageEvent): void { - this.getData(event.pageSize, event.pageIndex * event.pageSize); - } + public changePage(event: PageEvent): void { + this.getData(event.pageSize, event.pageIndex * event.pageSize); + } - public deleteKey(key: Key.AsObject): void { - this.mgmtService.removeMachineKey(key.id, this.userId).then(() => { - this.selection.clear(); - this.toast.showInfo('USER.TOAST.SELECTEDKEYSDELETED', true); - this.getData(10, 0); - }).catch(error => { - this.toast.showError(error); - }); - } + public deleteKey(key: Key.AsObject): void { + this.mgmtService.removeMachineKey(key.id, this.userId).then(() => { + this.selection.clear(); + this.toast.showInfo('USER.TOAST.SELECTEDKEYSDELETED', true); + this.getData(10, 0); + }).catch(error => { + this.toast.showError(error); + }); + } - public openAddKey(): void { - const dialogRef = this.dialog.open(AddKeyDialogComponent, { - data: {}, - width: '400px', - }); + public openAddKey(): void { + const dialogRef = this.dialog.open(AddKeyDialogComponent, { + data: {}, + width: '400px', + }); - dialogRef.afterClosed().subscribe(resp => { - if (resp) { - const type: KeyType = resp.type; + dialogRef.afterClosed().subscribe(resp => { + if (resp) { + const type: KeyType = resp.type; - let date: Timestamp | undefined; + let date: Timestamp | undefined; - if (resp.date as Moment) { - const ts = new Timestamp(); - const milliseconds = resp.date.toDate().getTime(); - const seconds = Math.abs(milliseconds / 1000); - const nanos = (milliseconds - seconds * 1000) * 1000 * 1000; - ts.setSeconds(seconds); - ts.setNanos(nanos); - date = ts; - } - - if (type) { - return this.mgmtService.addMachineKey(this.userId, type, date).then((response) => { - if (response) { - setTimeout(() => { - this.refreshPage(); - }, 1000); - - this.dialog.open(ShowKeyDialogComponent, { - data: { - key: response, - type: AddKeyDialogType.MACHINE, - }, - width: '400px', - }); - } - }).catch((error: any) => { - this.toast.showError(error); - }); - } - } - }); - } - - private async getData(limit: number, offset: number): Promise { - this.loadingSubject.next(true); - - if (this.userId) { - this.mgmtService.listMachineKeys(this.userId, limit, offset).then(resp => { - this.keyResult = resp; - if (resp.resultList) { - this.dataSource.data = resp.resultList; - } - this.loadingSubject.next(false); - }).catch((error: any) => { - this.toast.showError(error); - this.loadingSubject.next(false); - }); + if (resp.date as Moment) { + const ts = new Timestamp(); + const milliseconds = resp.date.toDate().getTime(); + const seconds = Math.abs(milliseconds / 1000); + const nanos = (milliseconds - seconds * 1000) * 1000 * 1000; + ts.setSeconds(seconds); + ts.setNanos(nanos); + date = ts; } - } - public refreshPage(): void { - this.getData(this.paginator.pageSize, this.paginator.pageIndex * this.paginator.pageSize); + if (type) { + this.mgmtService.addMachineKey(this.userId, type, date).then((response) => { + if (response) { + setTimeout(() => { + this.refreshPage(); + }, 1000); + + this.dialog.open(ShowKeyDialogComponent, { + data: { + key: response, + type: AddKeyDialogType.MACHINE, + }, + width: '400px', + }); + } + }).catch((error: any) => { + this.toast.showError(error); + }); + } + } + }); + } + + private async getData(limit: number, offset: number): Promise { + this.loadingSubject.next(true); + + if (this.userId) { + this.mgmtService.listMachineKeys(this.userId, limit, offset).then(resp => { + this.keyResult = resp; + if (resp.resultList) { + this.dataSource.data = resp.resultList; + } + this.loadingSubject.next(false); + }).catch((error: any) => { + this.toast.showError(error); + this.loadingSubject.next(false); + }); } + } + + public refreshPage(): void { + this.getData(this.paginator.pageSize, this.paginator.pageIndex * this.paginator.pageSize); + } } diff --git a/console/src/app/modules/members-table/members-table.component.html b/console/src/app/modules/members-table/members-table.component.html index 1a6371697d..da53bae9d9 100644 --- a/console/src/app/modules/members-table/members-table.component.html +++ b/console/src/app/modules/members-table/members-table.component.html @@ -1,4 +1,4 @@ - @@ -21,9 +21,9 @@ - - +
    @@ -94,4 +94,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/modules/members-table/members-table.component.ts b/console/src/app/modules/members-table/members-table.component.ts index 79af724fdd..95b492cff2 100644 --- a/console/src/app/modules/members-table/members-table.component.ts +++ b/console/src/app/modules/members-table/members-table.component.ts @@ -6,76 +6,79 @@ import { Observable, Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { IamMembersDataSource } from 'src/app/pages/iam/iam-members/iam-members-datasource'; import { OrgMembersDataSource } from 'src/app/pages/orgs/org-members/org-members-datasource'; +import { + ProjectGrantMembersDataSource, +} from 'src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-datasource'; import { Member } from 'src/app/proto/generated/zitadel/member_pb'; import { PageEvent, PaginatorComponent } from '../paginator/paginator.component'; import { ProjectMembersDataSource } from '../project-members/project-members-datasource'; -type MemberDatasource = OrgMembersDataSource | ProjectMembersDataSource | IamMembersDataSource; +type MemberDatasource = OrgMembersDataSource | ProjectMembersDataSource | ProjectGrantMembersDataSource | IamMembersDataSource; @Component({ - selector: 'app-members-table', - templateUrl: './members-table.component.html', - styleUrls: ['./members-table.component.scss'], + selector: 'cnsl-members-table', + templateUrl: './members-table.component.html', + styleUrls: ['./members-table.component.scss'], }) export class MembersTableComponent implements OnInit, OnDestroy { - public INITIALPAGESIZE: number = 25; - @Input() public canDelete: boolean = false; - @Input() public canWrite: boolean = false; - @ViewChild(PaginatorComponent) public paginator!: PaginatorComponent; - @ViewChild(MatTable) public table!: MatTable; - @Input() public dataSource!: MemberDatasource; - public selection: SelectionModel = new SelectionModel(true, []); - @Input() public memberRoleOptions: string[] = []; - @Input() public factoryLoadFunc!: Function; - @Input() public refreshTrigger!: Observable; - @Output() public updateRoles: EventEmitter<{ member: Member.AsObject, change: MatSelectChange; }> = new EventEmitter(); - @Output() public changedSelection: EventEmitter = new EventEmitter(); - @Output() public deleteMember: EventEmitter = new EventEmitter(); + public INITIALPAGESIZE: number = 25; + @Input() public canDelete: boolean | null = false; + @Input() public canWrite: boolean | null = false; + @ViewChild(PaginatorComponent) public paginator!: PaginatorComponent; + @ViewChild(MatTable) public table!: MatTable; + @Input() public dataSource!: MemberDatasource; + public selection: SelectionModel = new SelectionModel(true, []); + @Input() public memberRoleOptions: string[] = []; + @Input() public factoryLoadFunc!: Function; + @Input() public refreshTrigger!: Observable; + @Output() public updateRoles: EventEmitter<{ member: Member.AsObject, change: MatSelectChange; }> = new EventEmitter(); + @Output() public changedSelection: EventEmitter = new EventEmitter(); + @Output() public deleteMember: EventEmitter = new EventEmitter(); - private destroyed: Subject = new Subject(); + private destroyed: Subject = new Subject(); - /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ - public displayedColumns: string[] = ['select', 'userId', 'firstname', 'lastname', 'loginname', 'email', 'roles']; + /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ + public displayedColumns: string[] = ['select', 'userId', 'firstname', 'lastname', 'loginname', 'email', 'roles']; - constructor() { - this.selection.changed.pipe(takeUntil(this.destroyed)).subscribe(_ => { - this.changedSelection.emit(this.selection.selected); - }); + constructor() { + this.selection.changed.pipe(takeUntil(this.destroyed)).subscribe(_ => { + this.changedSelection.emit(this.selection.selected); + }); + } + + public ngOnInit(): void { + this.refreshTrigger.pipe(takeUntil(this.destroyed)).subscribe(() => { + this.changePage(this.paginator); + }); + + if (this.canDelete) { + this.displayedColumns.push('actions'); } + } - public ngOnInit(): void { - this.refreshTrigger.pipe(takeUntil(this.destroyed)).subscribe(() => { - this.changePage(this.paginator); - }); + public ngOnDestroy(): void { + this.destroyed.next(); + } - if (this.canDelete) { - this.displayedColumns.push('actions'); - } - } + public isAllSelected(): boolean { + const numSelected = this.selection.selected.length; + const numRows = this.dataSource.membersSubject.value.length; + return numSelected === numRows; + } - public ngOnDestroy(): void { - this.destroyed.next(); - } + public masterToggle(): void { + this.isAllSelected() ? + this.selection.clear() : + this.dataSource.membersSubject.value.forEach(row => this.selection.select(row)); + } - public isAllSelected(): boolean { - const numSelected = this.selection.selected.length; - const numRows = this.dataSource.membersSubject.value.length; - return numSelected === numRows; - } + public changePage(event?: PageEvent): any { + this.selection.clear(); + return this.factoryLoadFunc(event ?? this.paginator); + } - public masterToggle(): void { - this.isAllSelected() ? - this.selection.clear() : - this.dataSource.membersSubject.value.forEach(row => this.selection.select(row)); - } - - public changePage(event?: PageEvent): any { - this.selection.clear(); - return this.factoryLoadFunc(event ?? this.paginator); - } - - public triggerDeleteMember(member: any): void { - this.deleteMember.emit(member); - } + public triggerDeleteMember(member: any): void { + this.deleteMember.emit(member); + } } diff --git a/console/src/app/modules/meta-layout/meta-layout.component.ts b/console/src/app/modules/meta-layout/meta-layout.component.ts index 922d0e7891..f6bba78e44 100644 --- a/console/src/app/modules/meta-layout/meta-layout.component.ts +++ b/console/src/app/modules/meta-layout/meta-layout.component.ts @@ -4,19 +4,19 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @Component({ - selector: 'app-meta-layout', - templateUrl: './meta-layout.component.html', - styleUrls: ['./meta-layout.component.scss'], + selector: 'cnsl-meta-layout', + templateUrl: './meta-layout.component.html', + styleUrls: ['./meta-layout.component.scss'], }) export class MetaLayoutComponent { - constructor(private breakpointObserver: BreakpointObserver) { - this.isSmallScreen$.subscribe(small => this.hidden = small); - } - public hidden: boolean = false; - public isSmallScreen$: Observable = this.breakpointObserver - .observe('(max-width: 1000px)') - .pipe(map(result => { - return result.matches; - })); + constructor(private breakpointObserver: BreakpointObserver) { + this.isSmallScreen$.subscribe(small => this.hidden = small); + } + public hidden: boolean = false; + public isSmallScreen$: Observable = this.breakpointObserver + .observe('(max-width: 1000px)') + .pipe(map(result => { + return result.matches; + })); } diff --git a/console/src/app/modules/name-dialog/name-dialog.component.ts b/console/src/app/modules/name-dialog/name-dialog.component.ts index 551c5133cc..707e99c5fc 100644 --- a/console/src/app/modules/name-dialog/name-dialog.component.ts +++ b/console/src/app/modules/name-dialog/name-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ - selector: 'app-name-dialog', + selector: 'cnsl-name-dialog', templateUrl: './name-dialog.component.html', styleUrls: ['./name-dialog.component.scss'], }) diff --git a/console/src/app/modules/paginator/paginator.component.ts b/console/src/app/modules/paginator/paginator.component.ts index bbf029ade1..4e80b6cedd 100644 --- a/console/src/app/modules/paginator/paginator.component.ts +++ b/console/src/app/modules/paginator/paginator.component.ts @@ -2,56 +2,56 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { Timestamp } from 'src/app/proto/generated/google/protobuf/timestamp_pb'; export interface PageEvent { - length: number; - pageSize: number; - pageIndex: number; - pageSizeOptions: Array; + length: number; + pageSize: number; + pageIndex: number; + pageSizeOptions: Array; } @Component({ - selector: 'cnsl-paginator', - templateUrl: './paginator.component.html', - styleUrls: ['./paginator.component.scss'], + selector: 'cnsl-paginator', + templateUrl: './paginator.component.html', + styleUrls: ['./paginator.component.scss'], }) export class PaginatorComponent { - @Input() public timestamp!: Timestamp.AsObject; - @Input() public length: number = 0; - @Input() public pageSize: number = 10; - @Input() public pageIndex: number = 0; - @Input() public pageSizeOptions: Array = [10, 25, 50]; - @Output() public page: EventEmitter = new EventEmitter(); - constructor() { } + @Input() public timestamp: Timestamp.AsObject | undefined = undefined; + @Input() public length: number = 0; + @Input() public pageSize: number = 10; + @Input() public pageIndex: number = 0; + @Input() public pageSizeOptions: Array = [10, 25, 50]; + @Output() public page: EventEmitter = new EventEmitter(); + constructor() { } - public previous(): void { - if (this.previousPossible) { - this.pageIndex = this.pageIndex - 1; - this.emitChange(); - } + public previous(): void { + if (this.previousPossible) { + this.pageIndex = this.pageIndex - 1; + this.emitChange(); } + } - public next(): void { - if (this.nextPossible) { - this.pageIndex = this.pageIndex + 1; - this.emitChange(); - } + public next(): void { + if (this.nextPossible) { + this.pageIndex = this.pageIndex + 1; + this.emitChange(); } + } - get previousPossible(): boolean { - const temp = this.pageIndex - 1; - return (temp >= 0); - } + get previousPossible(): boolean { + const temp = this.pageIndex - 1; + return (temp >= 0); + } - get nextPossible(): boolean { - const temp = this.pageIndex + 1; - return (temp <= (this.length / this.pageSize)); - } + get nextPossible(): boolean { + const temp = this.pageIndex + 1; + return (temp <= (this.length / this.pageSize)); + } - public emitChange(): void { - this.page.emit({ - length: this.length, - pageSize: this.pageSize, - pageIndex: this.pageIndex, - pageSizeOptions: this.pageSizeOptions, - }); - } + public emitChange(): void { + this.page.emit({ + length: this.length, + pageSize: this.pageSize, + pageIndex: this.pageIndex, + pageSizeOptions: this.pageSizeOptions, + }); + } } diff --git a/console/src/app/modules/password-complexity-view/password-complexity-view.component.html b/console/src/app/modules/password-complexity-view/password-complexity-view.component.html index a4ee683690..8ad4998ff0 100644 --- a/console/src/app/modules/password-complexity-view/password-complexity-view.component.html +++ b/console/src/app/modules/password-complexity-view/password-complexity-view.component.html @@ -1,10 +1,10 @@
    - + -
    {{'POLICY.DATA.HASSYMBOL' | translate}} - +
    @@ -52,7 +52,7 @@ {{'POLICY.DATA.HASLOWERCASE' | translate}} + [(ngModel)]="complexityData.hasLowercase" [disabled]="serviceType === PolicyComponentServiceType.MGMT && (['password_complexity_policy'] | hasFeature | async) === false">
    @@ -60,15 +60,15 @@ {{'POLICY.DATA.HASUPPERCASE' | translate}} + [(ngModel)]="complexityData.hasUppercase" [disabled]="serviceType === PolicyComponentServiceType.MGMT && (['password_complexity_policy'] | hasFeature | async) === false">
    -
    - - \ No newline at end of file + + \ No newline at end of file diff --git a/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.ts b/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.ts index d5dac47b7b..ac56962ef1 100644 --- a/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.ts +++ b/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.ts @@ -13,11 +13,12 @@ import { AdminService } from 'src/app/services/admin.service'; import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; +import { InfoSectionType } from '../../info-section/info-section.component'; import { COMPLEXITY_POLICY, GridPolicy } from '../../policy-grid/policies'; import { PolicyComponentServiceType } from '../policy-component-types.enum'; @Component({ - selector: 'app-password-policy', + selector: 'cnsl-password-policy', templateUrl: './password-complexity-policy.component.html', styleUrls: ['./password-complexity-policy.component.scss'], }) @@ -32,6 +33,7 @@ export class PasswordComplexityPolicyComponent implements OnDestroy { public loading: boolean = false; public currentPolicy: GridPolicy = COMPLEXITY_POLICY; + public InfoSectionType: any = InfoSectionType; constructor( private route: ActivatedRoute, diff --git a/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.html b/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.html index 08a6c943c3..7567b595d4 100644 --- a/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.html +++ b/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.html @@ -1,14 +1,14 @@ - {{'POLICY.DEFAULTLABEL' | translate}} - + - - @@ -19,11 +19,11 @@ {{'POLICY.DATA.MAXATTEMPTS' | translate}}
    - {{lockoutData?.maxPasswordAttempts}} -
    @@ -31,7 +31,7 @@
    -
    - \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.ts b/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.ts index b2705ea8f1..f29d5ed51c 100644 --- a/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.ts +++ b/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.ts @@ -12,10 +12,11 @@ import { AdminService } from 'src/app/services/admin.service'; import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; +import { InfoSectionType } from '../../info-section/info-section.component'; import { PolicyComponentServiceType } from '../policy-component-types.enum'; @Component({ - selector: 'app-password-lockout-policy', + selector: 'cnsl-password-lockout-policy', templateUrl: './password-lockout-policy.component.html', styleUrls: ['./password-lockout-policy.component.scss'], }) @@ -27,6 +28,7 @@ export class PasswordLockoutPolicyComponent implements OnDestroy { public lockoutData!: LockoutPolicy.AsObject; private sub: Subscription = new Subscription(); public PolicyComponentServiceType: any = PolicyComponentServiceType; + public InfoSectionType: any = InfoSectionType; constructor( private route: ActivatedRoute, diff --git a/console/src/app/modules/policies/privacy-policy/privacy-policy.component.html b/console/src/app/modules/policies/privacy-policy/privacy-policy.component.html index 5d0a95a94a..31f4f5bae1 100644 --- a/console/src/app/modules/policies/privacy-policy/privacy-policy.component.html +++ b/console/src/app/modules/policies/privacy-policy/privacy-policy.component.html @@ -1,10 +1,10 @@ - {{'POLICY.DEFAULTLABEL' | translate}} - + @@ -25,12 +25,11 @@
    - -
    - - - + + diff --git a/console/src/app/modules/policies/privacy-policy/privacy-policy.component.ts b/console/src/app/modules/policies/privacy-policy/privacy-policy.component.ts index 97410d2bd5..91220f09ac 100644 --- a/console/src/app/modules/policies/privacy-policy/privacy-policy.component.ts +++ b/console/src/app/modules/policies/privacy-policy/privacy-policy.component.ts @@ -18,13 +18,14 @@ import { AdminService } from 'src/app/services/admin.service'; import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; +import { InfoSectionType } from '../../info-section/info-section.component'; import { CnslLinks } from '../../links/links.component'; import { GridPolicy, PRIVACY_POLICY } from '../../policy-grid/policies'; import { WarnDialogComponent } from '../../warn-dialog/warn-dialog.component'; import { PolicyComponentServiceType } from '../policy-component-types.enum'; @Component({ - selector: 'app-privacy-policy', + selector: 'cnsl-privacy-policy', templateUrl: './privacy-policy.component.html', styleUrls: ['./privacy-policy.component.scss'], }) @@ -39,6 +40,7 @@ export class PrivacyPolicyComponent implements OnDestroy { public privacyPolicy!: PrivacyPolicy.AsObject; public form!: FormGroup; public currentPolicy: GridPolicy = PRIVACY_POLICY; + public InfoSectionType: any = InfoSectionType; constructor( private route: ActivatedRoute, diff --git a/console/src/app/modules/policies/private-labeling-policy/preview/preview.component.html b/console/src/app/modules/policies/private-labeling-policy/preview/preview.component.html index 8ad0524ea0..fe73bcdfb0 100644 --- a/console/src/app/modules/policies/private-labeling-policy/preview/preview.component.html +++ b/console/src/app/modules/policies/private-labeling-policy/preview/preview.component.html @@ -1,33 +1,33 @@
    {{label}} -
    -
    @@ -138,8 +138,8 @@
    @@ -155,10 +155,8 @@ {{'POLICY.PRIVATELABELING.COLORS' | translate}}
    - - - +
    @@ -178,7 +176,7 @@
    - +
    @@ -213,12 +211,12 @@
    {{'POLICY.PRIVATELABELING.FONTINLOGINONLY' | translate}} -
    +
    text_fields ABC • abc • 123 - +
    {{isHoveringOverFont ? ('POLICY.PRIVATELABELING.RELEASEFONT' | translate): ('POLICY.PRIVATELABELING.DROPFONT' | translate)}} - - {{'POLICY.PRIVATELABELING.BTN' | translate}} + + {{'POLICY.PRIVATELABELING.BTN' | translate}}
    @@ -246,25 +244,25 @@
    - + - {{'POLICY.DATA.HIDELOGINNAMESUFFIX' | translate}} - + *ngIf="serviceType === PolicyComponentServiceType.MGMT && (['label_policy.watermark'] | hasFeature | async) === false"> + - {{'POLICY.DATA.DISABLEWATERMARK' | translate}} @@ -275,8 +273,8 @@
    - @@ -285,5 +283,5 @@
    - +
    \ No newline at end of file diff --git a/console/src/app/modules/policies/private-labeling-policy/private-labeling-policy.component.ts b/console/src/app/modules/policies/private-labeling-policy/private-labeling-policy.component.ts index c6c7f43358..651f5482d0 100644 --- a/console/src/app/modules/policies/private-labeling-policy/private-labeling-policy.component.ts +++ b/console/src/app/modules/policies/private-labeling-policy/private-labeling-policy.component.ts @@ -25,6 +25,7 @@ import { StorageKey, StorageLocation, StorageService } from 'src/app/services/st import { ThemeService } from 'src/app/services/theme.service'; import { ToastService } from 'src/app/services/toast.service'; +import { InfoSectionType } from '../../info-section/info-section.component'; import { GridPolicy, PRIVATELABEL_POLICY } from '../../policy-grid/policies'; import { PolicyComponentServiceType } from '../policy-component-types.enum'; @@ -51,7 +52,7 @@ export enum ColorType { const MAX_ALLOWED_SIZE = 0.5 * 1024 * 1024; @Component({ - selector: 'app-private-labeling-policy', + selector: 'cnsl-private-labeling-policy', templateUrl: './private-labeling-policy.component.html', styleUrls: ['./private-labeling-policy.component.scss'], }) @@ -88,6 +89,7 @@ export class PrivateLabelingPolicyComponent implements OnDestroy { public loadingImages: boolean = false; private org!: Org.AsObject; public currentPolicy: GridPolicy = PRIVATELABEL_POLICY; + public InfoSectionType: any = InfoSectionType; constructor( private authService: GrpcAuthService, private route: ActivatedRoute, @@ -164,16 +166,18 @@ export class PrivateLabelingPolicyComponent implements OnDestroy { } } - public onDropFont(filelist: FileList): Promise | void { - const file = filelist.item(0); - if (file) { - const formData = new FormData(); - formData.append('file', file); - switch (this.serviceType) { - case PolicyComponentServiceType.MGMT: - return this.handleFontUploadPromise(this.assetService.upload(AssetEndpoint.MGMTFONT, formData, this.org.id)); - case PolicyComponentServiceType.ADMIN: - return this.handleFontUploadPromise(this.assetService.upload(AssetEndpoint.IAMFONT, formData, this.org.id)); + public onDropFont(filelist: FileList | null): Promise | void { + if (filelist) { + const file = filelist.item(0); + if (file) { + const formData = new FormData(); + formData.append('file', file); + switch (this.serviceType) { + case PolicyComponentServiceType.MGMT: + return this.handleFontUploadPromise(this.assetService.upload(AssetEndpoint.MGMTFONT, formData, this.org.id)); + case PolicyComponentServiceType.ADMIN: + return this.handleFontUploadPromise(this.assetService.upload(AssetEndpoint.IAMFONT, formData, this.org.id)); + } } } } diff --git a/console/src/app/modules/policy-grid/policy-grid.component.html b/console/src/app/modules/policy-grid/policy-grid.component.html index 673408b75a..f972bce85d 100644 --- a/console/src/app/modules/policy-grid/policy-grid.component.html +++ b/console/src/app/modules/policy-grid/policy-grid.component.html @@ -8,8 +8,8 @@
    - +
    @@ -28,7 +28,7 @@
    diff --git a/console/src/app/modules/policy-grid/policy-grid.component.ts b/console/src/app/modules/policy-grid/policy-grid.component.ts index a55c397a1b..345f21e2c0 100644 --- a/console/src/app/modules/policy-grid/policy-grid.component.ts +++ b/console/src/app/modules/policy-grid/policy-grid.component.ts @@ -4,7 +4,7 @@ import { PolicyComponentServiceType, PolicyComponentType } from 'src/app/modules import { GridPolicy, POLICIES } from './policies'; @Component({ - selector: 'app-policy-grid', + selector: 'cnsl-policy-grid', templateUrl: './policy-grid.component.html', styleUrls: ['./policy-grid.component.scss'], }) diff --git a/console/src/app/modules/project-members/project-members-datasource.ts b/console/src/app/modules/project-members/project-members-datasource.ts index b1378c4f08..5fd10c7760 100644 --- a/console/src/app/modules/project-members/project-members-datasource.ts +++ b/console/src/app/modules/project-members/project-members-datasource.ts @@ -24,13 +24,11 @@ export class ProjectMembersDataSource extends DataSource { private loadingSubject: BehaviorSubject = new BehaviorSubject(false); public loading$: Observable = this.loadingSubject.asObservable(); - constructor(private mgmtService: ManagementService) { + constructor(private service: ManagementService) { super(); } - public loadMembers(projectId: string, - projectType: ProjectType, - pageIndex: number, pageSize: number, grantId?: string): void { + public loadMembers(projectId: string, projectType: ProjectType, pageIndex: number, pageSize: number, grantId?: string): void { const offset = pageIndex * pageSize; this.loadingSubject.next(true); @@ -40,9 +38,9 @@ export class ProjectMembersDataSource extends DataSource { Promise | undefined = projectType === ProjectType.PROJECTTYPE_OWNED ? - this.mgmtService.listProjectMembers(projectId, pageSize, offset) : + this.service.listProjectMembers(projectId, pageSize, offset) : projectType === ProjectType.PROJECTTYPE_GRANTED && grantId ? - this.mgmtService.listProjectGrantMembers(projectId, + this.service.listProjectGrantMembers(projectId, grantId, pageSize, offset) : undefined; if (promise) { from(promise).pipe( diff --git a/console/src/app/modules/project-members/project-members.component.html b/console/src/app/modules/project-members/project-members.component.html index ae823b1d2a..23eeada636 100644 --- a/console/src/app/modules/project-members/project-members.component.html +++ b/console/src/app/modules/project-members/project-members.component.html @@ -1,29 +1,28 @@ -

    {{'MEMBER.DOCSINFO' | translate}} ZITADEL Managers.

    - - + - + add{{ 'ACTIONS.NEW' | translate }} - -     - \ No newline at end of file + + diff --git a/console/src/app/modules/project-members/project-members.component.ts b/console/src/app/modules/project-members/project-members.component.ts index f9dc29699e..2594318543 100644 --- a/console/src/app/modules/project-members/project-members.component.ts +++ b/console/src/app/modules/project-members/project-members.component.ts @@ -14,205 +14,209 @@ import { CreationType, MemberCreateDialogComponent } from '../add-member-dialog/ import { ProjectMembersDataSource, ProjectType } from './project-members-datasource'; @Component({ - selector: 'app-project-members', - templateUrl: './project-members.component.html', - styleUrls: ['./project-members.component.scss'], + selector: 'cnsl-project-members', + templateUrl: './project-members.component.html', + styleUrls: ['./project-members.component.scss'], }) export class ProjectMembersComponent { - public INITIALPAGESIZE: number = 25; - public project!: Project.AsObject | GrantedProject.AsObject; - public projectType: ProjectType = ProjectType.PROJECTTYPE_OWNED; - public grantId: string = ''; - public projectName: string = ''; - public dataSource!: ProjectMembersDataSource; - public memberRoleOptions: string[] = []; + public INITIALPAGESIZE: number = 25; + public project!: Project.AsObject | GrantedProject.AsObject; + public projectType: ProjectType = ProjectType.PROJECTTYPE_OWNED; + public grantId: string = ''; + public projectName: string = ''; + public dataSource!: ProjectMembersDataSource; + public memberRoleOptions: string[] = []; - public changePageFactory!: Function; - public changePage: EventEmitter = new EventEmitter(); - public selection: Array = []; + public changePageFactory!: Function; + public changePage: EventEmitter = new EventEmitter(); + public selection: Array = []; - public ProjectType: any = ProjectType; - constructor( - private mgmtService: ManagementService, - private dialog: MatDialog, - private toast: ToastService, - private route: ActivatedRoute) { - this.route.data.pipe(take(1)).subscribe(data => { - this.projectType = data.type; + public ProjectType: any = ProjectType; + constructor( + private mgmtService: ManagementService, + private dialog: MatDialog, + private toast: ToastService, + private route: ActivatedRoute) { + this.route.data.pipe(take(1)).subscribe(data => { + this.projectType = data.type; - this.getRoleOptions(); + this.getRoleOptions(); - this.route.params.subscribe(params => { - this.grantId = params.grantid; - if (this.projectType === ProjectType.PROJECTTYPE_OWNED) { - this.mgmtService.getProjectByID(params.projectid).then(resp => { - if (resp.project) { - this.project = resp.project; - this.projectName = this.project.name; - this.dataSource = new ProjectMembersDataSource(this.mgmtService); - this.dataSource.loadMembers(this.project.id, this.projectType, 0, this.INITIALPAGESIZE); + this.route.params.subscribe(params => { + this.grantId = params.grantid; + if (this.projectType === ProjectType.PROJECTTYPE_OWNED) { + this.mgmtService.getProjectByID(params.projectid).then(resp => { + if (resp.project) { + this.project = resp.project; + this.projectName = this.project.name; + this.dataSource = new ProjectMembersDataSource(this.mgmtService); + this.dataSource.loadMembers(this.project.id, this.projectType, 0, this.INITIALPAGESIZE); - this.changePageFactory = (event?: PageEvent) => { - return this.dataSource.loadMembers( - (this.project as Project.AsObject).id, - this.projectType, - event?.pageIndex ?? 0, - event?.pageSize ?? this.INITIALPAGESIZE, - this.grantId, - ); - }; - } - }); - } else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) { - this.mgmtService.getGrantedProjectByID(params.projectid, params.grantid).then(resp => { - if (resp.grantedProject) { - this.project = resp.grantedProject; - this.projectName = this.project.projectName; - this.dataSource = new ProjectMembersDataSource(this.mgmtService); - this.dataSource.loadMembers(this.project.projectId, - this.projectType, - 0, - this.INITIALPAGESIZE, - this.grantId, - ); + this.changePageFactory = (event?: PageEvent) => { + return this.dataSource.loadMembers( + (this.project as Project.AsObject).id, + this.projectType, + event?.pageIndex ?? 0, + event?.pageSize ?? this.INITIALPAGESIZE, + this.grantId, + ); + }; + } + }); + } else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) { + this.mgmtService.getGrantedProjectByID(params.projectid, params.grantid).then(resp => { + if (resp.grantedProject) { + this.project = resp.grantedProject; + this.projectName = this.project.projectName; + this.dataSource = new ProjectMembersDataSource(this.mgmtService); + this.dataSource.loadMembers(this.project.projectId, + this.projectType, + 0, + this.INITIALPAGESIZE, + this.grantId, + ); - this.changePageFactory = (event?: PageEvent) => { - return this.dataSource.loadMembers( - (this.project as GrantedProject.AsObject).projectId, - this.projectType, - event?.pageIndex ?? 0, - event?.pageSize ?? this.INITIALPAGESIZE, - this.grantId, - ); - }; - } - }); - } - }); + this.changePageFactory = (event?: PageEvent) => { + return this.dataSource.loadMembers( + (this.project as GrantedProject.AsObject).projectId, + this.projectType, + event?.pageIndex ?? 0, + event?.pageSize ?? this.INITIALPAGESIZE, + this.grantId, + ); + }; + } + }); + } + }); + }); + } + + public getRoleOptions(): void { + if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) { + this.mgmtService.listProjectGrantMemberRoles().then(resp => { + this.memberRoleOptions = resp.resultList; + }).catch(error => { + this.toast.showError(error); + }); + } else if (this.projectType === ProjectType.PROJECTTYPE_OWNED) { + this.mgmtService.listProjectMemberRoles().then(resp => { + this.memberRoleOptions = resp.resultList; + }).catch(error => { + this.toast.showError(error); + }); + } + } + + public removeProjectMemberSelection(): void { + Promise.all(this.selection.map(member => { + if (this.projectType === ProjectType.PROJECTTYPE_OWNED) { + return this.mgmtService.removeProjectMember((this.project as Project.AsObject).id, member.userId) + .then(() => { + this.toast.showInfo('PROJECT.TOAST.MEMBERREMOVED', true); + }).catch(error => { + this.toast.showError(error); + }); + } else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) { + return this.mgmtService.removeProjectGrantMember( + (this.project as GrantedProject.AsObject).projectId, + this.grantId, + member.userId, + ).then(() => { + this.toast.showInfo('PROJECT.TOAST.MEMBERREMOVED', true); + }).catch(error => { + this.toast.showError(error); + }); + } else { + return Promise.reject(); + } + })).then(() => { + setTimeout(() => { + this.changePage.emit(); + }, 1000); + }); + } + + public removeProjectMember(member: Member.AsObject | Member.AsObject): void { + if (this.projectType === ProjectType.PROJECTTYPE_OWNED) { + this.mgmtService.removeProjectMember((this.project as Project.AsObject).id, member.userId).then(() => { + setTimeout(() => { + this.changePage.emit(); + }, 1000); + this.toast.showInfo('PROJECT.TOAST.MEMBERREMOVED', true); + }).catch(error => { + this.toast.showError(error); + }); + } else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) { + this.mgmtService.removeProjectGrantMember((this.project as GrantedProject.AsObject).projectId, this.grantId, + member.userId).then(() => { + setTimeout(() => { + this.changePage.emit(); + }, 1000); + this.toast.showInfo('PROJECT.TOAST.MEMBERREMOVED', true); + }).catch(error => { + this.toast.showError(error); }); } + } - public getRoleOptions(): void { - if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) { - this.mgmtService.listProjectGrantMemberRoles().then(resp => { - this.memberRoleOptions = resp.resultList; - }).catch(error => { - this.toast.showError(error); - }); - } else if (this.projectType === ProjectType.PROJECTTYPE_OWNED) { - this.mgmtService.listProjectMemberRoles().then(resp => { - this.memberRoleOptions = resp.resultList; - }).catch(error => { - this.toast.showError(error); - }); - } - } + public openAddMember(): void { + const dialogRef = this.dialog.open(MemberCreateDialogComponent, { + data: { + creationType: CreationType.PROJECT_OWNED, + }, + width: '400px', + }); - public removeProjectMemberSelection(): void { - Promise.all(this.selection.map(member => { + dialogRef.afterClosed().subscribe(resp => { + if (resp) { + const users: User.AsObject[] = resp.users; + const roles: string[] = resp.roles; + + if (users && users.length && roles && roles.length) { + Promise.all(users.map(user => { if (this.projectType === ProjectType.PROJECTTYPE_OWNED) { - return this.mgmtService.removeProjectMember((this.project as Project.AsObject).id, member.userId) - .then(() => { - this.toast.showInfo('PROJECT.TOAST.MEMBERREMOVED', true); - }).catch(error => { - this.toast.showError(error); - }); + return this.mgmtService.addProjectMember((this.project as Project.AsObject).id, user.id, roles); + } else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) { - return this.mgmtService.removeProjectGrantMember( - (this.project as GrantedProject.AsObject).projectId, - this.grantId, - member.userId, - ).then(() => { - this.toast.showInfo('PROJECT.TOAST.MEMBERREMOVED', true); - }).catch(error => { - this.toast.showError(error); - }); + return this.mgmtService.addProjectGrantMember( + (this.project as GrantedProject.AsObject).projectId, + this.grantId, + user.id, + roles, + ); + } else { + return Promise.reject(); } - })).then(() => { + })).then(() => { setTimeout(() => { - this.changePage.emit(); + this.changePage.emit(); }, 1000); - }); - } - - public removeProjectMember(member: Member.AsObject | Member.AsObject): void { - if (this.projectType === ProjectType.PROJECTTYPE_OWNED) { - this.mgmtService.removeProjectMember((this.project as Project.AsObject).id, member.userId).then(() => { - setTimeout(() => { - this.changePage.emit(); - }, 1000); - this.toast.showInfo('PROJECT.TOAST.MEMBERREMOVED', true); - }).catch(error => { - this.toast.showError(error); - }); - } else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) { - this.mgmtService.removeProjectGrantMember((this.project as GrantedProject.AsObject).projectId, this.grantId, - member.userId).then(() => { - setTimeout(() => { - this.changePage.emit(); - }, 1000); - this.toast.showInfo('PROJECT.TOAST.MEMBERREMOVED', true); - }).catch(error => { - this.toast.showError(error); - }); + this.toast.showInfo('PROJECT.TOAST.MEMBERSADDED', true); + }).catch(error => { + this.toast.showError(error); + }); } - } + } + }); + } - public openAddMember(): void { - const dialogRef = this.dialog.open(MemberCreateDialogComponent, { - data: { - creationType: CreationType.PROJECT_OWNED, - }, - width: '400px', + updateRoles(member: Member.AsObject, selectionChange: MatSelectChange): void { + if (this.projectType === ProjectType.PROJECTTYPE_OWNED) { + this.mgmtService.updateProjectMember((this.project as Project.AsObject).id, member.userId, selectionChange.value) + .then(() => { + this.toast.showInfo('PROJECT.TOAST.MEMBERCHANGED', true); + }).catch(error => { + this.toast.showError(error); }); - - dialogRef.afterClosed().subscribe(resp => { - if (resp) { - const users: User.AsObject[] = resp.users; - const roles: string[] = resp.roles; - - if (users && users.length && roles && roles.length) { - Promise.all(users.map(user => { - if (this.projectType === ProjectType.PROJECTTYPE_OWNED) { - return this.mgmtService.addProjectMember((this.project as Project.AsObject).id, user.id, roles); - - } else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) { - return this.mgmtService.addProjectGrantMember( - (this.project as GrantedProject.AsObject).projectId, - this.grantId, - user.id, - roles, - ); - } - })).then(() => { - setTimeout(() => { - this.changePage.emit(); - }, 1000); - this.toast.showInfo('PROJECT.TOAST.MEMBERSADDED', true); - }).catch(error => { - this.toast.showError(error); - }); - } - } + } else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) { + this.mgmtService.updateProjectGrantMember((this.project as GrantedProject.AsObject).projectId, + this.grantId, member.userId, selectionChange.value) + .then(() => { + this.toast.showInfo('PROJECT.TOAST.MEMBERCHANGED', true); + }).catch(error => { + this.toast.showError(error); }); } - - updateRoles(member: Member.AsObject, selectionChange: MatSelectChange): void { - if (this.projectType === ProjectType.PROJECTTYPE_OWNED) { - this.mgmtService.updateProjectMember((this.project as Project.AsObject).id, member.userId, selectionChange.value) - .then(() => { - this.toast.showInfo('PROJECT.TOAST.MEMBERCHANGED', true); - }).catch(error => { - this.toast.showError(error); - }); - } else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) { - this.mgmtService.updateProjectGrantMember((this.project as GrantedProject.AsObject).projectId, - this.grantId, member.userId, selectionChange.value) - .then(() => { - this.toast.showInfo('PROJECT.TOAST.MEMBERCHANGED', true); - }).catch(error => { - this.toast.showError(error); - }); - } - } + } } diff --git a/console/src/app/modules/project-private-labeling-dialog/project-private-labeling-dialog.component.html b/console/src/app/modules/project-private-labeling-dialog/project-private-labeling-dialog.component.html index 7b6ef6ffb2..e93c6b696f 100644 --- a/console/src/app/modules/project-private-labeling-dialog/project-private-labeling-dialog.component.html +++ b/console/src/app/modules/project-private-labeling-dialog/project-private-labeling-dialog.component.html @@ -15,7 +15,7 @@ {{'ACTIONS.CLOSE' | translate}} - diff --git a/console/src/app/modules/project-private-labeling-dialog/project-private-labeling-dialog.component.ts b/console/src/app/modules/project-private-labeling-dialog/project-private-labeling-dialog.component.ts index 153c413aa1..47ff460266 100644 --- a/console/src/app/modules/project-private-labeling-dialog/project-private-labeling-dialog.component.ts +++ b/console/src/app/modules/project-private-labeling-dialog/project-private-labeling-dialog.component.ts @@ -3,7 +3,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { PrivateLabelingSetting } from 'src/app/proto/generated/zitadel/project_pb'; @Component({ - selector: 'app-project-private-labeling-dialog', + selector: 'cnsl-project-private-labeling-dialog', templateUrl: './project-private-labeling-dialog.component.html', styleUrls: ['./project-private-labeling-dialog.component.scss'], }) diff --git a/console/src/app/modules/project-roles/project-role-detail/project-role-detail.component.ts b/console/src/app/modules/project-roles/project-role-detail/project-role-detail.component.ts index e876445e94..25ff57de6e 100644 --- a/console/src/app/modules/project-roles/project-role-detail/project-role-detail.component.ts +++ b/console/src/app/modules/project-roles/project-role-detail/project-role-detail.component.ts @@ -5,51 +5,51 @@ import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-project-role-detail', - templateUrl: './project-role-detail.component.html', - styleUrls: ['./project-role-detail.component.scss'], + selector: 'cnsl-project-role-detail', + templateUrl: './project-role-detail.component.html', + styleUrls: ['./project-role-detail.component.scss'], }) export class ProjectRoleDetailComponent { - public projectId: string = ''; + public projectId: string = ''; - public formGroup!: FormGroup; - constructor(private mgmtService: ManagementService, private toast: ToastService, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any) { + public formGroup!: FormGroup; + constructor(private mgmtService: ManagementService, private toast: ToastService, + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any) { - this.projectId = data.projectId; - this.formGroup = new FormGroup({ - key: new FormControl({ value: '', disabled: true }, [Validators.required]), - displayName: new FormControl(''), - group: new FormControl(''), + this.projectId = data.projectId; + this.formGroup = new FormGroup({ + key: new FormControl({ value: '', disabled: true }, [Validators.required]), + displayName: new FormControl(''), + group: new FormControl(''), + }); + + this.formGroup.patchValue(data.role); + } + + submitForm(): void { + if (this.formGroup.valid && this.key?.value && this.group?.value && this.displayName?.value) { + this.mgmtService.updateProjectRole(this.projectId, this.key.value, this.displayName.value, this.group.value) + .then(() => { + this.toast.showInfo('PROJECT.TOAST.ROLECHANGED', true); + this.dialogRef.close(true); + }).catch(error => { + this.toast.showError(error); }); + } + } - this.formGroup.patchValue(data.role); - } + public closeDialog(): void { + this.dialogRef.close(false); + } - submitForm(): void { - if (this.formGroup.valid && this.key?.value && this.group?.value && this.displayName?.value) { - this.mgmtService.updateProjectRole(this.projectId, this.key.value, this.displayName.value, this.group.value) - .then(() => { - this.toast.showInfo('PROJECT.TOAST.ROLECHANGED', true); - this.dialogRef.close(true); - }).catch(error => { - this.toast.showError(error); - }); - } - } - - public closeDialog(): void { - this.dialogRef.close(false); - } - - public get key(): AbstractControl | null { - return this.formGroup.get('key'); - } - public get displayName(): AbstractControl | null { - return this.formGroup.get('displayName'); - } - public get group(): AbstractControl | null { - return this.formGroup.get('group'); - } + public get key(): AbstractControl | null { + return this.formGroup.get('key'); + } + public get displayName(): AbstractControl | null { + return this.formGroup.get('displayName'); + } + public get group(): AbstractControl | null { + return this.formGroup.get('group'); + } } diff --git a/console/src/app/modules/project-roles/project-roles.component.html b/console/src/app/modules/project-roles/project-roles.component.html index beae34f65a..0acbf75ec1 100644 --- a/console/src/app/modules/project-roles/project-roles.component.html +++ b/console/src/app/modules/project-roles/project-roles.component.html @@ -1,8 +1,8 @@ - - + add{{ 'ACTIONS.NEW' | translate }} @@ -55,7 +55,7 @@
    -
    +
    {{'USER.SEARCH.FOUND' | translate}}:
    - - + +
    diff --git a/console/src/app/modules/search-user-autocomplete/search-user-autocomplete.component.ts b/console/src/app/modules/search-user-autocomplete/search-user-autocomplete.component.ts index 631a0fb77b..16ccf20383 100644 --- a/console/src/app/modules/search-user-autocomplete/search-user-autocomplete.component.ts +++ b/console/src/app/modules/search-user-autocomplete/search-user-autocomplete.component.ts @@ -27,7 +27,7 @@ export enum UserTarget { } @Component({ - selector: 'app-search-user-autocomplete', + selector: 'cnsl-search-user-autocomplete', templateUrl: './search-user-autocomplete.component.html', styleUrls: ['./search-user-autocomplete.component.scss'], }) @@ -95,8 +95,8 @@ export class SearchUserAutocompleteComponent implements OnInit, AfterContentChec }); } - public displayFn(user?: User.AsObject): string | undefined { - return user ? `${user.preferredLoginName}` : undefined; + public displayFn(user?: User.AsObject): string { + return user ? `${user.preferredLoginName}` : ''; } public add(event: MatChipInputEvent): void { @@ -108,6 +108,8 @@ export class SearchUserAutocompleteComponent implements OnInit, AfterContentChec const index = this.filteredUsers.findIndex((user) => { if (user.preferredLoginName) { return user.preferredLoginName === value; + } else { + return false; } }); if (index > -1) { diff --git a/console/src/app/modules/show-key-dialog/show-key-dialog.component.html b/console/src/app/modules/show-key-dialog/show-key-dialog.component.html index bf253babc2..d56626dd4a 100644 --- a/console/src/app/modules/show-key-dialog/show-key-dialog.component.html +++ b/console/src/app/modules/show-key-dialog/show-key-dialog.component.html @@ -10,16 +10,16 @@

    {{'USER.MACHINE.CREATIONDATE' | translate}}

    -

    {{keyResponse?.details?.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM YYYY, - HH:mm' }} +

    + {{ keyResponse.details.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM YYYY, HH:mm' }}

    -
    +
    diff --git a/console/src/app/modules/show-key-dialog/show-key-dialog.component.ts b/console/src/app/modules/show-key-dialog/show-key-dialog.component.ts index cca040f940..3fb80da936 100644 --- a/console/src/app/modules/show-key-dialog/show-key-dialog.component.ts +++ b/console/src/app/modules/show-key-dialog/show-key-dialog.component.ts @@ -4,7 +4,7 @@ import { saveAs } from 'file-saver'; import { AddAppKeyResponse, AddMachineKeyResponse } from 'src/app/proto/generated/zitadel/management_pb'; @Component({ - selector: 'app-show-key-dialog', + selector: 'cnsl-show-key-dialog', templateUrl: './show-key-dialog.component.html', styleUrls: ['./show-key-dialog.component.scss'], }) diff --git a/console/src/app/modules/user-grants/user-grants.component.html b/console/src/app/modules/user-grants/user-grants.component.html index 1f4617f250..022a060e51 100644 --- a/console/src/app/modules/user-grants/user-grants.component.html +++ b/console/src/app/modules/user-grants/user-grants.component.html @@ -1,16 +1,16 @@ - - + [dataSize]="dataSource?.totalResult ?? 0" [selection]="selection"> + - add{{ 'GRANTS.ADD_BTN' | translate }} @@ -29,11 +29,11 @@ [disabled]="disableWrite || !((['user.grant.write$'] | hasRole | async) || ((context === UserGrantContext.OWNED_PROJECT ? ['user.grant.write:' + row?.projectId] : context === UserGrantContext.GRANTED_PROJECT ? ['user.grant.write:' + row?.id] : []) | hasRole | async))" color="primary" (click)="$event.stopPropagation()" (change)="$event ? selection.toggle(row) : null" [checked]="selection.isSelected(row)"> - - + @@ -119,7 +119,7 @@
    + *ngIf="(context === UserGrantContext.OWNED_PROJECT || context === UserGrantContext.USER || context === UserGrantContext.NONE) && grantToEdit === grant.id && loadedProjectId && loadedProjectId === grant.projectId"> + *ngIf="(context === UserGrantContext.GRANTED_PROJECT || context === UserGrantContext.USER || context === UserGrantContext.NONE) && loadedId && loadedId === grant.projectId && grantToEdit === grant.id">
    + @@ -162,7 +163,7 @@ -
    +
    {{'GRANTS.EMPTY' | translate}}
    @@ -171,11 +172,11 @@ [pageSizeOptions]="[2, 3, 25, 50, 100, 250]" (page)="changePage($event)">
    -     + \ No newline at end of file diff --git a/console/src/app/modules/user-grants/user-grants.component.ts b/console/src/app/modules/user-grants/user-grants.component.ts index d7ff635dea..da604300f5 100644 --- a/console/src/app/modules/user-grants/user-grants.component.ts +++ b/console/src/app/modules/user-grants/user-grants.component.ts @@ -8,12 +8,12 @@ import { enterAnimations } from 'src/app/animations'; import { TextQueryMethod } from 'src/app/proto/generated/zitadel/object_pb'; import { Role } from 'src/app/proto/generated/zitadel/project_pb'; import { - UserGrant, - UserGrantDisplayNameQuery, - UserGrantOrgNameQuery, - UserGrantProjectNameQuery, - UserGrantQuery, - UserGrantRoleKeyQuery, + UserGrant, + UserGrantDisplayNameQuery, + UserGrantOrgNameQuery, + UserGrantProjectNameQuery, + UserGrantQuery, + UserGrantRoleKeyQuery, } from 'src/app/proto/generated/zitadel/user_pb'; import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; @@ -22,242 +22,242 @@ import { PageEvent, PaginatorComponent } from '../paginator/paginator.component' import { UserGrantContext, UserGrantsDataSource } from './user-grants-datasource'; export enum UserGrantListSearchKey { - DISPLAY_NAME, - ORG_NAME, - PROJECT_NAME, - ROLE_KEY, + DISPLAY_NAME, + ORG_NAME, + PROJECT_NAME, + ROLE_KEY, } @Component({ - selector: 'app-user-grants', - templateUrl: './user-grants.component.html', - styleUrls: ['./user-grants.component.scss'], - animations: [ - enterAnimations, - ], + selector: 'cnsl-user-grants', + templateUrl: './user-grants.component.html', + styleUrls: ['./user-grants.component.scss'], + animations: [ + enterAnimations, + ], }) export class UserGrantsComponent implements OnInit, AfterViewInit { - public userGrantListSearchKey: UserGrantListSearchKey | undefined = undefined; - public UserGrantListSearchKey: any = UserGrantListSearchKey; + public userGrantListSearchKey: UserGrantListSearchKey | undefined = undefined; + public UserGrantListSearchKey: any = UserGrantListSearchKey; - public INITIAL_PAGE_SIZE: number = 50; - @Input() context: UserGrantContext = UserGrantContext.NONE; - @Input() refreshOnPreviousRoutes: string[] = []; + public INITIAL_PAGE_SIZE: number = 50; + @Input() context: UserGrantContext = UserGrantContext.NONE; + @Input() refreshOnPreviousRoutes: string[] = []; - public dataSource!: UserGrantsDataSource; - public selection: SelectionModel = new SelectionModel(true, []); - @ViewChild(PaginatorComponent) public paginator!: PaginatorComponent; - @ViewChild(MatTable) public table!: MatTable; + public dataSource!: UserGrantsDataSource; + public selection: SelectionModel = new SelectionModel(true, []); + @ViewChild(PaginatorComponent) public paginator!: PaginatorComponent; + @ViewChild(MatTable) public table!: MatTable; - @Input() disableWrite: boolean = false; - @Input() disableDelete: boolean = false; + @Input() disableWrite: boolean = false; + @Input() disableDelete: boolean = false; - @Input() userId: string = ''; - @Input() projectId: string = ''; - @Input() grantId: string = ''; - @ViewChild('input') public filter!: MatInput; + @Input() userId: string = ''; + @Input() projectId: string = ''; + @Input() grantId: string = ''; + @ViewChild('input') public filter!: MatInput; - public grantRoleOptions: string[] = []; - public projectRoleOptions: Role.AsObject[] = []; - public routerLink: any = ['']; + public grantRoleOptions: string[] = []; + public projectRoleOptions: Role.AsObject[] = []; + public routerLink: any = ['']; - public loadedId: string = ''; - public loadedProjectId: string = ''; - public grantToEdit: string = ''; + public loadedId: string = ''; + public loadedProjectId: string = ''; + public grantToEdit: string = ''; - public UserGrantContext: any = UserGrantContext; + public UserGrantContext: any = UserGrantContext; - constructor( - private userService: ManagementService, - private mgmtService: ManagementService, - private toast: ToastService, - ) { } + constructor( + private userService: ManagementService, + private mgmtService: ManagementService, + private toast: ToastService, + ) { } - @Input() public displayedColumns: string[] = ['select', - 'user', - 'org', - 'projectId', 'creationDate', 'changeDate', 'roleNamesList']; + @Input() public displayedColumns: string[] = ['select', + 'user', + 'org', + 'projectId', 'creationDate', 'changeDate', 'roleNamesList']; - public ngOnInit(): void { - this.dataSource = new UserGrantsDataSource(this.userService); + public ngOnInit(): void { + this.dataSource = new UserGrantsDataSource(this.userService); - switch (this.context) { - case UserGrantContext.OWNED_PROJECT: - if (this.projectId) { - this.getProjectRoleOptions(this.projectId); - this.routerLink = ['/grant-create', 'project', this.projectId]; - } - break; - case UserGrantContext.GRANTED_PROJECT: - if (this.grantId) { - this.routerLink = ['/grant-create', 'project', this.projectId, 'grant', this.grantId]; - this.getGrantRoleOptions(this.grantId, this.projectId); - } - break; - case UserGrantContext.USER: - if (this.userId) { - this.routerLink = ['/grant-create', 'user', this.userId]; - } - break; - case UserGrantContext.NONE: - this.routerLink = ['/grant-create']; + switch (this.context) { + case UserGrantContext.OWNED_PROJECT: + if (this.projectId) { + this.getProjectRoleOptions(this.projectId); + this.routerLink = ['/grant-create', 'project', this.projectId]; } - - this.loadGrantsPage(); - } - - public ngAfterViewInit(): void { - this.paginator.page - .pipe( - tap(() => this.loadGrantsPage()), - ) - .subscribe(); - } - - private loadGrantsPage(filterValue?: string): void { - let queries: UserGrantQuery[] = []; - if (this.userGrantListSearchKey !== undefined && filterValue) { - const query = new UserGrantQuery(); - switch (this.userGrantListSearchKey) { - case UserGrantListSearchKey.DISPLAY_NAME: - const ugDnQ = new UserGrantDisplayNameQuery(); - ugDnQ.setDisplayName(filterValue); - ugDnQ.setMethod(TextQueryMethod.TEXT_QUERY_METHOD_CONTAINS_IGNORE_CASE); - query.setDisplayNameQuery(ugDnQ); - break; - case UserGrantListSearchKey.ORG_NAME: - const ugOnQ = new UserGrantOrgNameQuery(); - ugOnQ.setOrgName(filterValue); - ugOnQ.setMethod(TextQueryMethod.TEXT_QUERY_METHOD_CONTAINS_IGNORE_CASE); - query.setOrgNameQuery(ugOnQ); - break; - case UserGrantListSearchKey.PROJECT_NAME: - const ugPnQ = new UserGrantProjectNameQuery(); - ugPnQ.setProjectName(filterValue); - ugPnQ.setMethod(TextQueryMethod.TEXT_QUERY_METHOD_CONTAINS_IGNORE_CASE); - query.setProjectNameQuery(ugPnQ); - break; - case UserGrantListSearchKey.ROLE_KEY: - const ugRkQ = new UserGrantRoleKeyQuery(); - ugRkQ.setRoleKey(filterValue); - ugRkQ.setMethod(TextQueryMethod.TEXT_QUERY_METHOD_CONTAINS_IGNORE_CASE); - query.setRoleKeyQuery(ugRkQ); - break; - - } - queries = [query]; + break; + case UserGrantContext.GRANTED_PROJECT: + if (this.grantId) { + this.routerLink = ['/grant-create', 'project', this.projectId, 'grant', this.grantId]; + this.getGrantRoleOptions(this.grantId, this.projectId); } - - this.dataSource.loadGrants( - this.context, - this.paginator?.pageIndex ?? 0, - this.paginator?.pageSize ?? this.INITIAL_PAGE_SIZE, - { - projectId: this.projectId, - grantId: this.grantId, - userId: this.userId, - }, - queries, - ); - } - - public isAllSelected(): boolean { - const numSelected = this.selection.selected.length; - const numRows = this.dataSource.grantsSubject.value.length; - return numSelected === numRows; - } - - public masterToggle(): void { - this.isAllSelected() ? - this.selection.clear() : - this.dataSource.grantsSubject.value.forEach(row => this.selection.select(row)); - } - - public loadGrantOptions(grant: UserGrant.AsObject): void { - this.grantToEdit = grant.id; - if (grant.projectGrantId && grant.projectId) { - this.getGrantRoleOptions(grant.projectGrantId, grant.projectId); - } else if (grant.projectId) { - this.getProjectRoleOptions(grant.projectId); + break; + case UserGrantContext.USER: + if (this.userId) { + this.routerLink = ['/grant-create', 'user', this.userId]; } + break; + case UserGrantContext.NONE: + this.routerLink = ['/grant-create']; } - private getGrantRoleOptions(id: string, projectId: string): void { - this.mgmtService.getGrantedProjectByID(projectId, id).then(resp => { - if (resp.grantedProject) { - this.loadedId = projectId; - this.grantRoleOptions = resp.grantedProject?.grantedRoleKeysList; - } - }).catch(error => { - this.grantToEdit = ''; - this.toast.showError(error); - }); + this.loadGrantsPage(); + } + + public ngAfterViewInit(): void { + this.paginator.page + .pipe( + tap(() => this.loadGrantsPage()), + ) + .subscribe(); + } + + private loadGrantsPage(filterValue?: string): void { + let queries: UserGrantQuery[] = []; + if (this.userGrantListSearchKey !== undefined && filterValue) { + const query = new UserGrantQuery(); + switch (this.userGrantListSearchKey) { + case UserGrantListSearchKey.DISPLAY_NAME: + const ugDnQ = new UserGrantDisplayNameQuery(); + ugDnQ.setDisplayName(filterValue); + ugDnQ.setMethod(TextQueryMethod.TEXT_QUERY_METHOD_CONTAINS_IGNORE_CASE); + query.setDisplayNameQuery(ugDnQ); + break; + case UserGrantListSearchKey.ORG_NAME: + const ugOnQ = new UserGrantOrgNameQuery(); + ugOnQ.setOrgName(filterValue); + ugOnQ.setMethod(TextQueryMethod.TEXT_QUERY_METHOD_CONTAINS_IGNORE_CASE); + query.setOrgNameQuery(ugOnQ); + break; + case UserGrantListSearchKey.PROJECT_NAME: + const ugPnQ = new UserGrantProjectNameQuery(); + ugPnQ.setProjectName(filterValue); + ugPnQ.setMethod(TextQueryMethod.TEXT_QUERY_METHOD_CONTAINS_IGNORE_CASE); + query.setProjectNameQuery(ugPnQ); + break; + case UserGrantListSearchKey.ROLE_KEY: + const ugRkQ = new UserGrantRoleKeyQuery(); + ugRkQ.setRoleKey(filterValue); + ugRkQ.setMethod(TextQueryMethod.TEXT_QUERY_METHOD_CONTAINS_IGNORE_CASE); + query.setRoleKeyQuery(ugRkQ); + break; + + } + queries = [query]; } - private getProjectRoleOptions(projectId: string): void { - this.mgmtService.listProjectRoles(projectId, 100, 0).then(resp => { - this.loadedProjectId = projectId; - this.projectRoleOptions = resp.resultList; - }); + this.dataSource.loadGrants( + this.context, + this.paginator?.pageIndex ?? 0, + this.paginator?.pageSize ?? this.INITIAL_PAGE_SIZE, + { + projectId: this.projectId, + grantId: this.grantId, + userId: this.userId, + }, + queries, + ); + } + + public isAllSelected(): boolean { + const numSelected = this.selection.selected.length; + const numRows = this.dataSource.grantsSubject.value.length; + return numSelected === numRows; + } + + public masterToggle(): void { + this.isAllSelected() ? + this.selection.clear() : + this.dataSource.grantsSubject.value.forEach(row => this.selection.select(row)); + } + + public loadGrantOptions(grant: UserGrant.AsObject): void { + this.grantToEdit = grant.id; + if (grant.projectGrantId && grant.projectId) { + this.getGrantRoleOptions(grant.projectGrantId, grant.projectId); + } else if (grant.projectId) { + this.getProjectRoleOptions(grant.projectId); } + } - updateRoles(grant: UserGrant.AsObject, selectionChange: MatSelectChange): void { - this.userService.updateUserGrant(grant.id, grant.userId, selectionChange.value) - .then(() => { - this.toast.showInfo('GRANTS.TOAST.UPDATED', true); - }).catch(error => { - this.toast.showError(error); - }); - } + private getGrantRoleOptions(id: string, projectId: string): void { + this.mgmtService.getGrantedProjectByID(projectId, id).then(resp => { + if (resp.grantedProject) { + this.loadedId = projectId; + this.grantRoleOptions = resp.grantedProject?.grantedRoleKeysList; + } + }).catch(error => { + this.grantToEdit = ''; + this.toast.showError(error); + }); + } - deleteGrantSelection(): void { - this.userService.bulkRemoveUserGrant(this.selection.selected.map(grant => grant.id)).then(() => { - this.toast.showInfo('GRANTS.TOAST.BULKREMOVED', true); - const data = this.dataSource.grantsSubject.getValue(); - this.selection.selected.forEach((item) => { - const index = data.findIndex(i => i.id === item.id); - if (index > -1) { - data.splice(index, 1); - this.dataSource.grantsSubject.next(data); - } - }); - this.selection.clear(); - }).catch(error => { - this.toast.showError(error); - }); - } + private getProjectRoleOptions(projectId: string): void { + this.mgmtService.listProjectRoles(projectId, 100, 0).then(resp => { + this.loadedProjectId = projectId; + this.projectRoleOptions = resp.resultList; + }); + } - public changePage(event?: PageEvent): void { - this.dataSource.loadGrants( - this.context, - event?.pageIndex ?? this.paginator.pageIndex, - event?.pageSize ?? this.paginator.pageSize, - { - projectId: this.projectId, - grantId: this.grantId, - userId: this.userId, - }, - ); - } + updateRoles(grant: UserGrant.AsObject, selectionChange: MatSelectChange): void { + this.userService.updateUserGrant(grant.id, grant.userId, selectionChange.value) + .then(() => { + this.toast.showInfo('GRANTS.TOAST.UPDATED', true); + }).catch(error => { + this.toast.showError(error); + }); + } - public applyFilter(event: Event): void { - this.selection.clear(); - const filterValue = (event.target as HTMLInputElement).value; - - this.loadGrantsPage(filterValue); - } - - public setFilter(key: UserGrantListSearchKey): void { - setTimeout(() => { - if (this.filter) { - (this.filter as any).nativeElement.focus(); - } - }, 100); - - if (this.userGrantListSearchKey !== key) { - this.userGrantListSearchKey = key; - } else { - this.userGrantListSearchKey = undefined; - this.loadGrantsPage(); + deleteGrantSelection(): void { + this.userService.bulkRemoveUserGrant(this.selection.selected.map(grant => grant.id)).then(() => { + this.toast.showInfo('GRANTS.TOAST.BULKREMOVED', true); + const data = this.dataSource.grantsSubject.getValue(); + this.selection.selected.forEach((item) => { + const index = data.findIndex(i => i.id === item.id); + if (index > -1) { + data.splice(index, 1); + this.dataSource.grantsSubject.next(data); } + }); + this.selection.clear(); + }).catch(error => { + this.toast.showError(error); + }); + } + + public changePage(event?: PageEvent): void { + this.dataSource.loadGrants( + this.context, + event?.pageIndex ?? this.paginator.pageIndex, + event?.pageSize ?? this.paginator.pageSize, + { + projectId: this.projectId, + grantId: this.grantId, + userId: this.userId, + }, + ); + } + + public applyFilter(event: Event): void { + this.selection.clear(); + const filterValue = (event.target as HTMLInputElement).value; + + this.loadGrantsPage(filterValue); + } + + public setFilter(key: UserGrantListSearchKey): void { + setTimeout(() => { + if (this.filter) { + (this.filter as any).nativeElement.focus(); + } + }, 100); + + if (this.userGrantListSearchKey !== key) { + this.userGrantListSearchKey = key; + } else { + this.userGrantListSearchKey = undefined; + this.loadGrantsPage(); } + } } diff --git a/console/src/app/modules/warn-dialog/warn-dialog.component.ts b/console/src/app/modules/warn-dialog/warn-dialog.component.ts index 8012e29a61..ace2cf5435 100644 --- a/console/src/app/modules/warn-dialog/warn-dialog.component.ts +++ b/console/src/app/modules/warn-dialog/warn-dialog.component.ts @@ -1,26 +1,23 @@ -import { Component, Inject, OnInit } from '@angular/core'; +import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ - selector: 'app-warn-dialog', - templateUrl: './warn-dialog.component.html', - styleUrls: ['./warn-dialog.component.scss'], + selector: 'cnsl-warn-dialog', + templateUrl: './warn-dialog.component.html', + styleUrls: ['./warn-dialog.component.scss'], }) -export class WarnDialogComponent implements OnInit { +export class WarnDialogComponent { - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any, - ) { } + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any, + ) { } - ngOnInit(): void { - } + public closeDialog(): void { + this.dialogRef.close(false); + } - public closeDialog(): void { - this.dialogRef.close(false); - } - - public closeDialogWithSuccess(): void { - this.dialogRef.close(true); - } + public closeDialogWithSuccess(): void { + this.dialogRef.close(true); + } } diff --git a/console/src/app/modules/zitadel-tier/zitadel-tier.component.html b/console/src/app/modules/zitadel-tier/zitadel-tier.component.html index 438951b328..1f9df112ff 100644 --- a/console/src/app/modules/zitadel-tier/zitadel-tier.component.html +++ b/console/src/app/modules/zitadel-tier/zitadel-tier.component.html @@ -6,7 +6,7 @@

    {{features.tier.name}}

    {{features.tier?.description}}

    -

    {{'FEATURES.TIERSTATES.'+features.tier.state | translate}}

    +

    {{'FEATURES.TIERSTATES.'+features.tier.state | translate}}

    {{features.tier?.statusInfo}}

    diff --git a/console/src/app/modules/zitadel-tier/zitadel-tier.component.ts b/console/src/app/modules/zitadel-tier/zitadel-tier.component.ts index e1672bc9d4..200e3ffc34 100644 --- a/console/src/app/modules/zitadel-tier/zitadel-tier.component.ts +++ b/console/src/app/modules/zitadel-tier/zitadel-tier.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { Features, FeaturesState } from 'src/app/proto/generated/zitadel/features_pb'; @Component({ @@ -6,14 +6,9 @@ import { Features, FeaturesState } from 'src/app/proto/generated/zitadel/feature templateUrl: './zitadel-tier.component.html', styleUrls: ['./zitadel-tier.component.scss'], }) -export class ZitadelTierComponent implements OnInit { +export class ZitadelTierComponent { @Input() public features!: Features.AsObject; @Input() public iam: boolean = false; FeaturesState: any = FeaturesState; - constructor() { } - - ngOnInit(): void { - } - } diff --git a/console/src/app/pages/grants/grants.component.html b/console/src/app/pages/grants/grants.component.html index 7a73ef7513..c6ba0a7f02 100644 --- a/console/src/app/pages/grants/grants.component.html +++ b/console/src/app/pages/grants/grants.component.html @@ -1,9 +1,9 @@

    {{ 'GRANTS.TITLE' | translate }}

    {{'GRANTS.DESC' | translate }}

    - - +
    \ No newline at end of file diff --git a/console/src/app/pages/grants/grants.component.ts b/console/src/app/pages/grants/grants.component.ts index ff622bdc30..6f0e69f054 100644 --- a/console/src/app/pages/grants/grants.component.ts +++ b/console/src/app/pages/grants/grants.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-grants', - templateUrl: './grants.component.html', - styleUrls: ['./grants.component.scss'], + selector: 'cnsl-grants', + templateUrl: './grants.component.html', + styleUrls: ['./grants.component.scss'], }) export class GrantsComponent { } diff --git a/console/src/app/pages/home/home.component.html b/console/src/app/pages/home/home.component.html index 586ffe4b3a..b4ffeaa673 100644 --- a/console/src/app/pages/home/home.component.html +++ b/console/src/app/pages/home/home.component.html @@ -5,7 +5,7 @@
    - +

    {{'ONBOARDING.HEADER' | translate}}

    {{'ONBOARDING.TITLE' | translate}}

    @@ -34,8 +34,8 @@     - - + +

    @@ -44,11 +44,11 @@

    {{'HOME.IAM_DESC'| translate}}

    - + {{'HOME.IAM_CREATE_ORG' | translate}} - + {{'HOME.IAM_POLICY_IAM' | translate}} {{'HOME.IAM_POLICY_COMPLEXITY' @@ -63,10 +63,10 @@
    {{'HOME.IAM_BUTTON' | translate}}
    -     +     - +

    {{'HOME.SECURITYANDPRIVACY'| translate}}

    @@ -80,17 +80,17 @@ {{'HOME.SECURITYANDPRIVACY_BUTTON' | translate}}
    -     + - - + +

    {{'HOME.PROJECTS'| translate}}

    {{'HOME.PROJECTS_DESC'| translate}}

    - + {{'HOME.PROJECTS_NEW_LINK' | translate}} @@ -100,20 +100,20 @@ {{'HOME.PROJECTS_BUTTON' | translate}}
    -     +     - - + +

    {{'HOME.PROTECTION'| translate}}

    {{'HOME.PROTECTION_DESC'| translate}}

    - + {{'HOME.ORG_POLICY_IAM' | translate}} - + {{'HOME.ORG_POLICY_COMPLEXITY' | translate}} @@ -128,24 +128,24 @@ {{'HOME.PROTECTION_BUTTON' | translate}}
    -     +     - - + +

    {{'HOME.USERS'| translate}}

    {{'HOME.USERS_DESC'| translate}}

    - + {{'HOME.USERS_HUMANS' | translate}} {{'HOME.USERS_MACHINES' | translate}} - + {{'HOME.USERS_CREATE' | translate}} @@ -155,7 +155,7 @@ {{'HOME.USERS_BUTTON' | translate}}
    -     +
    diff --git a/console/src/app/pages/home/home.component.ts b/console/src/app/pages/home/home.component.ts index b2cd776d9a..3f51bdd4ef 100644 --- a/console/src/app/pages/home/home.component.ts +++ b/console/src/app/pages/home/home.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { GrpcAuthService } from 'src/app/services/grpc-auth.service'; @Component({ - selector: 'app-home', + selector: 'cnsl-home', templateUrl: './home.component.html', styleUrls: ['./home.component.scss'], }) diff --git a/console/src/app/pages/iam/eventstore/eventstore.component.html b/console/src/app/pages/iam/eventstore/eventstore.component.html index 1c4bec9c51..bdff705eea 100644 --- a/console/src/app/pages/iam/eventstore/eventstore.component.html +++ b/console/src/app/pages/iam/eventstore/eventstore.component.html @@ -1,12 +1,12 @@

    {{ 'IAM.EVENTSTORE.TITLE' | translate }}

    {{'IAM.EVENTSTORE.DESCRIPTION' | translate }}

    - - - + + + - - - + +
    \ No newline at end of file diff --git a/console/src/app/pages/iam/eventstore/eventstore.component.ts b/console/src/app/pages/iam/eventstore/eventstore.component.ts index 716eb4a86d..19a14c4d66 100644 --- a/console/src/app/pages/iam/eventstore/eventstore.component.ts +++ b/console/src/app/pages/iam/eventstore/eventstore.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-eventstore', - templateUrl: './eventstore.component.html', - styleUrls: ['./eventstore.component.scss'], + selector: 'cnsl-eventstore', + templateUrl: './eventstore.component.html', + styleUrls: ['./eventstore.component.scss'], }) export class EventstoreComponent { } diff --git a/console/src/app/pages/iam/failed-events/failed-events.component.html b/console/src/app/pages/iam/failed-events/failed-events.component.html index 2f9d187cf2..080289c4c8 100644 --- a/console/src/app/pages/iam/failed-events/failed-events.component.html +++ b/console/src/app/pages/iam/failed-events/failed-events.component.html @@ -1,5 +1,5 @@
    - @@ -49,5 +49,5 @@
    -     +
    \ No newline at end of file diff --git a/console/src/app/pages/iam/failed-events/failed-events.component.ts b/console/src/app/pages/iam/failed-events/failed-events.component.ts index f971a5e543..f4ce4a2c47 100644 --- a/console/src/app/pages/iam/failed-events/failed-events.component.ts +++ b/console/src/app/pages/iam/failed-events/failed-events.component.ts @@ -8,45 +8,43 @@ import { AdminService } from 'src/app/services/admin.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-iam-failed-events', - templateUrl: './failed-events.component.html', - styleUrls: ['./failed-events.component.scss'], + selector: 'cnsl-iam-failed-events', + templateUrl: './failed-events.component.html', + styleUrls: ['./failed-events.component.scss'], }) export class FailedEventsComponent implements AfterViewInit { - // public viewTimestamp!: Timestamp.AsObject; + @ViewChild(MatPaginator) public eventPaginator!: MatPaginator; + public eventDataSource!: MatTableDataSource; - @ViewChild(MatPaginator) public eventPaginator!: MatPaginator; - public eventDataSource!: MatTableDataSource; + public eventDisplayedColumns: string[] = ['viewName', 'database', 'failedSequence', 'failureCount', 'errorMessage', 'actions']; - public eventDisplayedColumns: string[] = ['viewName', 'database', 'failedSequence', 'failureCount', 'errorMessage', 'actions']; + private loadingSubject: BehaviorSubject = new BehaviorSubject(false); + public loading$: Observable = this.loadingSubject.asObservable(); + constructor(private adminService: AdminService, private toast: ToastService) { + this.loadEvents(); + } - private loadingSubject: BehaviorSubject = new BehaviorSubject(false); - public loading$: Observable = this.loadingSubject.asObservable(); - constructor(private adminService: AdminService, private toast: ToastService) { - this.loadEvents(); - } + ngAfterViewInit(): void { + this.loadEvents(); + } - ngAfterViewInit(): void { - this.loadEvents(); - } + public loadEvents(): void { + this.loadingSubject.next(true); + from(this.adminService.listFailedEvents()).pipe( + map(resp => { + return resp?.resultList; + }), + catchError(() => of([])), + finalize(() => this.loadingSubject.next(false)), + ).subscribe(views => { + this.eventDataSource = new MatTableDataSource(views); + this.eventDataSource.paginator = this.eventPaginator; + }); + } - public loadEvents(): void { - this.loadingSubject.next(true); - from(this.adminService.listFailedEvents()).pipe( - map(resp => { - return resp?.resultList; - }), - catchError(() => of([])), - finalize(() => this.loadingSubject.next(false)), - ).subscribe(views => { - this.eventDataSource = new MatTableDataSource(views); - this.eventDataSource.paginator = this.eventPaginator; - }); - } - - public cancelEvent(viewname: string, db: string, seq: number): void { - this.adminService.removeFailedEvent(viewname, db, seq).then(() => { - this.toast.showInfo('IAM.FAILEDEVENTS.DELETESUCCESS', true); - }); - } + public cancelEvent(viewname: string, db: string, seq: number): void { + this.adminService.removeFailedEvent(viewname, db, seq).then(() => { + this.toast.showInfo('IAM.FAILEDEVENTS.DELETESUCCESS', true); + }); + } } diff --git a/console/src/app/pages/iam/iam-members/iam-members-datasource.ts b/console/src/app/pages/iam/iam-members/iam-members-datasource.ts index f6b684253c..295b86e467 100644 --- a/console/src/app/pages/iam/iam-members/iam-members-datasource.ts +++ b/console/src/app/pages/iam/iam-members/iam-members-datasource.ts @@ -11,53 +11,53 @@ import { AdminService } from 'src/app/services/admin.service'; * (including sorting, pagination, and filtering). */ export class IamMembersDataSource extends DataSource { - public totalResult: number = 0; - public viewTimestamp!: Timestamp.AsObject; - public membersSubject: BehaviorSubject = new BehaviorSubject([]); - private loadingSubject: BehaviorSubject = new BehaviorSubject(false); - public loading$: Observable = this.loadingSubject.asObservable(); + public totalResult: number = 0; + public viewTimestamp!: Timestamp.AsObject; + public membersSubject: BehaviorSubject = new BehaviorSubject([]); + private loadingSubject: BehaviorSubject = new BehaviorSubject(false); + public loading$: Observable = this.loadingSubject.asObservable(); - constructor(private adminService: AdminService) { - super(); - } + constructor(private service: AdminService) { + super(); + } - public loadMembers( - pageIndex: number, pageSize: number): void { - const offset = pageIndex * pageSize; + public loadMembers( + pageIndex: number, pageSize: number): void { + const offset = pageIndex * pageSize; - this.loadingSubject.next(true); + this.loadingSubject.next(true); - from(this.adminService.listIAMMembers(pageSize, offset)).pipe( - map(resp => { - this.totalResult = resp.details?.totalResult || 0; - if (resp.details?.viewTimestamp) { - this.viewTimestamp = resp.details?.viewTimestamp; - } - return resp.resultList; - }), - catchError(() => of([])), - finalize(() => this.loadingSubject.next(false)), - ).subscribe(members => { - this.membersSubject.next(members); - }); - } + from(this.service.listIAMMembers(pageSize, offset)).pipe( + map(resp => { + this.totalResult = resp.details?.totalResult || 0; + if (resp.details?.viewTimestamp) { + this.viewTimestamp = resp.details?.viewTimestamp; + } + return resp.resultList; + }), + catchError(() => of([])), + finalize(() => this.loadingSubject.next(false)), + ).subscribe(members => { + this.membersSubject.next(members); + }); + } - /** - * Connect this data source to the table. The table will only update when - * the returned stream emits new items. - * @returns A stream of the items to be rendered. - */ - public connect(): Observable { - return this.membersSubject.asObservable(); - } + /** + * Connect this data source to the table. The table will only update when + * the returned stream emits new items. + * @returns A stream of the items to be rendered. + */ + public connect(): Observable { + return this.membersSubject.asObservable(); + } - /** - * Called when the table is being destroyed. Use this function, to clean up - * any open connections or free any held resources that were set up during connect. - */ - public disconnect(): void { - this.membersSubject.complete(); - this.loadingSubject.complete(); - } + /** + * Called when the table is being destroyed. Use this function, to clean up + * any open connections or free any held resources that were set up during connect. + */ + public disconnect(): void { + this.membersSubject.complete(); + this.loadingSubject.complete(); + } } diff --git a/console/src/app/pages/iam/iam-members/iam-members.component.html b/console/src/app/pages/iam/iam-members/iam-members.component.html index 2dfe669f5c..b22c6b2eb6 100644 --- a/console/src/app/pages/iam/iam-members/iam-members.component.html +++ b/console/src/app/pages/iam/iam-members/iam-members.component.html @@ -1,26 +1,26 @@
    -

    {{'MEMBER.DOCSINFO' | translate}} ZITADEL Managers.

    - - + - + add{{ 'ACTIONS.NEW' | translate }} - -     + +
    \ No newline at end of file diff --git a/console/src/app/pages/iam/iam-members/iam-members.component.ts b/console/src/app/pages/iam/iam-members/iam-members.component.ts index 9ecf017fc5..2c8c15d996 100644 --- a/console/src/app/pages/iam/iam-members/iam-members.component.ts +++ b/console/src/app/pages/iam/iam-members/iam-members.component.ts @@ -11,100 +11,100 @@ import { ToastService } from 'src/app/services/toast.service'; import { IamMembersDataSource } from './iam-members-datasource'; @Component({ - selector: 'app-iam-members', - templateUrl: './iam-members.component.html', - styleUrls: ['./iam-members.component.scss'], + selector: 'cnsl-iam-members', + templateUrl: './iam-members.component.html', + styleUrls: ['./iam-members.component.scss'], }) export class IamMembersComponent { - public INITIALPAGESIZE: number = 25; - public dataSource!: IamMembersDataSource; + public INITIALPAGESIZE: number = 25; + public dataSource!: IamMembersDataSource; - public memberRoleOptions: string[] = []; - public changePageFactory!: Function; - public changePage: EventEmitter = new EventEmitter(); - public selection: Array = []; + public memberRoleOptions: string[] = []; + public changePageFactory!: Function; + public changePage: EventEmitter = new EventEmitter(); + public selection: Array = []; - constructor(private adminService: AdminService, - private dialog: MatDialog, - private toast: ToastService) { + constructor(private adminService: AdminService, + private dialog: MatDialog, + private toast: ToastService) { - this.dataSource = new IamMembersDataSource(this.adminService); - this.dataSource.loadMembers(0, 25); - this.getRoleOptions(); + this.dataSource = new IamMembersDataSource(this.adminService); + this.dataSource.loadMembers(0, 25); + this.getRoleOptions(); - this.changePageFactory = (event?: PageEvent) => { - return this.dataSource.loadMembers( - event?.pageIndex ?? 0, - event?.pageSize ?? this.INITIALPAGESIZE, - ); - }; - } + this.changePageFactory = (event?: PageEvent) => { + return this.dataSource.loadMembers( + event?.pageIndex ?? 0, + event?.pageSize ?? this.INITIALPAGESIZE, + ); + }; + } - public getRoleOptions(): void { - this.adminService.listIAMMemberRoles().then(resp => { - this.memberRoleOptions = resp.rolesList; - }).catch(error => { - this.toast.showError(error); - }); - } + public getRoleOptions(): void { + this.adminService.listIAMMemberRoles().then(resp => { + this.memberRoleOptions = resp.rolesList; + }).catch(error => { + this.toast.showError(error); + }); + } - updateRoles(member: Member.AsObject, selectionChange: MatSelectChange): void { - this.adminService.updateIAMMember(member.userId, selectionChange.value) - .then(() => { - this.toast.showInfo('ORG.TOAST.MEMBERCHANGED', true); - }).catch(error => { - this.toast.showError(error); - }); - } + updateRoles(member: Member.AsObject, selectionChange: MatSelectChange): void { + this.adminService.updateIAMMember(member.userId, selectionChange.value) + .then(() => { + this.toast.showInfo('ORG.TOAST.MEMBERCHANGED', true); + }).catch(error => { + this.toast.showError(error); + }); + } - public removeMemberSelection(): void { - Promise.all(this.selection.map(member => { - return this.adminService.removeIAMMember(member.userId).then(() => { - this.toast.showInfo('IAM.TOAST.MEMBERREMOVED', true); - this.changePage.emit(); - }).catch(error => { - this.toast.showError(error); - }); - })); - } + public removeMemberSelection(): void { + Promise.all(this.selection.map(member => { + return this.adminService.removeIAMMember(member.userId).then(() => { + this.toast.showInfo('IAM.TOAST.MEMBERREMOVED', true); + this.changePage.emit(); + }).catch(error => { + this.toast.showError(error); + }); + })); + } - public removeMember(member: Member.AsObject): void { - this.adminService.removeIAMMember(member.userId).then(() => { - this.toast.showInfo('IAM.TOAST.MEMBERREMOVED', true); + public removeMember(member: Member.AsObject): void { + this.adminService.removeIAMMember(member.userId).then(() => { + this.toast.showInfo('IAM.TOAST.MEMBERREMOVED', true); + setTimeout(() => { + this.changePage.emit(); + }, 1000); + }).catch(error => { + this.toast.showError(error); + }); + } + + public openAddMember(): void { + const dialogRef = this.dialog.open(MemberCreateDialogComponent, { + data: { + creationType: CreationType.IAM, + }, + width: '400px', + }); + + dialogRef.afterClosed().subscribe(resp => { + if (resp) { + const users: User.AsObject[] = resp.users; + const roles: string[] = resp.roles; + + if (users && users.length && roles && roles.length) { + Promise.all(users.map(user => { + return this.adminService.addIAMMember(user.id, roles); + })).then(() => { + this.toast.showInfo('IAM.TOAST.MEMBERADDED', true); setTimeout(() => { - this.changePage.emit(); + this.changePage.emit(); }, 1000); - }).catch(error => { + }).catch(error => { this.toast.showError(error); - }); - } - - public openAddMember(): void { - const dialogRef = this.dialog.open(MemberCreateDialogComponent, { - data: { - creationType: CreationType.IAM, - }, - width: '400px', - }); - - dialogRef.afterClosed().subscribe(resp => { - if (resp) { - const users: User.AsObject[] = resp.users; - const roles: string[] = resp.roles; - - if (users && users.length && roles && roles.length) { - Promise.all(users.map(user => { - return this.adminService.addIAMMember(user.id, roles); - })).then(() => { - this.toast.showInfo('IAM.TOAST.MEMBERADDED', true); - setTimeout(() => { - this.changePage.emit(); - }, 1000); - }).catch(error => { - this.toast.showError(error); - }); - } - } - }); - } + }); + } + } + }); + } } diff --git a/console/src/app/pages/iam/iam-views/iam-views.component.html b/console/src/app/pages/iam/iam-views/iam-views.component.html index 76a4fe96a6..f843baf9e8 100644 --- a/console/src/app/pages/iam/iam-views/iam-views.component.html +++ b/console/src/app/pages/iam/iam-views/iam-views.component.html @@ -1,52 +1,50 @@ -
    - + - - - - - +
    {{ 'IAM.VIEWS.VIEWNAME' | translate }} {{view.viewName}}
    + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - -
    {{ 'IAM.VIEWS.VIEWNAME' | translate }} {{view.viewName}} {{ 'IAM.VIEWS.DATABASE' | translate }} {{view.database}} {{ 'IAM.VIEWS.DATABASE' | translate }} {{view.database}} {{ 'IAM.VIEWS.SEQUENCE' | translate }} {{view.processedSequence}} {{ 'IAM.VIEWS.SEQUENCE' | translate }} {{view.processedSequence}} {{ 'IAM.VIEWS.EVENTTIMESTAMP' | translate }} - {{view?.eventTimestamp | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }} - {{ 'IAM.VIEWS.EVENTTIMESTAMP' | translate }} + {{view?.eventTimestamp | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }} + {{ 'IAM.VIEWS.LASTSPOOL' | translate }} - {{view?.lastSuccessfulSpoolerRun | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' - }} - {{ 'IAM.VIEWS.LASTSPOOL' | translate }} + {{view?.lastSuccessfulSpoolerRun | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' + }} + - - + +
    - - -     -
    \ No newline at end of file + + + + + + diff --git a/console/src/app/pages/iam/iam-views/iam-views.component.scss b/console/src/app/pages/iam/iam-views/iam-views.component.scss index b776dcba8c..a61cc73023 100644 --- a/console/src/app/pages/iam/iam-views/iam-views.component.scss +++ b/console/src/app/pages/iam/iam-views/iam-views.component.scss @@ -22,6 +22,10 @@ } } +.views-table { + width: 100%; +} + tr { button { visibility: hidden; diff --git a/console/src/app/pages/iam/iam-views/iam-views.component.ts b/console/src/app/pages/iam/iam-views/iam-views.component.ts index fef8432e61..a35cfdd54e 100644 --- a/console/src/app/pages/iam/iam-views/iam-views.component.ts +++ b/console/src/app/pages/iam/iam-views/iam-views.component.ts @@ -11,63 +11,63 @@ import { AdminService } from 'src/app/services/admin.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-iam-views', - templateUrl: './iam-views.component.html', - styleUrls: ['./iam-views.component.scss'], + selector: 'cnsl-iam-views', + templateUrl: './iam-views.component.html', + styleUrls: ['./iam-views.component.scss'], }) export class IamViewsComponent implements AfterViewInit { - @ViewChild(MatSort) sort!: MatSort; + @ViewChild(MatSort) sort!: MatSort; - @ViewChild(MatPaginator) public paginator!: MatPaginator; - public dataSource!: MatTableDataSource; + @ViewChild(MatPaginator) public paginator!: MatPaginator; + public dataSource!: MatTableDataSource; - public displayedColumns: string[] = ['viewName', 'database', 'sequence', 'eventTimestamp', 'lastSuccessfulSpoolerRun', 'actions']; + public displayedColumns: string[] = ['viewName', 'database', 'sequence', 'eventTimestamp', 'lastSuccessfulSpoolerRun', 'actions']; - private loadingSubject: BehaviorSubject = new BehaviorSubject(false); - public loading$: Observable = this.loadingSubject.asObservable(); - constructor(private adminService: AdminService, private dialog: MatDialog, private toast: ToastService) { - this.loadViews(); - } + private loadingSubject: BehaviorSubject = new BehaviorSubject(false); + public loading$: Observable = this.loadingSubject.asObservable(); + constructor(private adminService: AdminService, private dialog: MatDialog, private toast: ToastService) { + this.loadViews(); + } - ngAfterViewInit(): void { - this.loadViews(); - } + ngAfterViewInit(): void { + this.loadViews(); + } - public loadViews(): void { - this.loadingSubject.next(true); - from(this.adminService.listViews()).pipe( - map(resp => { - return resp.resultList; - }), - catchError(() => of([])), - finalize(() => this.loadingSubject.next(false)), - ).subscribe(views => { - this.dataSource = new MatTableDataSource(views); - this.dataSource.paginator = this.paginator; - this.dataSource.sort = this.sort; + public loadViews(): void { + this.loadingSubject.next(true); + from(this.adminService.listViews()).pipe( + map(resp => { + return resp.resultList; + }), + catchError(() => of([])), + finalize(() => this.loadingSubject.next(false)), + ).subscribe(views => { + this.dataSource = new MatTableDataSource(views); + this.dataSource.paginator = this.paginator; + this.dataSource.sort = this.sort; + }); + } + + public cancelView(viewname: string, db: string): void { + const dialogRef = this.dialog.open(WarnDialogComponent, { + data: { + confirmKey: 'ACTIONS.CLEAR', + cancelKey: 'ACTIONS.CANCEL', + titleKey: 'IAM.VIEWS.DIALOG.VIEW_CLEAR_TITLE', + descriptionKey: 'IAM.VIEWS.DIALOG.VIEW_CLEAR_DESCRIPTION', + }, + width: '400px', + }); + + dialogRef.afterClosed().subscribe(resp => { + if (resp) { + this.adminService.clearView(viewname, db).then(() => { + this.toast.showInfo('IAM.VIEWS.CLEARED', true); + this.loadViews(); + }).catch(error => { + this.toast.showError(error); }); - } - - public cancelView(viewname: string, db: string): void { - const dialogRef = this.dialog.open(WarnDialogComponent, { - data: { - confirmKey: 'ACTIONS.CLEAR', - cancelKey: 'ACTIONS.CANCEL', - titleKey: 'IAM.VIEWS.DIALOG.VIEW_CLEAR_TITLE', - descriptionKey: 'IAM.VIEWS.DIALOG.VIEW_CLEAR_DESCRIPTION', - }, - width: '400px', - }); - - dialogRef.afterClosed().subscribe(resp => { - if (resp) { - this.adminService.clearView(viewname, db).then(() => { - this.toast.showInfo('IAM.VIEWS.CLEARED', true); - this.loadViews(); - }).catch(error => { - this.toast.showError(error); - }); - } - }); - } + } + }); + } } diff --git a/console/src/app/pages/iam/iam.component.html b/console/src/app/pages/iam/iam.component.html index 150a740375..5e9f5187f6 100644 --- a/console/src/app/pages/iam/iam.component.html +++ b/console/src/app/pages/iam/iam.component.html @@ -1,4 +1,4 @@ - +

    {{'IAM.POLICIES.TITLE' | translate}}

    {{'IAM.POLICIES.DESCRIPTION' | translate}}

    @@ -7,14 +7,14 @@

    {{'FEATURES.DESCRIPTION' | translate}}

    - +
    - - +
    -     + diff --git a/console/src/app/pages/iam/iam.component.ts b/console/src/app/pages/iam/iam.component.ts index d011fe1a0a..4069748ceb 100644 --- a/console/src/app/pages/iam/iam.component.ts +++ b/console/src/app/pages/iam/iam.component.ts @@ -12,7 +12,7 @@ import { AdminService } from 'src/app/services/admin.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-iam', + selector: 'cnsl-iam', templateUrl: './iam.component.html', styleUrls: ['./iam.component.scss'], }) diff --git a/console/src/app/pages/orgs/org-create/org-create.component.html b/console/src/app/pages/orgs/org-create/org-create.component.html index d8e6b88c8e..e132a529b8 100644 --- a/console/src/app/pages/orgs/org-create/org-create.component.html +++ b/console/src/app/pages/orgs/org-create/org-create.component.html @@ -5,14 +5,14 @@
    - - + Use your personal account as organisation owner - +

    {{'ORG.PAGES.ORGDETAIL_TITLE' | translate}}

    @@ -37,7 +37,7 @@     - +

    {{'ORG.PAGES.ORGDETAILUSER_TITLE' | translate}}

    @@ -47,35 +47,35 @@ {{ 'USER.PROFILE.USERNAME' | translate }} - + {{ 'USER.VALIDATION.REQUIRED' | translate }} {{ 'USER.PROFILE.EMAIL' | translate }} - + {{ 'USER.VALIDATION.REQUIRED' | translate }} {{ 'USER.PROFILE.FIRSTNAME' | translate }} - + {{ 'USER.VALIDATION.REQUIRED' | translate }} {{ 'USER.PROFILE.LASTNAME' | translate }} - + {{ 'USER.VALIDATION.REQUIRED' | translate }} {{ 'USER.PROFILE.NICKNAME' | translate }} - + {{ 'USER.VALIDATION.REQUIRED' | translate }} @@ -89,7 +89,7 @@ {{ 'GENDERS.'+gender | translate }} - + {{ 'USER.VALIDATION.REQUIRED' | translate }} @@ -99,7 +99,7 @@ {{ 'LANGUAGES.'+language | translate }} - {{ 'USER.VALIDATION.REQUIRED' | translate }} @@ -113,9 +113,9 @@

    {{ 'USER.CREATE.PASSWORDSECTION' | translate }}

    - - +
    @@ -123,7 +123,7 @@ - + {{ 'USER.VALIDATION.REQUIRED' | translate }} @@ -133,10 +133,10 @@ - + {{ 'USER.VALIDATION.REQUIRED' | translate }} - + {{ 'USER.PASSWORD.NOTEQUAL' | translate }} @@ -156,9 +156,9 @@ - +
    - +

    {{'ORG.PAGES.ORGDETAIL_TITLE_WITHOUT_DOMAIN' | translate}}

    diff --git a/console/src/app/pages/orgs/org-create/org-create.component.ts b/console/src/app/pages/orgs/org-create/org-create.component.ts index a0e7f4d5e6..607c57b7c1 100644 --- a/console/src/app/pages/orgs/org-create/org-create.component.ts +++ b/console/src/app/pages/orgs/org-create/org-create.component.ts @@ -15,257 +15,257 @@ import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; function passwordConfirmValidator(c: AbstractControl): any { - if (!c.parent || !c) { - return; - } - const pwd = c.parent.get('password'); - const cpwd = c.parent.get('confirmPassword'); + if (!c.parent || !c) { + return; + } + const pwd = c.parent.get('password'); + const cpwd = c.parent.get('confirmPassword'); - if (!pwd || !cpwd) { - return; - } - if (pwd.value !== cpwd.value) { - return { - invalid: true, - notequal: { - valid: false, - }, - }; - } + if (!pwd || !cpwd) { + return; + } + if (pwd.value !== cpwd.value) { + return { + invalid: true, + notequal: { + valid: false, + }, + }; + } } @Component({ - selector: 'app-org-create', - templateUrl: './org-create.component.html', - styleUrls: ['./org-create.component.scss'], - animations: [ - trigger('openClose', [ - transition(':enter', [ - style({ height: '0', opacity: 0 }), - animate('150ms ease-in-out', style({ height: '*', opacity: 1 })), - ]), - transition(':leave', [ - animate('150ms ease-in-out', style({ height: '0', opacity: 0 })), - ]), - ]), - ], + selector: 'cnsl-org-create', + templateUrl: './org-create.component.html', + styleUrls: ['./org-create.component.scss'], + animations: [ + trigger('openClose', [ + transition(':enter', [ + style({ height: '0', opacity: 0 }), + animate('150ms ease-in-out', style({ height: '*', opacity: 1 })), + ]), + transition(':leave', [ + animate('150ms ease-in-out', style({ height: '0', opacity: 0 })), + ]), + ]), + ], }) export class OrgCreateComponent { - public orgForm!: FormGroup; - public userForm!: FormGroup; - public pwdForm!: FormGroup; + public orgForm!: FormGroup; + public userForm!: FormGroup; + public pwdForm!: FormGroup; - public genders: Gender[] = [Gender.GENDER_FEMALE, Gender.GENDER_MALE, Gender.GENDER_UNSPECIFIED]; - public languages: string[] = ['de', 'en']; + public genders: Gender[] = [Gender.GENDER_FEMALE, Gender.GENDER_MALE, Gender.GENDER_UNSPECIFIED]; + public languages: string[] = ['de', 'en']; - public policy!: PasswordComplexityPolicy.AsObject; - public usePassword: boolean = false; + public policy!: PasswordComplexityPolicy.AsObject; + public usePassword: boolean = false; - public forSelf: boolean = true; + public forSelf: boolean = true; - constructor( - private router: Router, - private toast: ToastService, - private adminService: AdminService, - private _location: Location, - private fb: FormBuilder, - private mgmtService: ManagementService, - private authService: GrpcAuthService, - ) { - this.authService.isAllowed(['iam.write']).pipe(take(1)).subscribe((allowed) => { - if (allowed) { - this.forSelf = false; - } - }); + constructor( + private router: Router, + private toast: ToastService, + private adminService: AdminService, + private _location: Location, + private fb: FormBuilder, + private mgmtService: ManagementService, + private authService: GrpcAuthService, + ) { + this.authService.isAllowed(['iam.write']).pipe(take(1)).subscribe((allowed) => { + if (allowed) { + this.forSelf = false; + } + }); - this.orgForm = this.fb.group({ - name: ['', [Validators.required]], - domain: [''], - }); + this.orgForm = this.fb.group({ + name: ['', [Validators.required]], + domain: [''], + }); - this.initForm(); + this.initForm(); + } + + public createSteps: number = 2; + public currentCreateStep: number = 1; + + public finish(): void { + const createOrgRequest: SetUpOrgRequest.Org = new SetUpOrgRequest.Org(); + createOrgRequest.setName(this.name?.value); + createOrgRequest.setDomain(this.domain?.value); + + const humanRequest: SetUpOrgRequest.Human = new SetUpOrgRequest.Human(); + humanRequest.setEmail(new SetUpOrgRequest.Human.Email().setEmail(this.email?.value)); + humanRequest.setUserName(this.userName?.value); + + const profile: SetUpOrgRequest.Human.Profile = new SetUpOrgRequest.Human.Profile(); + profile.setFirstName(this.firstName?.value); + profile.setLastName(this.lastName?.value); + profile.setNickName(this.nickName?.value); + profile.setGender(this.gender?.value); + profile.setPreferredLanguage(this.preferredLanguage?.value); + + humanRequest.setProfile(profile); + if (this.usePassword && this.password) { + humanRequest.setPassword(this.password?.value); } - public createSteps: number = 2; - public currentCreateStep: number = 1; + this.adminService + .SetUpOrg(createOrgRequest, humanRequest) + .then((resp) => { + this.router.navigate(['/org/overview']); - public finish(): void { - const createOrgRequest: SetUpOrgRequest.Org = new SetUpOrgRequest.Org(); - createOrgRequest.setName(this.name?.value); - createOrgRequest.setDomain(this.domain?.value); + // const orgResp = org.getOrg(); + // if (orgResp) { + // this.authService.setActiveOrg(orgResp.toObject()); + // this.router.navigate(['/org']); + // } else { + // this.router.navigate(['/org', 'overview']); + // } + }) + .catch(error => { + this.toast.showError(error); + }); + } - const humanRequest: SetUpOrgRequest.Human = new SetUpOrgRequest.Human(); - humanRequest.setEmail(new SetUpOrgRequest.Human.Email().setEmail(this.email?.value)); - humanRequest.setUserName(this.userName?.value); + public next(): void { + this.currentCreateStep++; + } - const profile: SetUpOrgRequest.Human.Profile = new SetUpOrgRequest.Human.Profile(); - profile.setFirstName(this.firstName?.value); - profile.setLastName(this.lastName?.value); - profile.setNickName(this.nickName?.value); - profile.setGender(this.gender?.value); - profile.setPreferredLanguage(this.preferredLanguage?.value); + public previous(): void { + this.currentCreateStep--; + } - humanRequest.setProfile(profile); - if (this.usePassword && this.password) { - humanRequest.setPassword(this.password?.value); + private initForm(): void { + this.userForm = this.fb.group({ + userName: ['', [Validators.required]], + firstName: ['', [Validators.required]], + lastName: ['', [Validators.required]], + email: ['', [Validators.required]], + gender: [''], + nickName: [''], + preferredLanguage: [''], + }); + } + + public initPwdValidators(): void { + const validators: Validators[] = [Validators.required]; + + if (this.usePassword) { + this.mgmtService.getDefaultPasswordComplexityPolicy().then(data => { + if (data.policy) { + this.policy = data.policy; + + if (this.policy.minLength) { + validators.push(Validators.minLength(this.policy.minLength)); + } + if (this.policy.hasLowercase) { + validators.push(lowerCaseValidator); + } + if (this.policy.hasUppercase) { + validators.push(upperCaseValidator); + } + if (this.policy.hasNumber) { + validators.push(numberValidator); + } + if (this.policy.hasSymbol) { + validators.push(symbolValidator); + } + + const pwdValidators = [...validators] as ValidatorFn[]; + const confirmPwdValidators = [...validators, passwordConfirmValidator] as ValidatorFn[]; + this.pwdForm = this.fb.group({ + password: ['', pwdValidators], + confirmPassword: ['', confirmPwdValidators], + }); } - - this.adminService - .SetUpOrg(createOrgRequest, humanRequest) - .then((resp) => { - this.router.navigate(['/org/overview']); - - // const orgResp = org.getOrg(); - // if (orgResp) { - // this.authService.setActiveOrg(orgResp.toObject()); - // this.router.navigate(['/org']); - // } else { - // this.router.navigate(['/org', 'overview']); - // } - }) - .catch(error => { - this.toast.showError(error); - }); + }); + } else { + this.pwdForm = this.fb.group({ + password: ['', []], + confirmPassword: ['', []], + }); } + } - public next(): void { - this.currentCreateStep++; + public changeSelf(change: MatSlideToggleChange): void { + if (change.checked) { + this.createSteps = 1; + + this.orgForm = this.fb.group({ + name: ['', [Validators.required]], + }); + + } else { + this.createSteps = 2; + + this.orgForm = this.fb.group({ + name: ['', [Validators.required]], + domain: [''], + }); } + } - public previous(): void { - this.currentCreateStep--; + public createOrgForSelf(): void { + if (this.name && this.name.value) { + this.mgmtService.addOrg(this.name.value).then(() => { + this.router.navigate(['/org/overview']); + // const newOrg = org.toObject(); + // setTimeout(() => { + // this.authService.setActiveOrg(newOrg); + // this.router.navigate(['/org']); + // }, 1000); + }).catch(error => { + this.toast.showError(error); + }); } + } - private initForm(): void { - this.userForm = this.fb.group({ - userName: ['', [Validators.required]], - firstName: ['', [Validators.required]], - lastName: ['', [Validators.required]], - email: ['', [Validators.required]], - gender: [''], - nickName: [''], - preferredLanguage: [''], - }); - } + public get name(): AbstractControl | null { + return this.orgForm.get('name'); + } - public initPwdValidators(): void { - const validators: Validators[] = [Validators.required]; + public get domain(): AbstractControl | null { + return this.orgForm.get('domain'); + } - if (this.usePassword) { - this.mgmtService.getDefaultPasswordComplexityPolicy().then(data => { - if (data.policy) { - this.policy = data.policy; + public get userName(): AbstractControl | null { + return this.userForm.get('userName'); + } - if (this.policy.minLength) { - validators.push(Validators.minLength(this.policy.minLength)); - } - if (this.policy.hasLowercase) { - validators.push(lowerCaseValidator); - } - if (this.policy.hasUppercase) { - validators.push(upperCaseValidator); - } - if (this.policy.hasNumber) { - validators.push(numberValidator); - } - if (this.policy.hasSymbol) { - validators.push(symbolValidator); - } + public get firstName(): AbstractControl | null { + return this.userForm.get('firstName'); + } - const pwdValidators = [...validators] as ValidatorFn[]; - const confirmPwdValidators = [...validators, passwordConfirmValidator] as ValidatorFn[]; - this.pwdForm = this.fb.group({ - password: ['', pwdValidators], - confirmPassword: ['', confirmPwdValidators], - }); - } - }); - } else { - this.pwdForm = this.fb.group({ - password: ['', []], - confirmPassword: ['', []], - }); - } - } + public get lastName(): AbstractControl | null { + return this.userForm.get('lastName'); + } - public changeSelf(change: MatSlideToggleChange): void { - if (change.checked) { - this.createSteps = 1; + public get email(): AbstractControl | null { + return this.userForm.get('email'); + } - this.orgForm = this.fb.group({ - name: ['', [Validators.required]], - }); + public get nickName(): AbstractControl | null { + return this.userForm.get('nickName'); + } - } else { - this.createSteps = 2; + public get preferredLanguage(): AbstractControl | null { + return this.userForm.get('preferredLanguage'); + } - this.orgForm = this.fb.group({ - name: ['', [Validators.required]], - domain: [''], - }); - } - } + public get gender(): AbstractControl | null { + return this.userForm.get('gender'); + } - public createOrgForSelf(): void { - if (this.name && this.name.value) { - this.mgmtService.addOrg(this.name.value).then(() => { - this.router.navigate(['/org/overview']); - // const newOrg = org.toObject(); - // setTimeout(() => { - // this.authService.setActiveOrg(newOrg); - // this.router.navigate(['/org']); - // }, 1000); - }).catch(error => { - this.toast.showError(error); - }); - } - } + public get password(): AbstractControl | null { + return this.pwdForm.get('password'); + } - public get name(): AbstractControl | null { - return this.orgForm.get('name'); - } + public get confirmPassword(): AbstractControl | null { + return this.pwdForm.get('confirmPassword'); + } - public get domain(): AbstractControl | null { - return this.orgForm.get('domain'); - } - - public get userName(): AbstractControl | null { - return this.userForm.get('userName'); - } - - public get firstName(): AbstractControl | null { - return this.userForm.get('firstName'); - } - - public get lastName(): AbstractControl | null { - return this.userForm.get('lastName'); - } - - public get email(): AbstractControl | null { - return this.userForm.get('email'); - } - - public get nickName(): AbstractControl | null { - return this.userForm.get('nickName'); - } - - public get preferredLanguage(): AbstractControl | null { - return this.userForm.get('preferredLanguage'); - } - - public get gender(): AbstractControl | null { - return this.userForm.get('gender'); - } - - public get password(): AbstractControl | null { - return this.pwdForm.get('password'); - } - - public get confirmPassword(): AbstractControl | null { - return this.pwdForm.get('confirmPassword'); - } - - public close(): void { - this._location.back(); - } + public close(): void { + this._location.back(); + } } diff --git a/console/src/app/pages/orgs/org-detail/add-domain-dialog/add-domain-dialog.component.ts b/console/src/app/pages/orgs/org-detail/add-domain-dialog/add-domain-dialog.component.ts index de58701159..f1f2c4082a 100644 --- a/console/src/app/pages/orgs/org-detail/add-domain-dialog/add-domain-dialog.component.ts +++ b/console/src/app/pages/orgs/org-detail/add-domain-dialog/add-domain-dialog.component.ts @@ -1,26 +1,23 @@ -import { Component, Inject, OnInit } from '@angular/core'; +import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ - selector: 'app-add-domain-dialog', - templateUrl: './add-domain-dialog.component.html', - styleUrls: ['./add-domain-dialog.component.scss'], + selector: 'cnsl-add-domain-dialog', + templateUrl: './add-domain-dialog.component.html', + styleUrls: ['./add-domain-dialog.component.scss'], }) -export class AddDomainDialogComponent implements OnInit { - public newdomain: string = ''; - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any, - ) { } +export class AddDomainDialogComponent { + public newdomain: string = ''; + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any, + ) { } - ngOnInit(): void { - } + public closeDialog(): void { + this.dialogRef.close(false); + } - public closeDialog(): void { - this.dialogRef.close(false); - } - - public closeDialogWithSuccess(): void { - this.dialogRef.close(this.newdomain); - } + public closeDialogWithSuccess(): void { + this.dialogRef.close(this.newdomain); + } } diff --git a/console/src/app/pages/orgs/org-detail/domain-verification/domain-verification.component.html b/console/src/app/pages/orgs/org-detail/domain-verification/domain-verification.component.html index fa71741792..c8e236a411 100644 --- a/console/src/app/pages/orgs/org-detail/domain-verification/domain-verification.component.html +++ b/console/src/app/pages/orgs/org-detail/domain-verification/domain-verification.component.html @@ -47,10 +47,10 @@

    DNS TOKEN

    {{dns?.token}}

    -

    {{'ORG.PAGES.ORGDOMAIN.VERIFICATION' | translate}}

    - + - - +     @@ -47,8 +47,8 @@ - - + +
    @@ -71,17 +71,17 @@
    - + - - + - +
    - \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/pages/orgs/org-detail/org-detail.component.ts b/console/src/app/pages/orgs/org-detail/org-detail.component.ts index 45f1eda49b..fac2b2d2e4 100644 --- a/console/src/app/pages/orgs/org-detail/org-detail.component.ts +++ b/console/src/app/pages/orgs/org-detail/org-detail.component.ts @@ -7,6 +7,7 @@ import { BehaviorSubject, from, Observable, of } from 'rxjs'; import { catchError, finalize, map } from 'rxjs/operators'; import { CreationType, MemberCreateDialogComponent } from 'src/app/modules/add-member-dialog/member-create-dialog.component'; import { ChangeType } from 'src/app/modules/changes/changes.component'; +import { InfoSectionType } from 'src/app/modules/info-section/info-section.component'; import { PolicyComponentServiceType } from 'src/app/modules/policies/policy-component-types.enum'; import { WarnDialogComponent } from 'src/app/modules/warn-dialog/warn-dialog.component'; import { Features } from 'src/app/proto/generated/zitadel/features_pb'; @@ -21,7 +22,7 @@ import { DomainVerificationComponent } from './domain-verification/domain-verifi @Component({ - selector: 'app-org-detail', + selector: 'cnsl-org-detail', templateUrl: './org-detail.component.html', styleUrls: ['./org-detail.component.scss'], }) @@ -42,6 +43,7 @@ export class OrgDetailComponent implements OnInit { public membersSubject: BehaviorSubject = new BehaviorSubject([]); public features!: Features.AsObject; + public InfoSectionType: any = InfoSectionType; constructor( private dialog: MatDialog, diff --git a/console/src/app/pages/orgs/org-list/org-list.component.html b/console/src/app/pages/orgs/org-list/org-list.component.html index 9c71b24af0..59f4d7a8e6 100644 --- a/console/src/app/pages/orgs/org-list/org-list.component.html +++ b/console/src/app/pages/orgs/org-list/org-list.component.html @@ -2,10 +2,10 @@

    {{ 'ORG.PAGES.LIST' | translate }}

    {{'ORG.PAGES.LISTDESCRIPTION' | translate}}

    - - + {{'ORG.PAGES.FILTER' | translate}} @@ -19,7 +19,7 @@ + [checked]="row.id === activeOrg.id"> @@ -31,7 +31,7 @@ + [ngClass]="{'search-active': this.orgSearchKey === OrgListSearchKey.NAME}"> {{ 'ORG.PAGES.NAME' | translate }} @@ -41,7 +41,7 @@ + [ngClass]="{'search-active': this.orgSearchKey === OrgListSearchKey.NAME}"> {{ 'ORG.PAGES.CREATIONDATE' | translate }} @@ -54,12 +54,12 @@ - +
    \ No newline at end of file diff --git a/console/src/app/pages/orgs/org-list/org-list.component.ts b/console/src/app/pages/orgs/org-list/org-list.component.ts index bbe4c2386d..a4e0ca9c74 100644 --- a/console/src/app/pages/orgs/org-list/org-list.component.ts +++ b/console/src/app/pages/orgs/org-list/org-list.component.ts @@ -15,7 +15,7 @@ enum OrgListSearchKey { } @Component({ - selector: 'app-org-list', + selector: 'cnsl-org-list', templateUrl: './org-list.component.html', styleUrls: ['./org-list.component.scss'], animations: [ diff --git a/console/src/app/pages/orgs/org-member-roles-autocomplete/org-member-roles-autocomplete.component.ts b/console/src/app/pages/orgs/org-member-roles-autocomplete/org-member-roles-autocomplete.component.ts index 3cf8314418..6be97e7455 100644 --- a/console/src/app/pages/orgs/org-member-roles-autocomplete/org-member-roles-autocomplete.component.ts +++ b/console/src/app/pages/orgs/org-member-roles-autocomplete/org-member-roles-autocomplete.component.ts @@ -5,28 +5,28 @@ import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-org-member-roles-autocomplete', - templateUrl: './org-member-roles-autocomplete.component.html', - styleUrls: ['./org-member-roles-autocomplete.component.scss'], + selector: 'cnsl-org-member-roles-autocomplete', + templateUrl: './org-member-roles-autocomplete.component.html', + styleUrls: ['./org-member-roles-autocomplete.component.scss'], }) export class OrgMemberRolesAutocompleteComponent { - public myControl: FormControl = new FormControl(); - public names: string[] = []; - public roles: string[] = []; - public allRoles: string[] = []; - public isLoading: boolean = false; - @ViewChild('nameInput') public nameInput!: ElementRef; - @ViewChild('auto') public matAutocomplete!: MatAutocomplete; - @Output() public selectionChanged: EventEmitter = new EventEmitter(); - constructor(private mgmtService: ManagementService, private toast: ToastService) { - this.mgmtService.listOrgMemberRoles().then(resp => { - this.allRoles = resp.resultList; - }).catch(error => { - this.toast.showError(error); - }); + public myControl: FormControl = new FormControl(); + public names: string[] = []; + public roles: string[] = []; + public allRoles: string[] = []; + public isLoading: boolean = false; + @ViewChild('nameInput') public nameInput!: ElementRef; + @ViewChild('auto') public matAutocomplete!: MatAutocomplete; + @Output() public selectionChanged: EventEmitter = new EventEmitter(); + constructor(private mgmtService: ManagementService, private toast: ToastService) { + this.mgmtService.listOrgMemberRoles().then(resp => { + this.allRoles = resp.resultList; + }).catch(error => { + this.toast.showError(error); + }); - this.myControl.valueChanges.subscribe(change => { - this.selectionChanged.emit(change); - }); - } + this.myControl.valueChanges.subscribe(change => { + this.selectionChanged.emit(change); + }); + } } diff --git a/console/src/app/pages/orgs/org-members/org-members-datasource.ts b/console/src/app/pages/orgs/org-members/org-members-datasource.ts index fdbced5bfd..fc2ce58091 100644 --- a/console/src/app/pages/orgs/org-members/org-members-datasource.ts +++ b/console/src/app/pages/orgs/org-members/org-members-datasource.ts @@ -6,51 +6,51 @@ import { Member } from 'src/app/proto/generated/zitadel/member_pb'; import { ManagementService } from 'src/app/services/mgmt.service'; export class OrgMembersDataSource extends DataSource { - public totalResult: number = 0; - public viewTimestamp!: Timestamp.AsObject; - public membersSubject: BehaviorSubject = new BehaviorSubject([]); - private loadingSubject: BehaviorSubject = new BehaviorSubject(false); - public loading$: Observable = this.loadingSubject.asObservable(); + public totalResult: number = 0; + public viewTimestamp!: Timestamp.AsObject; + public membersSubject: BehaviorSubject = new BehaviorSubject([]); + private loadingSubject: BehaviorSubject = new BehaviorSubject(false); + public loading$: Observable = this.loadingSubject.asObservable(); - constructor(private mgmtService: ManagementService) { - super(); - } + constructor(private service: ManagementService) { + super(); + } - public loadMembers(pageIndex: number, pageSize: number): void { - const offset = pageIndex * pageSize; + public loadMembers(pageIndex: number, pageSize: number): void { + const offset = pageIndex * pageSize; - this.loadingSubject.next(true); - from(this.mgmtService.listOrgMembers(pageSize, offset)).pipe( - map(resp => { - this.totalResult = resp.details?.totalResult || 0; - if (resp.details?.viewTimestamp) { - this.viewTimestamp = resp.details.viewTimestamp; - } - return resp.resultList; - }), - catchError(() => of([])), - finalize(() => this.loadingSubject.next(false)), - ).subscribe(members => { - this.membersSubject.next(members); - }); - } + this.loadingSubject.next(true); + from(this.service.listOrgMembers(pageSize, offset)).pipe( + map(resp => { + this.totalResult = resp.details?.totalResult || 0; + if (resp.details?.viewTimestamp) { + this.viewTimestamp = resp.details.viewTimestamp; + } + return resp.resultList; + }), + catchError(() => of([])), + finalize(() => this.loadingSubject.next(false)), + ).subscribe(members => { + this.membersSubject.next(members); + }); + } - /** - * Connect this data source to the table. The table will only update when - * the returned stream emits new items. - * @returns A stream of the items to be rendered. - */ - public connect(): Observable { - return this.membersSubject.asObservable(); - } + /** + * Connect this data source to the table. The table will only update when + * the returned stream emits new items. + * @returns A stream of the items to be rendered. + */ + public connect(): Observable { + return this.membersSubject.asObservable(); + } - /** - * Called when the table is being destroyed. Use this function, to clean up - * any open connections or free any held resources that were set up during connect. - */ - public disconnect(): void { - this.membersSubject.complete(); - this.loadingSubject.complete(); - } + /** + * Called when the table is being destroyed. Use this function, to clean up + * any open connections or free any held resources that were set up during connect. + */ + public disconnect(): void { + this.membersSubject.complete(); + this.loadingSubject.complete(); + } } diff --git a/console/src/app/pages/orgs/org-members/org-members.component.html b/console/src/app/pages/orgs/org-members/org-members.component.html index 59ac299236..31d7982127 100644 --- a/console/src/app/pages/orgs/org-members/org-members.component.html +++ b/console/src/app/pages/orgs/org-members/org-members.component.html @@ -1,23 +1,23 @@ -

    {{'MEMBER.DOCSINFO' | translate}} ZITADEL Managers.

    - - + - + add{{ 'ACTIONS.NEW' | translate }} - -     \ No newline at end of file + + \ No newline at end of file diff --git a/console/src/app/pages/orgs/org-members/org-members.component.ts b/console/src/app/pages/orgs/org-members/org-members.component.ts index 68a9058d14..0d52f5d6f3 100644 --- a/console/src/app/pages/orgs/org-members/org-members.component.ts +++ b/console/src/app/pages/orgs/org-members/org-members.component.ts @@ -12,113 +12,113 @@ import { ToastService } from 'src/app/services/toast.service'; import { OrgMembersDataSource } from './org-members-datasource'; @Component({ - selector: 'app-org-members', - templateUrl: './org-members.component.html', - styleUrls: ['./org-members.component.scss'], + selector: 'cnsl-org-members', + templateUrl: './org-members.component.html', + styleUrls: ['./org-members.component.scss'], }) export class OrgMembersComponent { - public INITIALPAGESIZE: number = 25; - public org!: Org.AsObject; - public disableWrite: boolean = false; - public dataSource!: OrgMembersDataSource; + public INITIALPAGESIZE: number = 25; + public org!: Org.AsObject; + public disableWrite: boolean = false; + public dataSource!: OrgMembersDataSource; - public memberRoleOptions: string[] = []; - public changePageFactory!: Function; - public changePage: EventEmitter = new EventEmitter(); - public selection: Array = []; + public memberRoleOptions: string[] = []; + public changePageFactory!: Function; + public changePage: EventEmitter = new EventEmitter(); + public selection: Array = []; - constructor( - private mgmtService: ManagementService, - private dialog: MatDialog, - private toast: ToastService, - ) { - this.mgmtService.getMyOrg().then(resp => { - if (resp.org) { - this.org = resp.org; - this.dataSource = new OrgMembersDataSource(this.mgmtService); - this.dataSource.loadMembers(0, this.INITIALPAGESIZE); - } - }); + constructor( + private mgmtService: ManagementService, + private dialog: MatDialog, + private toast: ToastService, + ) { + this.mgmtService.getMyOrg().then(resp => { + if (resp.org) { + this.org = resp.org; + this.dataSource = new OrgMembersDataSource(this.mgmtService); + this.dataSource.loadMembers(0, this.INITIALPAGESIZE); + } + }); - this.getRoleOptions(); + this.getRoleOptions(); - this.changePageFactory = (event?: PageEvent) => { - return this.dataSource.loadMembers( - event?.pageIndex ?? 0, - event?.pageSize ?? this.INITIALPAGESIZE, - ); - }; - } + this.changePageFactory = (event?: PageEvent) => { + return this.dataSource.loadMembers( + event?.pageIndex ?? 0, + event?.pageSize ?? this.INITIALPAGESIZE, + ); + }; + } - public getRoleOptions(): void { - this.mgmtService.listOrgMemberRoles().then(resp => { - this.memberRoleOptions = resp.resultList; - }).catch(error => { - this.toast.showError(error); - }); - } + public getRoleOptions(): void { + this.mgmtService.listOrgMemberRoles().then(resp => { + this.memberRoleOptions = resp.resultList; + }).catch(error => { + this.toast.showError(error); + }); + } - updateRoles(member: Member.AsObject, selectionChange: MatSelectChange): void { - this.mgmtService.updateOrgMember(member.userId, selectionChange.value) - .then(() => { - this.toast.showInfo('ORG.TOAST.MEMBERCHANGED', true); - }).catch(error => { - this.toast.showError(error); - }); - } + updateRoles(member: Member.AsObject, selectionChange: MatSelectChange): void { + this.mgmtService.updateOrgMember(member.userId, selectionChange.value) + .then(() => { + this.toast.showInfo('ORG.TOAST.MEMBERCHANGED', true); + }).catch(error => { + this.toast.showError(error); + }); + } - public removeOrgMemberSelection(): void { - Promise.all(this.selection.map(member => { - return this.mgmtService.removeOrgMember(member.userId).then(() => { - this.toast.showInfo('ORG.TOAST.MEMBERREMOVED', true); - }).catch(error => { - this.toast.showError(error); - }); - })).then(() => { + public removeOrgMemberSelection(): void { + Promise.all(this.selection.map(member => { + return this.mgmtService.removeOrgMember(member.userId).then(() => { + this.toast.showInfo('ORG.TOAST.MEMBERREMOVED', true); + }).catch(error => { + this.toast.showError(error); + }); + })).then(() => { + setTimeout(() => { + this.changePage.emit(); + }, 1000); + }); + } + + public removeOrgMember(member: Member.AsObject): void { + this.mgmtService.removeOrgMember(member.userId).then(() => { + this.toast.showInfo('ORG.TOAST.MEMBERREMOVED', true); + + setTimeout(() => { + this.changePage.emit(); + }, 1000); + }).catch(error => { + this.toast.showError(error); + }); + } + + public openAddMember(): void { + const dialogRef = this.dialog.open(MemberCreateDialogComponent, { + data: { + creationType: CreationType.ORG, + }, + width: '400px', + }); + + dialogRef.afterClosed().subscribe(resp => { + if (resp) { + const users: User.AsObject[] = resp.users; + const roles: string[] = resp.roles; + + if (users && users.length && roles && roles.length) { + Promise.all(users.map(user => { + return this.mgmtService.addOrgMember(user.id, roles); + })).then(() => { + this.toast.showInfo('ORG.TOAST.MEMBERADDED', true); setTimeout(() => { - this.changePage.emit(); + this.changePage.emit(); }, 1000); - }); - } - - public removeOrgMember(member: Member.AsObject): void { - this.mgmtService.removeOrgMember(member.userId).then(() => { - this.toast.showInfo('ORG.TOAST.MEMBERREMOVED', true); - - setTimeout(() => { - this.changePage.emit(); - }, 1000); - }).catch(error => { + }).catch(error => { this.toast.showError(error); - }); - } - - public openAddMember(): void { - const dialogRef = this.dialog.open(MemberCreateDialogComponent, { - data: { - creationType: CreationType.ORG, - }, - width: '400px', - }); - - dialogRef.afterClosed().subscribe(resp => { - if (resp) { - const users: User.AsObject[] = resp.users; - const roles: string[] = resp.roles; - - if (users && users.length && roles && roles.length) { - Promise.all(users.map(user => { - return this.mgmtService.addOrgMember(user.id, roles); - })).then(() => { - this.toast.showInfo('ORG.TOAST.MEMBERADDED', true); - setTimeout(() => { - this.changePage.emit(); - }, 1000); - }).catch(error => { - this.toast.showError(error); - }); - } - } - }); - } + }); + } + } + }); + } } diff --git a/console/src/app/pages/projects/apps/app-create/app-create.component.html b/console/src/app/pages/projects/apps/app-create/app-create.component.html index bc66ef220f..6fc5d8c839 100644 --- a/console/src/app/pages/projects/apps/app-create/app-create.component.html +++ b/console/src/app/pages/projects/apps/app-create/app-create.component.html @@ -25,14 +25,14 @@ {{ 'APP.NAME' | translate }} - {{'PROJECT.APP.NAMEREQUIRED' | translate}} + {{'PROJECT.APP.NAMEREQUIRED' | translate}}

    {{'APP.OIDC.TYPETITLE' | translate}}

    - - +
    @@ -46,10 +46,10 @@ {{'APP.AUTHMETHODSECTION' | translate}} - - +
    - - +

    - +
    {{'APP.OIDC.REDIRECTDESCRIPTIONNATIVE' | translate}} - {{ 'APP.OIDC.DEVMODE' | translate }}
    + *ngIf="appType?.value === OIDCAppType.OIDC_APP_TYPE_WEB || appType?.value === OIDCAppType.OIDC_APP_TYPE_USER_AGENT">
    {{'APP.OIDC.REDIRECTDESCRIPTIONWEB' | translate}} - {{ 'APP.OIDC.DEVMODE' | translate }} @@ -93,16 +93,16 @@
    + [isNative]="appType?.value === OIDCAppType.OIDC_APP_TYPE_NATIVE"> + [isNative]="appType?.value === OIDCAppType.OIDC_APP_TYPE_NATIVE">
    @@ -119,7 +119,7 @@

    {{'APP.ADDITIONALORIGINSDESC' | translate}}

     @@ -128,15 +128,15 @@
    - - + - - - + +
    -
    +
    - -
    + +
    @@ -249,7 +249,7 @@ {{'APP.OIDC.CLOCKSKEW' | translate}}
    -     +
    - +
    - + diff --git a/console/src/app/pages/projects/apps/app-detail/app-detail.component.ts b/console/src/app/pages/projects/apps/app-detail/app-detail.component.ts index 539031d5fc..d1e0fa9416 100644 --- a/console/src/app/pages/projects/apps/app-detail/app-detail.component.ts +++ b/console/src/app/pages/projects/apps/app-detail/app-detail.component.ts @@ -1,7 +1,7 @@ import { COMMA, ENTER, SPACE } from '@angular/cdk/keycodes'; import { Location } from '@angular/common'; import { Component, OnDestroy, OnInit } from '@angular/core'; -import { AbstractControl, FormBuilder, FormGroup } from '@angular/forms'; +import { AbstractControl, FormBuilder, FormControl, FormGroup } from '@angular/forms'; import { MatCheckboxChange } from '@angular/material/checkbox'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; @@ -12,6 +12,7 @@ import { Subject, Subscription } from 'rxjs'; import { take } from 'rxjs/operators'; import { RadioItemAuthType } from 'src/app/modules/app-radio/app-auth-method-radio/app-auth-method-radio.component'; import { ChangeType } from 'src/app/modules/changes/changes.component'; +import { InfoSectionType } from 'src/app/modules/info-section/info-section.component'; import { CnslLinks } from 'src/app/modules/links/links.component'; import { NameDialogComponent } from 'src/app/modules/name-dialog/name-dialog.component'; import { WarnDialogComponent } from 'src/app/modules/warn-dialog/warn-dialog.component'; @@ -50,7 +51,7 @@ import { } from '../authmethods'; @Component({ - selector: 'app-app-detail', + selector: 'cnsl-app-detail', templateUrl: './app-detail.component.html', styleUrls: ['./app-detail.component.scss'], }) @@ -122,6 +123,7 @@ export class AppDetailComponent implements OnInit, OnDestroy { public requestRedirectValuesSubject$: Subject = new Subject(); public copiedKey: any = ''; public nextLinks: Array = []; + public InfoSectionType: any = InfoSectionType; constructor( public translate: TranslateService, @@ -596,8 +598,8 @@ export class AppDetailComponent implements OnInit, OnDestroy { return this.apiForm.get('authMethodType'); } - public get devMode(): AbstractControl | null { - return this.oidcForm.get('devMode'); + public get devMode(): FormControl | null { + return this.oidcForm.get('devMode') as FormControl; } public get accessTokenType(): AbstractControl | null { diff --git a/console/src/app/pages/projects/apps/app-secret-dialog/app-secret-dialog.component.html b/console/src/app/pages/projects/apps/app-secret-dialog/app-secret-dialog.component.html index 18c1340ed4..a8090f4eea 100644 --- a/console/src/app/pages/projects/apps/app-secret-dialog/app-secret-dialog.component.html +++ b/console/src/app/pages/projects/apps/app-secret-dialog/app-secret-dialog.component.html @@ -5,19 +5,19 @@
    ClientId: {{data.clientId}} -
    ClientSecret: {{data.clientSecret}} -
    diff --git a/console/src/app/pages/projects/apps/app-secret-dialog/app-secret-dialog.component.ts b/console/src/app/pages/projects/apps/app-secret-dialog/app-secret-dialog.component.ts index 50607c6f93..fe1e451ce0 100644 --- a/console/src/app/pages/projects/apps/app-secret-dialog/app-secret-dialog.component.ts +++ b/console/src/app/pages/projects/apps/app-secret-dialog/app-secret-dialog.component.ts @@ -2,16 +2,16 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ - selector: 'app-app-secret-dialog', - templateUrl: './app-secret-dialog.component.html', - styleUrls: ['./app-secret-dialog.component.scss'], + selector: 'cnsl-app-secret-dialog', + templateUrl: './app-secret-dialog.component.html', + styleUrls: ['./app-secret-dialog.component.scss'], }) export class AppSecretDialogComponent { - public copied: string = ''; - constructor(public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any) { } + public copied: string = ''; + constructor(public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any) { } - public closeDialog(): void { - this.dialogRef.close(false); - } + public closeDialog(): void { + this.dialogRef.close(false); + } } diff --git a/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.html b/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.html index 985c9df291..48cb2ce4b1 100644 --- a/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.html +++ b/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.html @@ -1,4 +1,4 @@ - +
    @@ -12,17 +12,17 @@
    - - + - - - + [disableWrite]="(['user.grant.write$','user.grant.write:'+grantId] | hasRole | async) === false" + [disableDelete]="(['user.grant.delete$','user.grant.delete:'+grantId] | hasRole | async) === false" + [refreshOnPreviousRoutes]="['/grant-create/project/{{projectId}}/grant/{{grantId}}']"> + +
    @@ -38,18 +38,18 @@
    - + - - + [disabled]="(['project.member.write$', 'project.member.write:'+ project.projectId]| hasRole | async) === false"> + - +
    - \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.ts b/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.ts index f2a1a04061..573202c2c2 100644 --- a/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.ts +++ b/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.ts @@ -15,7 +15,7 @@ import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-granted-project-detail', + selector: 'cnsl-granted-project-detail', templateUrl: './granted-project-detail.component.html', styleUrls: ['./granted-project-detail.component.scss'], }) diff --git a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.html b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.html index 1055b63498..7b42e1ea8b 100644 --- a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.html +++ b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.html @@ -11,7 +11,7 @@
    - {{'PROJECT.PAGES.LASTMODIFIED' | translate}} + {{'PROJECT.PAGES.LASTMODIFIED' | translate}} {{ item.details.changeDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }} @@ -22,7 +22,7 @@
    {{item.projectOwnerName}} - {{'PROJECT.PAGES.CREATEDON' | translate}} + {{'PROJECT.PAGES.CREATEDON' | translate}} {{ item.details.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }} @@ -38,7 +38,7 @@
    - {{'PROJECT.PAGES.LASTMODIFIED' | translate}} + {{'PROJECT.PAGES.LASTMODIFIED' | translate}} {{ item.details.changeDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }} @@ -47,7 +47,7 @@
    {{item.projectOwnerName}} - {{'PROJECT.PAGES.CREATEDON' | translate}} + {{'PROJECT.PAGES.CREATEDON' | translate}} {{ item.details.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }}
    diff --git a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.ts b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.ts index e81b1b9d73..3cf09bbd01 100644 --- a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.ts +++ b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.ts @@ -7,7 +7,7 @@ import { GrantedProject, ProjectGrantState } from 'src/app/proto/generated/zitad import { StorageKey, StorageLocation, StorageService } from 'src/app/services/storage.service'; @Component({ - selector: 'app-granted-project-grid', + selector: 'cnsl-granted-project-grid', templateUrl: './granted-project-grid.component.html', styleUrls: ['./granted-project-grid.component.scss'], animations: [ @@ -35,7 +35,7 @@ export class GrantedProjectGridComponent implements OnChanges { public notPinned: Array = []; @Output() newClicked: EventEmitter = new EventEmitter(); @Output() changedView: EventEmitter = new EventEmitter(); - @Input() loading: boolean = false; + @Input() loading: boolean | null = false; public selection: SelectionModel = new SelectionModel(true, []); public showNewProject: boolean = false; @@ -70,9 +70,11 @@ export class GrantedProjectGridComponent implements OnChanges { this.getPrefixedItem('pinned-granted-projects').then(storageEntry => { if (storageEntry) { const array: string[] = JSON.parse(storageEntry); - const toSelect: GrantedProject.AsObject[] = this.items.filter((item, index) => { + const toSelect: GrantedProject.AsObject[] = this.items.filter((item) => { if (array.includes(item.projectId)) { return true; + } else { + return false; } }); this.selection.select(...toSelect); diff --git a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-list.component.html b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-list.component.html index 0ba80e16cd..c5e05432d6 100644 --- a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-list.component.html +++ b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-list.component.html @@ -1,6 +1,6 @@ - - +
    - +
    add diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/application-grid/application-grid.component.ts b/console/src/app/pages/projects/owned-projects/owned-project-detail/application-grid/application-grid.component.ts index d52745e2f0..fa095649c5 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-detail/application-grid/application-grid.component.ts +++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/application-grid/application-grid.component.ts @@ -5,38 +5,38 @@ import { App, OIDCAppType } from 'src/app/proto/generated/zitadel/app_pb'; import { ManagementService } from 'src/app/services/mgmt.service'; @Component({ - selector: 'app-application-grid', - templateUrl: './application-grid.component.html', - styleUrls: ['./application-grid.component.scss'], + selector: 'cnsl-application-grid', + templateUrl: './application-grid.component.html', + styleUrls: ['./application-grid.component.scss'], }) export class ApplicationGridComponent implements OnInit { - @Input() public projectId: string = ''; - @Input() public disabled: boolean = false; - @Output() public changeView: EventEmitter = new EventEmitter(); - public appsSubject: BehaviorSubject = new BehaviorSubject([]); - private loadingSubject: BehaviorSubject = new BehaviorSubject(true); - public loading$: Observable = this.loadingSubject.asObservable(); - public OIDCAppType: any = OIDCAppType; + @Input() public projectId: string = ''; + @Input() public disabled: boolean = false; + @Output() public changeView: EventEmitter = new EventEmitter(); + public appsSubject: BehaviorSubject = new BehaviorSubject([]); + private loadingSubject: BehaviorSubject = new BehaviorSubject(true); + public loading$: Observable = this.loadingSubject.asObservable(); + public OIDCAppType: any = OIDCAppType; - constructor(private mgmtService: ManagementService) { } + constructor(private mgmtService: ManagementService) { } - public ngOnInit(): void { - this.loadApps(); - } + public ngOnInit(): void { + this.loadApps(); + } - public loadApps(): void { - from(this.mgmtService.listApps(this.projectId, 100, 0)).pipe( - map(resp => { - return resp.resultList; - }), - // catchError(() => of([])), - finalize(() => this.loadingSubject.next(false)), - ).subscribe((apps) => { - this.appsSubject.next(apps as App.AsObject[]); - }); - } + public loadApps(): void { + from(this.mgmtService.listApps(this.projectId, 100, 0)).pipe( + map(resp => { + return resp.resultList; + }), + // catchError(() => of([])), + finalize(() => this.loadingSubject.next(false)), + ).subscribe((apps) => { + this.appsSubject.next(apps as App.AsObject[]); + }); + } - public closeView(): void { - this.changeView.emit(); - } + public closeView(): void { + this.changeView.emit(); + } } diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/applications/applications.component.html b/console/src/app/pages/projects/owned-projects/owned-project-detail/applications/applications.component.html index aafe434269..7672391e76 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-detail/applications/applications.component.html +++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/applications/applications.component.html @@ -1,6 +1,6 @@ - - + add{{ 'ACTIONS.NEW' | translate }} @@ -49,4 +49,4 @@ [pageSizeOptions]="[25, 50, 100, 250]">
    - \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/applications/applications.component.ts b/console/src/app/pages/projects/owned-projects/owned-project-detail/applications/applications.component.ts index 8947b06507..8fdbaa0cd0 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-detail/applications/applications.component.ts +++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/applications/applications.component.ts @@ -10,7 +10,7 @@ import { ManagementService } from 'src/app/services/mgmt.service'; import { ProjectApplicationsDataSource } from './applications-datasource'; @Component({ - selector: 'app-applications', + selector: 'cnsl-applications', templateUrl: './applications.component.html', styleUrls: ['./applications.component.scss'], }) diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html index 699b9d7e22..9524c188ad 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html +++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html @@ -1,4 +1,4 @@ - +
    @@ -8,7 +8,7 @@ - + - +

    - - - - + + + +
    - -     + +     - - - + + - - - + + - - +

    {{'PROJECT.ROLE.OPTIONS' | translate}}

    {{'PROJECT.ROLE.ASSERTION' | translate}}

    {{'PROJECT.ROLE.ASSERTION_DESCRIPTION' | translate}}

    {{'PROJECT.ROLE.CHECK' | translate}}

    {{'PROJECT.ROLE.CHECK_DESCRIPTION' | translate}}

    {{'PROJECT.HAS_PROJECT' | translate}}

    {{'PROJECT.HAS_PROJECT_DESCRIPTION' | translate}}

    - - -     + +     - - + - - - + [disableWrite]="((['user.grant.write$', 'user.grant.write:'+projectId] | hasRole) | async) === false" + [disableDelete]="((['user.grant.delete$','user.grant.delete:'+projectId] | hasRole) | async) === false"> + +     @@ -136,18 +136,18 @@
    - + - - + [disabled]="(['project.member.write$', 'project.member.write:'+ project.id]| hasRole | async) === false"> + - +
    - \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts index 6e107b4a74..8a7b8b208c 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts +++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts @@ -24,7 +24,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { NameDialogComponent } from '../../../../modules/name-dialog/name-dialog.component'; @Component({ - selector: 'app-owned-project-detail', + selector: 'cnsl-owned-project-detail', templateUrl: './owned-project-detail.component.html', styleUrls: ['./owned-project-detail.component.scss'], diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.html b/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.html index 68aca38d17..6c6f54a6b8 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.html +++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.html @@ -1,87 +1,97 @@ - - - - - - - add{{ 'ACTIONS.NEW' | translate }} - - + + + + + + + add{{ 'ACTIONS.NEW' | translate }} + + -
    - +
    +
    - - - - + + + + - - - - + + + + - - - + - - + + + + - - - -
    - - - - - - + + + + + + {{ 'PROJECT.GRANT.GRANTEDORG' | translate }} - {{grant.grantedOrgName}} {{ 'PROJECT.GRANT.GRANTEDORG' | translate }} + {{grant.grantedOrgName}} {{ 'PROJECT.GRANT.DATES' | translate }} -
    - {{ 'PROJECT.GRANT.CREATIONDATE' | translate }}: - {{grant.details.creationDate | timestampToDate | localizedDate: 'dd. MMM, HH:mm' }} -
    -
    - {{ 'PROJECT.GRANT.CHANGEDATE' | translate }} - {{grant.details.changeDate | timestampToDate | localizedDate: 'dd. MMM, HH:mm' }} -
    - + +     		{{ 'PROJECT.GRANT.DATES' | translate }} +
    + {{ 'PROJECT.GRANT.CREATIONDATE' | translate }}: + {{grant.details.creationDate | timestampToDate | localizedDate: 'dd. MMM, HH:mm' }} +
    +
    + {{ 'PROJECT.GRANT.CHANGEDATE' | translate }} + {{grant.details.changeDate | timestampToDate | localizedDate: 'dd. MMM, HH:mm' }} +
    + - -     		{{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }} - - - {{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }} - - - {{role.key}} - - - - {{ 'PROJECT.GRANT.STATE' | translate }} + + {{ 'PROJECT.GRANT.STATES.'+grant.state | translate }} + +
    + + {{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }} + + + + {{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }} + + + {{role.key}} + + + + + -
    - - {{'PROJECT.GRANT.EMPTY' | translate}} -
    + + + + - - +
    + + {{'PROJECT.GRANT.EMPTY' | translate}}
    - \ No newline at end of file + + + +
    +     \ No newline at end of file diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.ts b/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.ts index bdb508b108..5e9fbbb30c 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.ts +++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.ts @@ -5,106 +5,108 @@ import { MatSelectChange } from '@angular/material/select'; import { MatTable } from '@angular/material/table'; import { tap } from 'rxjs/operators'; import { PaginatorComponent } from 'src/app/modules/paginator/paginator.component'; -import { GrantedProject, Role } from 'src/app/proto/generated/zitadel/project_pb'; +import { GrantedProject, ProjectGrantState, Role } from 'src/app/proto/generated/zitadel/project_pb'; import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; import { ProjectGrantsDataSource } from './project-grants-datasource'; @Component({ - selector: 'app-project-grants', - templateUrl: './project-grants.component.html', - styleUrls: ['./project-grants.component.scss'], - animations: [ - trigger('detailExpand', [ - state('collapsed', style({ height: '0px', minHeight: '0' })), - state('expanded', style({ height: '*' })), - transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')), - ]), - ], + selector: 'cnsl-project-grants', + templateUrl: './project-grants.component.html', + styleUrls: ['./project-grants.component.scss'], + animations: [ + trigger('detailExpand', [ + state('collapsed', style({ height: '0px', minHeight: '0' })), + state('expanded', style({ height: '*' })), + transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')), + ]), + ], }) export class ProjectGrantsComponent implements OnInit, AfterViewInit { - @Input() refreshOnPreviousRoutes: string[] = []; - @Input() public projectId: string = ''; - @Input() public disabled: boolean = false; - @ViewChild(PaginatorComponent) public paginator!: PaginatorComponent; - @ViewChild(MatTable) public table!: MatTable; - public dataSource!: ProjectGrantsDataSource; - public selection: SelectionModel = new SelectionModel(true, []); - public memberRoleOptions: Role.AsObject[] = []; + @Input() refreshOnPreviousRoutes: string[] = []; + @Input() public projectId: string = ''; + @Input() public disabled: boolean = false; + @ViewChild(PaginatorComponent) public paginator!: PaginatorComponent; + @ViewChild(MatTable) public table!: MatTable; + public dataSource!: ProjectGrantsDataSource; + public selection: SelectionModel = new SelectionModel(true, []); + public memberRoleOptions: Role.AsObject[] = []; - /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ - public displayedColumns: string[] = ['select', 'grantedOrgName', 'dates']; + /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ + public displayedColumns: string[] = ['select', 'grantedOrgName','state', 'dates']; - constructor(private mgmtService: ManagementService, private toast: ToastService) { } + ProjectGrantState: any = ProjectGrantState; - public ngOnInit(): void { - this.dataSource = new ProjectGrantsDataSource(this.mgmtService); - this.dataSource.loadGrants(this.projectId, 0, 25, 'asc'); - this.getRoleOptions(this.projectId); - } + constructor(private mgmtService: ManagementService, private toast: ToastService) { } - public ngAfterViewInit(): void { - this.paginator.page - .pipe( - tap(() => this.loadGrantsPage()), - ) - .subscribe(); - } + public ngOnInit(): void { + this.dataSource = new ProjectGrantsDataSource(this.mgmtService); + this.dataSource.loadGrants(this.projectId, 0, 25, 'asc'); + this.getRoleOptions(this.projectId); + } - public loadGrantsPage(pageIndex?: number, pageSize?: number): void { - this.dataSource.loadGrants( - this.projectId, - pageIndex ?? this.paginator.pageIndex, - pageSize ?? this.paginator.pageSize, - ); - } + public ngAfterViewInit(): void { + this.paginator.page + .pipe( + tap(() => this.loadGrantsPage()), + ) + .subscribe(); + } - public isAllSelected(): boolean { - const numSelected = this.selection.selected.length; - const numRows = this.dataSource.grantsSubject.value.length; - return numSelected === numRows; - } + public loadGrantsPage(pageIndex?: number, pageSize?: number): void { + this.dataSource.loadGrants( + this.projectId, + pageIndex ?? this.paginator.pageIndex, + pageSize ?? this.paginator.pageSize, + ); + } - public masterToggle(): void { - this.isAllSelected() ? - this.selection.clear() : - this.dataSource.grantsSubject.value.forEach(row => this.selection.select(row)); - } + public isAllSelected(): boolean { + const numSelected = this.selection.selected.length; + const numRows = this.dataSource.grantsSubject.value.length; + return numSelected === numRows; + } - public getRoleOptions(projectId: string): void { - this.mgmtService.listProjectRoles(projectId, 100, 0).then(resp => { - this.memberRoleOptions = resp.resultList; - }); - } + public masterToggle(): void { + this.isAllSelected() ? + this.selection.clear() : + this.dataSource.grantsSubject.value.forEach(row => this.selection.select(row)); + } - updateRoles(grant: GrantedProject.AsObject, selectionChange: MatSelectChange): void { - this.mgmtService.updateProjectGrant(grant.grantId, grant.projectId, selectionChange.value) - .then(() => { - this.toast.showInfo('PROJECT.GRANT.TOAST.PROJECTGRANTCHANGED', true); - }).catch(error => { - this.toast.showError(error); - }); - } + public getRoleOptions(projectId: string): void { + this.mgmtService.listProjectRoles(projectId, 100, 0).then(resp => { + this.memberRoleOptions = resp.resultList; + }); + } - deleteSelectedGrants(): void { - const promises = this.selection.selected.map(grant => { - return this.mgmtService.removeProjectGrant(grant.grantId, grant.projectId); - }); + updateRoles(grant: GrantedProject.AsObject, selectionChange: MatSelectChange): void { + this.mgmtService.updateProjectGrant(grant.grantId, grant.projectId, selectionChange.value) + .then(() => { + this.toast.showInfo('PROJECT.GRANT.TOAST.PROJECTGRANTCHANGED', true); + }).catch(error => { + this.toast.showError(error); + }); + } - Promise.all(promises).then(() => { - this.toast.showInfo('GRANTS.TOAST.BULKREMOVED', true); - const data = this.dataSource.grantsSubject.getValue(); - this.selection.selected.forEach((item) => { - const index = data.findIndex(i => i.grantId === item.grantId); - if (index > -1) { - data.splice(index, 1); - this.dataSource.grantsSubject.next(data); - } - }); - this.selection.clear(); - }).catch(error => { - this.toast.showError(error); - }); - } + deleteSelectedGrants(): void { + const promises = this.selection.selected.map(grant => { + return this.mgmtService.removeProjectGrant(grant.grantId, grant.projectId); + }); + + Promise.all(promises).then(() => { + this.toast.showInfo('GRANTS.TOAST.BULKREMOVED', true); + const data = this.dataSource.grantsSubject.getValue(); + this.selection.selected.forEach((item) => { + const index = data.findIndex(i => i.grantId === item.grantId); + if (index > -1) { + data.splice(index, 1); + this.dataSource.grantsSubject.next(data); + } + }); + this.selection.clear(); + }).catch(error => { + this.toast.showError(error); + }); + } } diff --git a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.html b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.html index 7b177579b9..00e404263d 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.html +++ b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.html @@ -13,19 +13,15 @@ (click)="navigateToProject(item.id, $event)" [ngClass]="{ inactive: item.state !== ProjectState.PROJECT_STATE_ACTIVE}">
    - {{'PROJECT.PAGES.LASTMODIFIED' | translate}} - {{ - item.details.changeDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' - }} + {{'PROJECT.PAGES.LASTMODIFIED' | translate}} + {{ item.details.changeDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }}
    {{ item.name }}
    - {{'PROJECT.PAGES.CREATEDON' | translate}} - {{ - item.details.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' - }} + {{'PROJECT.PAGES.CREATEDON' | translate}} + {{ item.details.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }}
    @@ -40,16 +36,14 @@
    - {{'PROJECT.PAGES.LASTMODIFIED' | translate}} - {{ - item.details.changeDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' - }} + {{'PROJECT.PAGES.LASTMODIFIED' | translate}} + {{ item.details.changeDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }}
    {{ item.name }}
    - {{'PROJECT.PAGES.CREATEDON' | translate}} + {{'PROJECT.PAGES.CREATEDON' | translate}} {{ item.details.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }} @@ -62,7 +56,7 @@

    {{'PROJECT.PAGES.NOITEMS' | translate}}

    - +
    add {{'PROJECT.PAGES.ADDNEW' | translate}} diff --git a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.ts b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.ts index 41bfa06ba0..10141573bc 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.ts +++ b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.ts @@ -11,7 +11,7 @@ import { StorageKey, StorageLocation, StorageService } from 'src/app/services/st import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-owned-project-grid', + selector: 'cnsl-owned-project-grid', templateUrl: './owned-project-grid.component.html', styleUrls: ['./owned-project-grid.component.scss'], animations: [ @@ -44,7 +44,7 @@ export class OwnedProjectGridComponent implements OnChanges { @Output() newClicked: EventEmitter = new EventEmitter(); @Output() changedView: EventEmitter = new EventEmitter(); - @Input() loading: boolean = false; + @Input() loading: boolean | null = false; public selection: SelectionModel = new SelectionModel(true, []); @@ -94,9 +94,11 @@ export class OwnedProjectGridComponent implements OnChanges { this.getPrefixedItem('pinned-projects').then(storageEntry => { if (storageEntry) { const array: string[] = JSON.parse(storageEntry); - const toSelect: Project.AsObject[] = this.items.filter((item, index) => { + const toSelect: Project.AsObject[] = this.items.filter((item) => { if (array.includes(item.id)) { return true; + } else { + return false; } }); this.selection.select(...toSelect); diff --git a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.html b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.html index 02dae47c72..024a3556b5 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.html +++ b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.html @@ -1,7 +1,7 @@ - - +
    - - + add{{ 'ACTIONS.NEW' | translate }} @@ -36,19 +36,20 @@ {{ 'PROJECT.NAME' | translate }} - {{project.name}} + {{project.name}} {{ 'PROJECT.TABLE.STATE' | translate }} - {{'PROJECT.STATE.'+project.state - | translate}} + + {{'PROJECT.STATE.'+project.state | translate}} + {{ 'PROJECT.TABLE.CREATIONDATE' | translate }} - + {{project.details.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm'}} @@ -57,7 +58,7 @@ {{ 'PROJECT.TABLE.CHANGEDATE' | translate }} - + {{project.details.changeDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm'}} @@ -75,16 +76,15 @@ - + -
    +
    {{'PROJECT.TABLE.EMPTY' | translate}}
    -     +
    \ No newline at end of file diff --git a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.ts b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.ts index e2a94ca539..69ab654f47 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.ts +++ b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.ts @@ -10,12 +10,12 @@ import { BehaviorSubject, Observable, Subscription } from 'rxjs'; import { take } from 'rxjs/operators'; import { PageEvent, PaginatorComponent } from 'src/app/modules/paginator/paginator.component'; import { WarnDialogComponent } from 'src/app/modules/warn-dialog/warn-dialog.component'; -import { Project } from 'src/app/proto/generated/zitadel/project_pb'; +import { Project, ProjectState } from 'src/app/proto/generated/zitadel/project_pb'; import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-owned-project-list', + selector: 'cnsl-owned-project-list', templateUrl: './owned-project-list.component.html', styleUrls: ['./owned-project-list.component.scss'], animations: [ @@ -58,6 +58,7 @@ export class OwnedProjectListComponent implements OnInit, OnDestroy { private subscription?: Subscription; public zitadelProjectId: string = ''; + public ProjectState: any = ProjectState; constructor(private router: Router, private route: ActivatedRoute, @@ -162,7 +163,7 @@ export class OwnedProjectListComponent implements OnInit, OnDestroy { this.getData(this.paginator.pageSize, this.paginator.pageIndex * this.paginator.pageSize); } - public deleteProject(item: Project.AsObject): void { + public deleteProject(id: string): void { const dialogRef = this.dialog.open(WarnDialogComponent, { data: { confirmKey: 'ACTIONS.DELETE', @@ -174,8 +175,8 @@ export class OwnedProjectListComponent implements OnInit, OnDestroy { }); dialogRef.afterClosed().subscribe(resp => { - if (this.zitadelProjectId && resp && item.id !== this.zitadelProjectId) { - this.mgmtService.removeProject(item.id).then(() => { + if (this.zitadelProjectId && resp && id !== this.zitadelProjectId) { + this.mgmtService.removeProject(id).then(() => { this.toast.showInfo('PROJECT.TOAST.DELETED', true); setTimeout(() => { this.refreshPage(); diff --git a/console/src/app/pages/projects/owned-projects/owned-projects.component.html b/console/src/app/pages/projects/owned-projects/owned-projects.component.html index 60c7dcd8da..80680ae623 100644 --- a/console/src/app/pages/projects/owned-projects/owned-projects.component.html +++ b/console/src/app/pages/projects/owned-projects/owned-projects.component.html @@ -3,5 +3,5 @@

    {{ 'PROJECT.PAGES.LISTDESCRIPTION' | translate }}

    {{'PROJECT.PAGES.TYPE.OWNED' | translate}}

    - +
    \ No newline at end of file diff --git a/console/src/app/pages/projects/owned-projects/owned-projects.component.ts b/console/src/app/pages/projects/owned-projects/owned-projects.component.ts index acf63d2350..3f861230f4 100644 --- a/console/src/app/pages/projects/owned-projects/owned-projects.component.ts +++ b/console/src/app/pages/projects/owned-projects/owned-projects.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-owned-projects', - templateUrl: './owned-projects.component.html', - styleUrls: ['./owned-projects.component.scss'], + selector: 'cnsl-owned-projects', + templateUrl: './owned-projects.component.html', + styleUrls: ['./owned-projects.component.scss'], }) export class OwnedProjectsComponent { } diff --git a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.html b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.html index 3a5ffd08ef..fc077603a7 100644 --- a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.html +++ b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.html @@ -1,4 +1,4 @@ -
    @@ -22,11 +22,11 @@
    - -
    @@ -45,20 +45,20 @@

    {{ 'PROJECT.GRANT.DETAIL.MEMBERTITLE' | translate }}

    {{ 'PROJECT.GRANT.DETAIL.MEMBERDESC' | translate }}

    - add{{ 'ACTIONS.NEW' | translate }} - - \ No newline at end of file + + \ No newline at end of file diff --git a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.scss b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.scss index 5c15ed70e3..69ec1ad648 100644 --- a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.scss +++ b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.scss @@ -1,3 +1,7 @@ +.desc { + font-size: 14px; + color: var(--grey); +} .del-button { margin-right: .5rem; diff --git a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.ts b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.ts index dd01a24d06..57d5d88a32 100644 --- a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.ts +++ b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.ts @@ -9,164 +9,164 @@ import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; import { - ProjectGrantMembersCreateDialogComponent, - ProjectGrantMembersCreateDialogExportType, + ProjectGrantMembersCreateDialogComponent, + ProjectGrantMembersCreateDialogExportType, } from './project-grant-members-create-dialog/project-grant-members-create-dialog.component'; import { ProjectGrantMembersDataSource } from './project-grant-members-datasource'; @Component({ - selector: 'app-project-grant-detail', - templateUrl: './project-grant-detail.component.html', - styleUrls: ['./project-grant-detail.component.scss'], + selector: 'cnsl-project-grant-detail', + templateUrl: './project-grant-detail.component.html', + styleUrls: ['./project-grant-detail.component.scss'], }) export class ProjectGrantDetailComponent { - public INITIALPAGESIZE: number = 25; + public INITIALPAGESIZE: number = 25; - public grant!: GrantedProject.AsObject; - public projectid: string = ''; - public grantid: string = ''; + public grant!: GrantedProject.AsObject; + public projectid: string = ''; + public grantid: string = ''; - public disabled: boolean = false; + public disabled: boolean = false; - public isZitadel: boolean = false; - ProjectGrantState: any = ProjectGrantState; + public isZitadel: boolean = false; + ProjectGrantState: any = ProjectGrantState; - public projectRoleOptions: Role.AsObject[] = []; - public memberRoleOptions: Array = []; + public projectRoleOptions: Role.AsObject[] = []; + public memberRoleOptions: Array = []; - public changePageFactory!: Function; - public changePage: EventEmitter = new EventEmitter(); - public selection: Array = []; - public dataSource!: ProjectGrantMembersDataSource; - constructor( - private mgmtService: ManagementService, - private route: ActivatedRoute, - private toast: ToastService, - private dialog: MatDialog, - ) { - this.route.params.subscribe(params => { - this.projectid = params.projectid; - this.grantid = params.grantid; + public changePageFactory!: Function; + public changePage: EventEmitter = new EventEmitter(); + public selection: Array = []; + public dataSource!: ProjectGrantMembersDataSource; + constructor( + private mgmtService: ManagementService, + private route: ActivatedRoute, + private toast: ToastService, + private dialog: MatDialog, + ) { + this.route.params.subscribe(params => { + this.projectid = params.projectid; + this.grantid = params.grantid; - this.dataSource = new ProjectGrantMembersDataSource(this.mgmtService); - this.dataSource.loadGrantMembers(params.projectid, params.grantid, 0, this.INITIALPAGESIZE); + this.dataSource = new ProjectGrantMembersDataSource(this.mgmtService); + this.dataSource.loadMembers(params.projectid, params.grantid, 0, this.INITIALPAGESIZE); - this.getRoleOptions(params.projectid); - this.getMemberRoleOptions(); + this.getRoleOptions(params.projectid); + this.getMemberRoleOptions(); - this.changePageFactory = (event?: PageEvent) => { - return this.dataSource.loadGrantMembers( - params.projectid, - params.grantid, - event?.pageIndex ?? 0, - event?.pageSize ?? this.INITIALPAGESIZE, - ); - }; + this.changePageFactory = (event?: PageEvent) => { + return this.dataSource.loadMembers( + params.projectid, + params.grantid, + event?.pageIndex ?? 0, + event?.pageSize ?? this.INITIALPAGESIZE, + ); + }; - this.mgmtService.getProjectGrantByID(this.grantid, this.projectid).then((resp) => { - if (resp.projectGrant) { - this.grant = resp.projectGrant; - } - }); - }); - } - - public changeState(newState: ProjectGrantState): void { - if (newState === ProjectGrantState.PROJECT_GRANT_STATE_ACTIVE) { - this.mgmtService.reactivateProjectGrant(this.grantid, this.projectid).then(() => { - this.toast.showInfo('PROJECT.TOAST.REACTIVATED', true); - this.grant.state = newState; - }).catch(error => { - this.toast.showError(error); - }); - } else if (newState === ProjectGrantState.PROJECT_GRANT_STATE_INACTIVE) { - this.mgmtService.deactivateProjectGrant(this.grantid, this.projectid).then(() => { - this.toast.showInfo('PROJECT.TOAST.DEACTIVATED', true); - this.grant.state = newState; - }).catch(error => { - this.toast.showError(error); - }); + this.mgmtService.getProjectGrantByID(this.grantid, this.projectid).then((resp) => { + if (resp.projectGrant) { + this.grant = resp.projectGrant; } - } + }); + }); + } - public getRoleOptions(projectId: string): void { - this.mgmtService.listProjectRoles(projectId, 100, 0).then(resp => { - this.projectRoleOptions = resp.resultList; - }); + public changeState(newState: ProjectGrantState): void { + if (newState === ProjectGrantState.PROJECT_GRANT_STATE_ACTIVE) { + this.mgmtService.reactivateProjectGrant(this.grantid, this.projectid).then(() => { + this.toast.showInfo('PROJECT.TOAST.REACTIVATED', true); + this.grant.state = newState; + }).catch(error => { + this.toast.showError(error); + }); + } else if (newState === ProjectGrantState.PROJECT_GRANT_STATE_INACTIVE) { + this.mgmtService.deactivateProjectGrant(this.grantid, this.projectid).then(() => { + this.toast.showInfo('PROJECT.TOAST.DEACTIVATED', true); + this.grant.state = newState; + }).catch(error => { + this.toast.showError(error); + }); } + } - public getMemberRoleOptions(): void { - this.mgmtService.listProjectGrantMemberRoles().then(resp => { - this.memberRoleOptions = resp.resultList; + public getRoleOptions(projectId: string): void { + this.mgmtService.listProjectRoles(projectId, 100, 0).then(resp => { + this.projectRoleOptions = resp.resultList; + }); + } + + public getMemberRoleOptions(): void { + this.mgmtService.listProjectGrantMemberRoles().then(resp => { + this.memberRoleOptions = resp.resultList; + }).catch(error => { + this.toast.showError(error); + }); + } + + updateRoles(selectionChange: MatSelectChange): void { + this.mgmtService.updateProjectGrant(this.grant.grantId, this.grant.projectId, selectionChange.value) + .then(() => { + this.toast.showInfo('PROJECT.GRANT.TOAST.PROJECTGRANTUPDATED', true); + }).catch(error => { + this.toast.showError(error); + }); + } + + public removeProjectMemberSelection(): void { + Promise.all(this.selection.map(member => { + return this.mgmtService.removeProjectGrantMember(this.grant.projectId, this.grant.grantId, member.userId) + .then(() => { + this.toast.showInfo('PROJECT.GRANT.TOAST.PROJECTGRANTMEMBERREMOVED', true); + setTimeout(() => { + this.changePage.emit(); + }, 1000); }).catch(error => { - this.toast.showError(error); + this.toast.showError(error); }); - } + })); + } - updateRoles(selectionChange: MatSelectChange): void { - this.mgmtService.updateProjectGrant(this.grant.grantId, this.grant.projectId, selectionChange.value) - .then(() => { - this.toast.showInfo('PROJECT.GRANT.TOAST.PROJECTGRANTUPDATED', true); - }).catch(error => { - this.toast.showError(error); - }); - } + public async openAddMember(): Promise { + const keysList = (await this.mgmtService.listProjectGrantMemberRoles()); - public removeProjectMemberSelection(): void { - Promise.all(this.selection.map(member => { - return this.mgmtService.removeProjectGrantMember(this.grant.projectId, this.grant.grantId, member.userId) - .then(() => { - this.toast.showInfo('PROJECT.GRANT.TOAST.PROJECTGRANTMEMBERREMOVED', true); - setTimeout(() => { - this.changePage.emit(); - }, 1000); - }).catch(error => { - this.toast.showError(error); - }); - })); - } + const dialogRef = this.dialog.open(ProjectGrantMembersCreateDialogComponent, { + data: { + roleKeysList: keysList.resultList, + }, + width: '400px', + }); - public async openAddMember(): Promise { - const keysList = (await this.mgmtService.listProjectGrantMemberRoles()); - - const dialogRef = this.dialog.open(ProjectGrantMembersCreateDialogComponent, { - data: { - roleKeysList: keysList.resultList, - }, - width: '400px', - }); - - dialogRef.afterClosed().subscribe((dataToAdd: ProjectGrantMembersCreateDialogExportType) => { - if (dataToAdd) { - Promise.all(dataToAdd.userIds.map((userid: string) => { - return this.mgmtService.addProjectGrantMember( - this.grant.projectId, - this.grant.grantId, - userid, - dataToAdd.rolesKeyList, - ); - })).then(() => { - this.toast.showInfo('PROJECT.GRANT.TOAST.PROJECTGRANTMEMBERADDED', true); - setTimeout(() => { - this.changePage.emit(); - }, 3000); - }).catch(error => { - this.toast.showError(error); - }); - } - }); - } - - updateMemberRoles(member: Member.AsObject, selectionChange: MatSelectChange): void { - this.mgmtService.updateProjectGrantMember( + dialogRef.afterClosed().subscribe((dataToAdd: ProjectGrantMembersCreateDialogExportType) => { + if (dataToAdd) { + Promise.all(dataToAdd.userIds.map((userid: string) => { + return this.mgmtService.addProjectGrantMember( this.grant.projectId, this.grant.grantId, - member.userId, - selectionChange.value, - ).then(() => { - this.toast.showInfo('PROJECT.GRANT.TOAST.PROJECTGRANTMEMBERCHANGED', true); + userid, + dataToAdd.rolesKeyList, + ); + })).then(() => { + this.toast.showInfo('PROJECT.GRANT.TOAST.PROJECTGRANTMEMBERADDED', true); + setTimeout(() => { + this.changePage.emit(); + }, 3000); }).catch(error => { - this.toast.showError(error); + this.toast.showError(error); }); - } + } + }); + } + + updateMemberRoles(member: Member.AsObject, selectionChange: MatSelectChange): void { + this.mgmtService.updateProjectGrantMember( + this.grant.projectId, + this.grant.grantId, + member.userId, + selectionChange.value, + ).then(() => { + this.toast.showInfo('PROJECT.GRANT.TOAST.PROJECTGRANTMEMBERCHANGED', true); + }).catch(error => { + this.toast.showError(error); + }); + } } diff --git a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-create-dialog/project-grant-members-create-dialog.component.html b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-create-dialog/project-grant-members-create-dialog.component.html index 639b0915dd..f7962a5b37 100644 --- a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-create-dialog/project-grant-members-create-dialog.component.html +++ b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-create-dialog/project-grant-members-create-dialog.component.html @@ -3,8 +3,8 @@

    {{'ORG_DETAIL.MEMBER.ADDDESCRIPTION' | translate}}

    - - + + {{ 'PROJECT.MEMBER.ROLES' | translate }} @@ -20,7 +20,7 @@ cancel - diff --git a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-create-dialog/project-grant-members-create-dialog.component.ts b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-create-dialog/project-grant-members-create-dialog.component.ts index c4be8b5045..e0f04f8ea3 100644 --- a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-create-dialog/project-grant-members-create-dialog.component.ts +++ b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-create-dialog/project-grant-members-create-dialog.component.ts @@ -4,37 +4,39 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { User } from 'src/app/proto/generated/zitadel/user_pb'; export interface ProjectGrantMembersCreateDialogExportType { - userIds: string[]; - rolesKeyList: string[]; + userIds: string[]; + rolesKeyList: string[]; } @Component({ - selector: 'app-project-grant-members-create-dialog', - templateUrl: './project-grant-members-create-dialog.component.html', - styleUrls: ['./project-grant-members-create-dialog.component.scss'], + selector: 'cnsl-project-grant-members-create-dialog', + templateUrl: './project-grant-members-create-dialog.component.html', + styleUrls: ['./project-grant-members-create-dialog.component.scss'], }) export class ProjectGrantMembersCreateDialogComponent { - public form!: FormGroup; - public userIds: string[] = []; - public roleKeyList: string[] = []; + public form!: FormGroup; + public userIds: string[] = []; + public roleKeyList: string[] = []; - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any, - ) { } + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any, + ) { } - public selectUsers(users: User.AsObject[]): void { - this.userIds = users.map(user => user.id); + public selectUsers(users: User.AsObject | User.AsObject[]): void { + if (Array.isArray(users)) { + this.userIds = users.map(user => user.id); } + } - public closeDialog(): void { - this.dialogRef.close(false); - } + public closeDialog(): void { + this.dialogRef.close(false); + } - public closeDialogWithSuccess(): void { - const exportData: ProjectGrantMembersCreateDialogExportType = { - userIds: this.userIds, - rolesKeyList: this.roleKeyList, - }; - this.dialogRef.close(exportData); - } + public closeDialogWithSuccess(): void { + const exportData: ProjectGrantMembersCreateDialogExportType = { + userIds: this.userIds, + rolesKeyList: this.roleKeyList, + }; + this.dialogRef.close(exportData); + } } diff --git a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-datasource.ts b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-datasource.ts index cfab7c7dfb..e20f90a895 100644 --- a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-datasource.ts +++ b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-datasource.ts @@ -11,55 +11,53 @@ import { ManagementService } from 'src/app/services/mgmt.service'; * (including sorting, pagination, and filtering). */ export class ProjectGrantMembersDataSource extends DataSource { - public totalResult: number = 0; - public viewTimestamp!: Timestamp.AsObject; + public totalResult: number = 0; + public viewTimestamp!: Timestamp.AsObject; - public membersSubject: BehaviorSubject = new BehaviorSubject([]); - private loadingSubject: BehaviorSubject = new BehaviorSubject(false); - public loading$: Observable = this.loadingSubject.asObservable(); + public membersSubject: BehaviorSubject = new BehaviorSubject([]); + private loadingSubject: BehaviorSubject = new BehaviorSubject(false); + public loading$: Observable = this.loadingSubject.asObservable(); - constructor(private mgmtService: ManagementService) { - super(); - } + constructor(private service: ManagementService) { + super(); + } - public loadGrantMembers(projectId: string, grantId: string, pageIndex: number, - pageSize: number): void { - const offset = pageIndex * pageSize; + public loadMembers(projectId: string, grantId: string, pageIndex: number, pageSize: number): void { + const offset = pageIndex * pageSize; - this.loadingSubject.next(true); + this.loadingSubject.next(true); - from(this.mgmtService.listProjectGrantMembers(projectId, - grantId, pageSize, offset)).pipe( - map(resp => { - this.totalResult = resp.details?.totalResult || 0; - if (resp.details?.viewTimestamp) { - this.viewTimestamp = resp.details?.viewTimestamp; - } - return resp.resultList; - }), - catchError(() => of([])), - finalize(() => this.loadingSubject.next(false)), - ).subscribe(members => { - this.membersSubject.next(members); - }); + from(this.service.listProjectGrantMembers(projectId, + grantId, pageSize, offset)).pipe( + map(resp => { + this.totalResult = resp.details?.totalResult || 0; + if (resp.details?.viewTimestamp) { + this.viewTimestamp = resp.details?.viewTimestamp; + } + return resp.resultList; + }), + catchError(() => of([])), + finalize(() => this.loadingSubject.next(false)), + ).subscribe(members => { + this.membersSubject.next(members); + }); + } - } + /** + * Connect this data source to the table. The table will only update when + * the returned stream emits new items. + * @returns A stream of the items to be rendered. + */ + public connect(): Observable { + return this.membersSubject.asObservable(); + } - /** - * Connect this data source to the table. The table will only update when - * the returned stream emits new items. - * @returns A stream of the items to be rendered. - */ - public connect(): Observable { - return this.membersSubject.asObservable(); - } - - /** - * Called when the table is being destroyed. Use this function, to clean up - * any open connections or free any held resources that were set up during connect. - */ - public disconnect(): void { - this.membersSubject.complete(); - this.loadingSubject.complete(); - } + /** + * Called when the table is being destroyed. Use this function, to clean up + * any open connections or free any held resources that were set up during connect. + */ + public disconnect(): void { + this.membersSubject.complete(); + this.loadingSubject.complete(); + } } diff --git a/console/src/app/pages/projects/project-create/project-create.component.ts b/console/src/app/pages/projects/project-create/project-create.component.ts index 039b4ee842..75248057f0 100644 --- a/console/src/app/pages/projects/project-create/project-create.component.ts +++ b/console/src/app/pages/projects/project-create/project-create.component.ts @@ -1,41 +1,40 @@ import { Location } from '@angular/common'; -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { Router } from '@angular/router'; import { AddProjectRequest, AddProjectResponse } from 'src/app/proto/generated/zitadel/management_pb'; import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-project-create', - templateUrl: './project-create.component.html', - styleUrls: ['./project-create.component.scss'], + selector: 'cnsl-project-create', + templateUrl: './project-create.component.html', + styleUrls: ['./project-create.component.scss'], }) -export class ProjectCreateComponent implements OnInit { - public project: AddProjectRequest.AsObject = new AddProjectRequest().toObject(); +export class ProjectCreateComponent { + public project: AddProjectRequest.AsObject = new AddProjectRequest().toObject(); - constructor( - private router: Router, - private toast: ToastService, - private mgmtService: ManagementService, - private _location: Location, - ) { } + constructor( + private router: Router, + private toast: ToastService, + private mgmtService: ManagementService, + private _location: Location, + ) { } - public createSteps: number = 1; - public currentCreateStep: number = 1; - public ngOnInit(): void { } + public createSteps: number = 1; + public currentCreateStep: number = 1; - public saveProject(): void { - this.mgmtService - .addProject(this.project) - .then((resp: AddProjectResponse.AsObject) => { - this.router.navigate(['projects', resp.id]); - }) - .catch(error => { - this.toast.showError(error); - }); - } + public saveProject(): void { + this.mgmtService + .addProject(this.project) + .then((resp: AddProjectResponse.AsObject) => { + this.router.navigate(['projects', resp.id]); + }) + .catch(error => { + this.toast.showError(error); + }); + } - public close(): void { - this._location.back(); - } + public close(): void { + this._location.back(); + } } diff --git a/console/src/app/pages/projects/project-grant-create/project-grant-create.component.html b/console/src/app/pages/projects/project-grant-create/project-grant-create.component.html index 7623ce02f6..414a0c297d 100644 --- a/console/src/app/pages/projects/project-grant-create/project-grant-create.component.html +++ b/console/src/app/pages/projects/project-grant-create/project-grant-create.component.html @@ -18,7 +18,7 @@ - @@ -32,9 +32,9 @@

    {{'PROJECT.GRANT.CREATE.SEL_ROLES' | translate}}

    - - - + + +
    diff --git a/console/src/app/pages/projects/project-grant-create/project-grant-create.component.ts b/console/src/app/pages/projects/project-grant-create/project-grant-create.component.ts index 897b22bdb4..3f942f81dd 100644 --- a/console/src/app/pages/projects/project-grant-create/project-grant-create.component.ts +++ b/console/src/app/pages/projects/project-grant-create/project-grant-create.component.ts @@ -9,79 +9,79 @@ import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-project-grant-create', - templateUrl: './project-grant-create.component.html', - styleUrls: ['./project-grant-create.component.scss'], + selector: 'cnsl-project-grant-create', + templateUrl: './project-grant-create.component.html', + styleUrls: ['./project-grant-create.component.scss'], }) export class ProjectGrantCreateComponent implements OnInit, OnDestroy { - public org!: Org.AsObject; - public projectId: string = ''; - public grantId: string = ''; - public rolesKeyList: string[] = []; + public org!: Org.AsObject; + public projectId: string = ''; + public grantId: string = ''; + public rolesKeyList: string[] = []; - public STEPS: number = 2; - public currentCreateStep: number = 1; + public STEPS: number = 2; + public currentCreateStep: number = 1; - private routeSubscription: Subscription = new Subscription(); - constructor( - private route: ActivatedRoute, - private toast: ToastService, - private mgmtService: ManagementService, - private authService: GrpcAuthService, - private _location: Location, - ) { } + private routeSubscription: Subscription = new Subscription(); + constructor( + private route: ActivatedRoute, + private toast: ToastService, + private mgmtService: ManagementService, + private authService: GrpcAuthService, + private _location: Location, + ) { } - public ngOnInit(): void { - this.routeSubscription = this.route.params.subscribe(params => { - this.projectId = params.projectid; + public ngOnInit(): void { + this.routeSubscription = this.route.params.subscribe(params => { + this.projectId = params.projectid; + }); + } + + public ngOnDestroy(): void { + this.routeSubscription.unsubscribe(); + } + + public searchOrg(domain: string): void { + this.mgmtService.getOrgByDomainGlobal(domain).then((ret) => { + if (ret.org) { + const tmp = ret.org; + this.authService.getActiveOrg().then((org) => { + if (tmp !== org) { + this.org = tmp; + } }); - } + this.org = ret.org; + } + }).catch(error => { + this.toast.showError(error); + }); + } - public ngOnDestroy(): void { - this.routeSubscription.unsubscribe(); - } + public close(): void { + this._location.back(); + } - public searchOrg(domain: string): void { - this.mgmtService.getOrgByDomainGlobal(domain).then((ret) => { - if (ret.org) { - const tmp = ret.org; - this.authService.getActiveOrg().then((org) => { - if (tmp !== org) { - this.org = tmp; - } - }); - this.org = ret.org; - } - }).catch(error => { - this.toast.showError(error); - }); - } + public addGrant(): void { + this.mgmtService + .addProjectGrant(this.org.id, this.projectId, this.rolesKeyList) + .then(() => { + this.close(); + }) + .catch(error => { + this.toast.showError(error); + }); + } - public close(): void { - this._location.back(); - } + public selectRoles(roles: Role.AsObject[]): void { + this.rolesKeyList = roles.map(role => role.key); + } - public addGrant(): void { - this.mgmtService - .addProjectGrant(this.org.id, this.projectId, this.rolesKeyList) - .then(() => { - this.close(); - }) - .catch(error => { - this.toast.showError(error); - }); - } + public next(): void { + this.currentCreateStep++; + } - public selectRoles(roles: Role.AsObject[]): void { - this.rolesKeyList = roles.map(role => role.key); - } - - public next(): void { - this.currentCreateStep++; - } - - public previous(): void { - this.currentCreateStep--; - } + public previous(): void { + this.currentCreateStep--; + } } diff --git a/console/src/app/pages/projects/project-role-create/project-role-create.component.html b/console/src/app/pages/projects/project-role-create/project-role-create.component.html index 297f8ea54b..dadbb2a28a 100644 --- a/console/src/app/pages/projects/project-role-create/project-role-create.component.html +++ b/console/src/app/pages/projects/project-role-create/project-role-create.component.html @@ -14,7 +14,7 @@
    - + {{ 'PROJECT.ROLE.KEY' | translate }} diff --git a/console/src/app/pages/projects/project-role-create/project-role-create.component.ts b/console/src/app/pages/projects/project-role-create/project-role-create.component.ts index 3ab27ba69f..25fa18c638 100644 --- a/console/src/app/pages/projects/project-role-create/project-role-create.component.ts +++ b/console/src/app/pages/projects/project-role-create/project-role-create.component.ts @@ -1,7 +1,7 @@ import { animate, animateChild, query, stagger, style, transition, trigger } from '@angular/animations'; import { Location } from '@angular/common'; import { Component, OnDestroy, OnInit } from '@angular/core'; -import { FormArray, FormControl, FormGroup, Validators } from '@angular/forms'; +import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { Subscription } from 'rxjs'; import { BulkAddProjectRolesRequest } from 'src/app/proto/generated/zitadel/management_pb'; @@ -9,98 +9,97 @@ import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-project-role-create', - templateUrl: './project-role-create.component.html', - styleUrls: ['./project-role-create.component.scss'], - animations: [ - trigger('list', [ - transition(':enter', [ - query('@animate', - stagger(80, animateChild()), - ), - ]), - ]), - trigger('animate', [ - transition(':enter', [ - style({ opacity: 0, transform: 'translateY(-100%)' }), - animate('100ms', style({ opacity: 1, transform: 'translateY(0)' })), - ]), - transition(':leave', [ - style({ opacity: 1, transform: 'translateY(0)' }), - animate('100ms', style({ opacity: 0, transform: 'translateY(100%)' })), - ]), - ]), - ], + selector: 'cnsl-project-role-create', + templateUrl: './project-role-create.component.html', + styleUrls: ['./project-role-create.component.scss'], + animations: [ + trigger('list', [ + transition(':enter', [ + query('@animate', + stagger(80, animateChild()), + ), + ]), + ]), + trigger('animate', [ + transition(':enter', [ + style({ opacity: 0, transform: 'translateY(-100%)' }), + animate('100ms', style({ opacity: 1, transform: 'translateY(0)' })), + ]), + transition(':leave', [ + style({ opacity: 1, transform: 'translateY(0)' }), + animate('100ms', style({ opacity: 0, transform: 'translateY(100%)' })), + ]), + ]), + ], }) export class ProjectRoleCreateComponent implements OnInit, OnDestroy { - private subscription?: Subscription; - public projectId: string = ''; + private subscription: Subscription = new Subscription(); + public projectId: string = ''; - public formArray!: FormArray; - public formGroup!: FormGroup; - public createSteps: number = 1; - public currentCreateStep: number = 1; + public formArray!: FormArray; + public formGroup: FormGroup = this.fb.group({ + key: new FormControl('', [Validators.required]), + displayName: new FormControl(''), + group: new FormControl(''), + }); + public createSteps: number = 1; + public currentCreateStep: number = 1; - constructor( - private router: Router, - private route: ActivatedRoute, - private toast: ToastService, - private mgmtService: ManagementService, - private _location: Location, - ) { - this.formGroup = new FormGroup({ - key: new FormControl('', [Validators.required]), - displayName: new FormControl(''), - group: new FormControl(''), - }); + constructor( + private router: Router, + private route: ActivatedRoute, + private toast: ToastService, + private mgmtService: ManagementService, + private fb: FormBuilder, + private _location: Location, + ) { + this.formArray = new FormArray([this.formGroup]); + } - this.formArray = new FormArray([this.formGroup]); - } + public addEntry(): void { + const newGroup = this.fb.group({ + key: new FormControl('', [Validators.required]), + displayName: new FormControl(''), + group: new FormControl(''), + }); - public addEntry(): void { - const newGroup = new FormGroup({ - key: new FormControl('', [Validators.required]), - displayName: new FormControl(''), - group: new FormControl(''), - }); + this.formArray.push(newGroup); + } - this.formArray.push(newGroup); - } + public removeEntry(index: number): void { + this.formArray.removeAt(index); + } - public removeEntry(index: number): void { - this.formArray.removeAt(index); - } + public ngOnInit(): void { + this.subscription = this.route.params.subscribe(params => this.getData(params)); + } - public ngOnInit(): void { - this.subscription = this.route.params.subscribe(params => this.getData(params)); - } + public ngOnDestroy(): void { + this.subscription.unsubscribe(); + } - public ngOnDestroy(): void { - this.subscription?.unsubscribe(); - } + private getData({ projectid }: Params): void { + this.projectId = projectid; + } - private getData({ projectid }: Params): void { - this.projectId = projectid; - } + public addRole(): void { + const rolesToAdd: BulkAddProjectRolesRequest.Role[] = this.formArray.value.map((element: any) => { + const role = new BulkAddProjectRolesRequest.Role; + role.setKey(element.key); + role.setDisplayName(element.displayName); + role.setGroup(element.group); + return role; + }); - public addRole(): void { - const rolesToAdd: BulkAddProjectRolesRequest.Role[] = this.formArray.value.map((element: any) => { - const role = new BulkAddProjectRolesRequest.Role; - role.setKey(element.key); - role.setDisplayName(element.displayName); - role.setGroup(element.group); - return role; - }); - - this.mgmtService.bulkAddProjectRoles(this.projectId, rolesToAdd).then(() => { - this.router.navigate(['projects', this.projectId]); - }).catch(error => { - this.toast.showError(error); - }); - } + this.mgmtService.bulkAddProjectRoles(this.projectId, rolesToAdd).then(() => { + this.router.navigate(['projects', this.projectId]); + }).catch(error => { + this.toast.showError(error); + }); + } - public close(): void { - this._location.back(); - } + public close(): void { + this._location.back(); + } } diff --git a/console/src/app/pages/signedout/signedout.component.ts b/console/src/app/pages/signedout/signedout.component.ts index 60ba502626..c475679d5a 100644 --- a/console/src/app/pages/signedout/signedout.component.ts +++ b/console/src/app/pages/signedout/signedout.component.ts @@ -1,15 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-signedout', - templateUrl: './signedout.component.html', - styleUrls: ['./signedout.component.scss'], + selector: 'cnsl-signedout', + templateUrl: './signedout.component.html', + styleUrls: ['./signedout.component.scss'], }) export class SignedoutComponent { - public dark: boolean = true; + public dark: boolean = true; - constructor() { - const theme = localStorage.getItem('theme'); - this.dark = theme === 'dark-theme' ? true : theme === 'light-theme' ? false : true; - } + constructor() { + const theme = localStorage.getItem('theme'); + this.dark = theme === 'dark-theme' ? true : theme === 'light-theme' ? false : true; + } } diff --git a/console/src/app/pages/user-grant-create/user-grant-create.component.html b/console/src/app/pages/user-grant-create/user-grant-create.component.html index 78d8e5c607..04ae0af4f6 100644 --- a/console/src/app/pages/user-grant-create/user-grant-create.component.html +++ b/console/src/app/pages/user-grant-create/user-grant-create.component.html @@ -19,18 +19,18 @@

    {{'PROJECT.GRANT.CREATE.SEL_USER' | translate}}

    - - +     - +

    {{'PROJECT.GRANT.CREATE.SEL_PROJECT' | translate}}

    - - +     @@ -38,10 +38,10 @@

    {{'PROJECT.GRANT.CREATE.SEL_ROLES' | translate}}

    - - - - + + + + @@ -31,4 +31,4 @@ translate }}
    - \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/pages/users/user-create-machine/user-create-machine.component.ts b/console/src/app/pages/users/user-create-machine/user-create-machine.component.ts index 29fe7e2b1e..b5113cfae6 100644 --- a/console/src/app/pages/users/user-create-machine/user-create-machine.component.ts +++ b/console/src/app/pages/users/user-create-machine/user-create-machine.component.ts @@ -7,76 +7,76 @@ import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-user-create-machine', - templateUrl: './user-create-machine.component.html', - styleUrls: ['./user-create-machine.component.scss'], + selector: 'cnsl-user-create-machine', + templateUrl: './user-create-machine.component.html', + styleUrls: ['./user-create-machine.component.scss'], }) export class UserCreateMachineComponent implements OnDestroy { - public user: AddMachineUserRequest.AsObject = new AddMachineUserRequest().toObject(); - public userForm!: FormGroup; + public user: AddMachineUserRequest.AsObject = new AddMachineUserRequest().toObject(); + public userForm!: FormGroup; - private sub: Subscription = new Subscription(); - public loading: boolean = false; + private sub: Subscription = new Subscription(); + public loading: boolean = false; - constructor( - private router: Router, - private toast: ToastService, - public userService: ManagementService, - private fb: FormBuilder, - ) { - this.initForm(); - } + constructor( + private router: Router, + private toast: ToastService, + public userService: ManagementService, + private fb: FormBuilder, + ) { + this.initForm(); + } - private initForm(): void { - this.userForm = this.fb.group({ - userName: ['', - [ - Validators.required, - Validators.minLength(2), - ], - ], - name: ['', [Validators.required]], - description: ['', []], - }); - } + private initForm(): void { + this.userForm = this.fb.group({ + userName: ['', + [ + Validators.required, + Validators.minLength(2), + ], + ], + name: ['', [Validators.required]], + description: ['', []], + }); + } - public createUser(): void { - this.user = this.userForm.value; + public createUser(): void { + this.user = this.userForm.value; - this.loading = true; + this.loading = true; - const machineReq = new AddMachineUserRequest(); - machineReq.setDescription(this.description?.value); - machineReq.setName(this.name?.value); - machineReq.setUserName(this.userName?.value); + const machineReq = new AddMachineUserRequest(); + machineReq.setDescription(this.description?.value); + machineReq.setName(this.name?.value); + machineReq.setUserName(this.userName?.value); - this.userService - .addMachineUser(machineReq) - .then((data) => { - this.loading = false; - this.toast.showInfo('USER.TOAST.CREATED', true); - const id = data.userId; - if (id) { - this.router.navigate(['users', id]); - } - }) - .catch((error: any) => { - this.loading = false; - this.toast.showError(error); - }); - } + this.userService + .addMachineUser(machineReq) + .then((data) => { + this.loading = false; + this.toast.showInfo('USER.TOAST.CREATED', true); + const id = data.userId; + if (id) { + this.router.navigate(['users', id]); + } + }) + .catch((error: any) => { + this.loading = false; + this.toast.showError(error); + }); + } - ngOnDestroy(): void { - this.sub.unsubscribe(); - } + ngOnDestroy(): void { + this.sub.unsubscribe(); + } - public get name(): AbstractControl | null { - return this.userForm.get('name'); - } - public get description(): AbstractControl | null { - return this.userForm.get('description'); - } - public get userName(): AbstractControl | null { - return this.userForm.get('userName'); - } + public get name(): AbstractControl | null { + return this.userForm.get('name'); + } + public get description(): AbstractControl | null { + return this.userForm.get('description'); + } + public get userName(): AbstractControl | null { + return this.userForm.get('userName'); + } } diff --git a/console/src/app/pages/users/user-create/user-create.component.html b/console/src/app/pages/users/user-create/user-create.component.html index 64c86a1aba..d8d96e2a20 100644 --- a/console/src/app/pages/users/user-create/user-create.component.html +++ b/console/src/app/pages/users/user-create/user-create.component.html @@ -1,4 +1,4 @@ - @@ -8,10 +8,10 @@ {{ 'USER.PROFILE.EMAIL' | translate }}* - + {{ 'USER.VALIDATION.NOTANEMAIL' | translate }} - + {{ 'USER.VALIDATION.REQUIRED' | translate }} @@ -21,10 +21,10 @@ [ngStyle]="{'padding-right': suffixPadding ? suffixPadding : '10px'}" /> {{envSuffixLabel}} - + {{ 'USER.VALIDATION.REQUIRED' | translate }} - + {{ 'USER.VALIDATION.NOEMAIL' | translate }} @@ -33,21 +33,21 @@ {{ 'USER.PROFILE.FIRSTNAME' | translate }}* - + {{ 'USER.VALIDATION.REQUIRED' | translate }} {{ 'USER.PROFILE.LASTNAME' | translate }}* - + {{ 'USER.VALIDATION.REQUIRED' | translate }} {{ 'USER.PROFILE.NICKNAME' | translate }} - + {{ 'USER.VALIDATION.REQUIRED' | translate }} @@ -61,7 +61,7 @@ {{ 'GENDERS.'+gender | translate }} - + {{ 'USER.VALIDATION.REQUIRED' | translate }} @@ -71,7 +71,7 @@ {{ 'LANGUAGES.'+language | translate }} - + {{ 'USER.VALIDATION.REQUIRED' | translate }} @@ -82,7 +82,7 @@ {{ 'USER.PROFILE.PHONE' | translate }} - + {{ 'USER.VALIDATION.REQUIRED' | translate }} @@ -92,4 +92,4 @@ translate }}
    - \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/pages/users/user-create/user-create.component.ts b/console/src/app/pages/users/user-create/user-create.component.ts index 4749b4a0b6..eda426dadc 100644 --- a/console/src/app/pages/users/user-create/user-create.component.ts +++ b/console/src/app/pages/users/user-create/user-create.component.ts @@ -11,165 +11,167 @@ import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ - selector: 'app-user-create', - templateUrl: './user-create.component.html', - styleUrls: ['./user-create.component.scss'], + selector: 'cnsl-user-create', + templateUrl: './user-create.component.html', + styleUrls: ['./user-create.component.scss'], }) export class UserCreateComponent implements OnDestroy { - public user: AddHumanUserRequest.AsObject = new AddHumanUserRequest().toObject(); - public genders: Gender[] = [Gender.GENDER_FEMALE, Gender.GENDER_MALE, Gender.GENDER_UNSPECIFIED]; - public languages: string[] = ['de', 'en']; - public userForm!: FormGroup; - public envSuffixLabel: string = ''; - private destroyed$: Subject = new Subject(); + public user: AddHumanUserRequest.AsObject = new AddHumanUserRequest().toObject(); + public genders: Gender[] = [Gender.GENDER_FEMALE, Gender.GENDER_MALE, Gender.GENDER_UNSPECIFIED]; + public languages: string[] = ['de', 'en']; + public userForm!: FormGroup; + public envSuffixLabel: string = ''; + private destroyed$: Subject = new Subject(); - public userLoginMustBeDomain: boolean = false; - public loading: boolean = false; + public userLoginMustBeDomain: boolean = false; + public loading: boolean = false; - @ViewChild('suffix') public suffix!: any; - private primaryDomain!: Domain.AsObject; + @ViewChild('suffix') public suffix!: any; + private primaryDomain!: Domain.AsObject; - constructor( - private router: Router, - private toast: ToastService, - private fb: FormBuilder, - private mgmtService: ManagementService, - private changeDetRef: ChangeDetectorRef, - ) { - this.loading = true; - this.loadOrg(); - this.mgmtService.getOrgIAMPolicy().then((resp) => { - if (resp.policy?.userLoginMustBeDomain) { - this.userLoginMustBeDomain = resp.policy.userLoginMustBeDomain; - } - this.initForm(); - this.loading = false; - this.envSuffixLabel = this.envSuffix(); - this.changeDetRef.detectChanges(); - }).catch(error => { - console.error(error); - this.initForm(); - this.loading = false; - this.envSuffixLabel = this.envSuffix(); - this.changeDetRef.detectChanges(); - }); + constructor( + private router: Router, + private toast: ToastService, + private fb: FormBuilder, + private mgmtService: ManagementService, + private changeDetRef: ChangeDetectorRef, + ) { + this.loading = true; + this.loadOrg(); + this.mgmtService.getOrgIAMPolicy().then((resp) => { + if (resp.policy?.userLoginMustBeDomain) { + this.userLoginMustBeDomain = resp.policy.userLoginMustBeDomain; + } + this.initForm(); + this.loading = false; + this.envSuffixLabel = this.envSuffix(); + this.changeDetRef.detectChanges(); + }).catch(error => { + console.error(error); + this.initForm(); + this.loading = false; + this.envSuffixLabel = this.envSuffix(); + this.changeDetRef.detectChanges(); + }); + } + + private async loadOrg(): Promise { + const domains = (await this.mgmtService.listOrgDomains()); + const found = domains.resultList.find(resp => resp.isPrimary); + if (found) { + this.primaryDomain = found; } + } - private async loadOrg(): Promise { - const domains = (await this.mgmtService.listOrgDomains()); - const found = domains.resultList.find(resp => resp.isPrimary); - if (found) { - this.primaryDomain = found; + private initForm(): void { + this.userForm = this.fb.group({ + email: ['', [Validators.required, Validators.email]], + userName: ['', + [ + Validators.required, + Validators.minLength(2), + ], + ], + firstName: ['', Validators.required], + lastName: ['', Validators.required], + nickName: [''], + gender: [], + preferredLanguage: [''], + phone: [''], + }); + + this.userForm.controls['phone'].valueChanges.pipe( + takeUntil(this.destroyed$), + debounceTime(300)).subscribe(value => { + const phoneNumber = parsePhoneNumber(value ?? '', 'CH'); + if (phoneNumber) { + const formmatted = phoneNumber.formatInternational(); + const country = phoneNumber.country; + if (this.phone && country && this.phone.value && this.phone.value !== formmatted) { + this.phone.setValue(formmatted); + } } + }); + } + + public createUser(): void { + this.user = this.userForm.value; + + this.loading = true; + + const profileReq = new AddHumanUserRequest.Profile(); + profileReq.setFirstName(this.firstName?.value); + profileReq.setLastName(this.lastName?.value); + profileReq.setNickName(this.nickName?.value); + profileReq.setPreferredLanguage(this.preferredLanguage?.value); + profileReq.setGender(this.gender?.value); + + const humanReq = new AddHumanUserRequest(); + humanReq.setUserName(this.userName?.value); + humanReq.setProfile(profileReq); + + humanReq.setEmail(new AddHumanUserRequest.Email().setEmail(this.email?.value)); + + if (this.phone && this.phone.value) { + humanReq.setPhone(new AddHumanUserRequest.Phone().setPhone(this.phone.value)); } - private initForm(): void { - this.userForm = this.fb.group({ - email: ['', [Validators.required, Validators.email]], - userName: ['', - [ - Validators.required, - Validators.minLength(2), - ], - ], - firstName: ['', Validators.required], - lastName: ['', Validators.required], - nickName: [''], - gender: [], - preferredLanguage: [''], - phone: [''], - }); + this.mgmtService + .addHumanUser(humanReq) + .then((data) => { + this.loading = false; + this.toast.showInfo('USER.TOAST.CREATED', true); + this.router.navigate(['users', data.userId]); + }) + .catch(error => { + this.loading = false; + this.toast.showError(error); + }); + } - this.userForm.controls['phone'].valueChanges.pipe( - takeUntil(this.destroyed$), - debounceTime(300)).subscribe(value => { - const phoneNumber = parsePhoneNumber(value ?? '', 'CH'); - if (phoneNumber) { - const formmatted = phoneNumber.formatInternational(); - const country = phoneNumber.country; - if (this.phone && country && this.phone.value && this.phone.value !== formmatted) { - this.phone.setValue(formmatted); - } - } - }); - } + ngOnDestroy(): void { + this.destroyed$.next(); + this.destroyed$.complete(); + } - public createUser(): void { - this.user = this.userForm.value; + public get email(): AbstractControl | null { + return this.userForm.get('email'); + } + public get userName(): AbstractControl | null { + return this.userForm.get('userName'); + } + public get firstName(): AbstractControl | null { + return this.userForm.get('firstName'); + } + public get lastName(): AbstractControl | null { + return this.userForm.get('lastName'); + } + public get nickName(): AbstractControl | null { + return this.userForm.get('nickName'); + } + public get gender(): AbstractControl | null { + return this.userForm.get('gender'); + } + public get preferredLanguage(): AbstractControl | null { + return this.userForm.get('preferredLanguage'); + } + public get phone(): AbstractControl | null { + return this.userForm.get('phone'); + } - this.loading = true; + private envSuffix(): string { + if (this.userLoginMustBeDomain && this.primaryDomain?.domainName) { + return `@${this.primaryDomain.domainName}`; + } else { + return ''; + } + } - const profileReq = new AddHumanUserRequest.Profile(); - profileReq.setFirstName(this.firstName?.value); - profileReq.setLastName(this.lastName?.value); - profileReq.setNickName(this.nickName?.value); - profileReq.setPreferredLanguage(this.preferredLanguage?.value); - profileReq.setGender(this.gender?.value); - - const humanReq = new AddHumanUserRequest(); - humanReq.setUserName(this.userName?.value); - humanReq.setProfile(profileReq); - - humanReq.setEmail(new AddHumanUserRequest.Email().setEmail(this.email?.value)); - - if (this.phone && this.phone.value) { - humanReq.setPhone(new AddHumanUserRequest.Phone().setPhone(this.phone.value)); - } - - this.mgmtService - .addHumanUser(humanReq) - .then((data) => { - this.loading = false; - this.toast.showInfo('USER.TOAST.CREATED', true); - this.router.navigate(['users', data.userId]); - }) - .catch(error => { - this.loading = false; - this.toast.showError(error); - }); - } - - ngOnDestroy(): void { - this.destroyed$.next(); - this.destroyed$.complete(); - } - - public get email(): AbstractControl | null { - return this.userForm.get('email'); - } - public get userName(): AbstractControl | null { - return this.userForm.get('userName'); - } - public get firstName(): AbstractControl | null { - return this.userForm.get('firstName'); - } - public get lastName(): AbstractControl | null { - return this.userForm.get('lastName'); - } - public get nickName(): AbstractControl | null { - return this.userForm.get('nickName'); - } - public get gender(): AbstractControl | null { - return this.userForm.get('gender'); - } - public get preferredLanguage(): AbstractControl | null { - return this.userForm.get('preferredLanguage'); - } - public get phone(): AbstractControl | null { - return this.userForm.get('phone'); - } - - private envSuffix(): string { - if (this.userLoginMustBeDomain && this.primaryDomain?.domainName) { - return `@${this.primaryDomain.domainName}`; - } else { - return ''; - } - } - - public get suffixPadding(): string | undefined { - if (this.suffix?.nativeElement.offsetWidth) { - return `${(this.suffix.nativeElement as HTMLElement).offsetWidth + 10}px`; - } + public get suffixPadding(): string | undefined { + if (this.suffix?.nativeElement.offsetWidth) { + return `${(this.suffix.nativeElement as HTMLElement).offsetWidth + 10}px`; + } else { + return; } + } } diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/auth-factor-dialog/auth-factor-dialog.component.html b/console/src/app/pages/users/user-detail/auth-user-detail/auth-factor-dialog/auth-factor-dialog.component.html index 11b9093063..88291e7be2 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/auth-factor-dialog/auth-factor-dialog.component.html +++ b/console/src/app/pages/users/user-detail/auth-user-detail/auth-factor-dialog/auth-factor-dialog.component.html @@ -2,7 +2,7 @@ {{'USER.MFA.DIALOG.ADD_MFA_TITLE' | translate}} {{data?.number}}
    - +

    {{'USER.MFA.DIALOG.ADD_MFA_DESCRIPTION' | translate}}

    @@ -25,7 +25,7 @@
    -
    +

    {{'USER.MFA.OTP_DIALOG_DESCRIPTION' | translate}}

    @@ -38,7 +38,7 @@
    -
    +

    {{'USER.MFA.U2F_DIALOG_DESCRIPTION' | translate}}

    diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/auth-factor-dialog/auth-factor-dialog.component.ts b/console/src/app/pages/users/user-detail/auth-user-detail/auth-factor-dialog/auth-factor-dialog.component.ts index 8b0b5ccf19..f72c14d9a9 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/auth-factor-dialog/auth-factor-dialog.component.ts +++ b/console/src/app/pages/users/user-detail/auth-user-detail/auth-factor-dialog/auth-factor-dialog.component.ts @@ -9,133 +9,133 @@ import { _base64ToArrayBuffer } from '../../u2f-util'; import { _arrayBufferToBase64 } from '../u2f_util'; export enum AuthFactorType { - OTP, - U2F, + OTP, + U2F, } @Component({ - selector: 'app-auth-factor-dialog', - templateUrl: './auth-factor-dialog.component.html', - styleUrls: ['./auth-factor-dialog.component.scss'], + selector: 'cnsl-auth-factor-dialog', + templateUrl: './auth-factor-dialog.component.html', + styleUrls: ['./auth-factor-dialog.component.scss'], }) export class AuthFactorDialogComponent { - public otpurl: string = ''; - public otpcode: string = ''; + public otpurl: string = ''; + public otpcode: string = ''; - public u2fname: string = ''; - public u2fCredentialOptions!: CredentialCreationOptions; - public u2fLoading: boolean = false; - public u2fError: string = ''; + public u2fname: string = ''; + public u2fCredentialOptions!: CredentialCreationOptions; + public u2fLoading: boolean = false; + public u2fError: string = ''; - AuthFactorType: any = AuthFactorType; - selectedType!: AuthFactorType; - constructor( - private authService: GrpcAuthService, - private toast: ToastService, - private translate: TranslateService, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any, - ) { } + AuthFactorType: any = AuthFactorType; + selectedType!: AuthFactorType; + constructor( + private authService: GrpcAuthService, + private toast: ToastService, + private translate: TranslateService, + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any, + ) { } - closeDialog(code: string = ''): void { - this.dialogRef.close(code); - } + closeDialog(code: string = ''): void { + this.dialogRef.close(code); + } - public selectType(type: AuthFactorType): void { - this.selectedType = type; + public selectType(type: AuthFactorType): void { + this.selectedType = type; - if (type === AuthFactorType.OTP) { - this.authService.addMyMultiFactorOTP().then((otpresp) => { - this.otpurl = otpresp.url; - }, error => { - this.toast.showError(error); - }); - } else if (type === AuthFactorType.U2F) { - this.authService.addMyMultiFactorU2F().then((u2fresp) => { - if (u2fresp.key) { - const credOptions: CredentialCreationOptions = JSON.parse(atob(u2fresp.key?.publicKey as string)); + if (type === AuthFactorType.OTP) { + this.authService.addMyMultiFactorOTP().then((otpresp) => { + this.otpurl = otpresp.url; + }, error => { + this.toast.showError(error); + }); + } else if (type === AuthFactorType.U2F) { + this.authService.addMyMultiFactorU2F().then((u2fresp) => { + if (u2fresp.key) { + const credOptions: CredentialCreationOptions = JSON.parse(atob(u2fresp.key?.publicKey as string)); - if (credOptions.publicKey?.challenge) { - credOptions.publicKey.challenge = _base64ToArrayBuffer(credOptions.publicKey.challenge as any); - credOptions.publicKey.user.id = _base64ToArrayBuffer(credOptions.publicKey.user.id as any); - if (credOptions.publicKey.excludeCredentials) { - credOptions.publicKey.excludeCredentials.map(cred => { - cred.id = _base64ToArrayBuffer(cred.id as any); - return cred; - }); - } - this.u2fCredentialOptions = credOptions; - } - } - }, error => { - this.toast.showError(error); - }); + if (credOptions.publicKey?.challenge) { + credOptions.publicKey.challenge = _base64ToArrayBuffer(credOptions.publicKey.challenge as any); + credOptions.publicKey.user.id = _base64ToArrayBuffer(credOptions.publicKey.user.id as any); + if (credOptions.publicKey.excludeCredentials) { + credOptions.publicKey.excludeCredentials.map(cred => { + cred.id = _base64ToArrayBuffer(cred.id as any); + return cred; + }); + } + this.u2fCredentialOptions = credOptions; + } } + }, error => { + this.toast.showError(error); + }); } + } - public submitAuth(): void { - if (this.selectedType === AuthFactorType.OTP) { - this.submitOTP(); - } else if (this.selectedType === AuthFactorType.U2F) { - this.submitU2F(); - } + public submitAuth(): void { + if (this.selectedType === AuthFactorType.OTP) { + this.submitOTP(); + } else if (this.selectedType === AuthFactorType.U2F) { + this.submitU2F(); } + } - public submitOTP(): void { - this.authService.verifyMyMultiFactorOTP(this.otpcode).then(() => { + public submitOTP(): void { + this.authService.verifyMyMultiFactorOTP(this.otpcode).then(() => { + this.dialogRef.close(true); + }, error => { + this.dialogRef.close(false); + }); + } + + public submitU2F(): void { + if (this.u2fname && this.u2fCredentialOptions.publicKey) { + // this.data.credOptions.publicKey.rp.id = 'localhost'; + navigator.credentials.create(this.u2fCredentialOptions).then((resp) => { + if (resp && + (resp as any).response.attestationObject && + (resp as any).response.clientDataJSON && + (resp as any).rawId) { + + const attestationObject = (resp as any).response.attestationObject; + const clientDataJSON = (resp as any).response.clientDataJSON; + const rawId = (resp as any).rawId; + + const data = JSON.stringify({ + id: resp.id, + rawId: _arrayBufferToBase64(rawId), + type: resp.type, + response: { + attestationObject: _arrayBufferToBase64(attestationObject), + clientDataJSON: _arrayBufferToBase64(clientDataJSON), + }, + }); + + const base64 = btoa(data); + + this.authService.verifyMyMultiFactorU2F(base64, this.u2fname).then(() => { + this.translate.get('USER.MFA.U2F_SUCCESS').pipe(take(1)).subscribe(msg => { + this.toast.showInfo(msg); + }); this.dialogRef.close(true); - }, error => { - this.dialogRef.close(false); - }); - } - - public submitU2F(): void { - if (this.u2fname && this.u2fCredentialOptions.publicKey) { - // this.data.credOptions.publicKey.rp.id = 'localhost'; - navigator.credentials.create(this.u2fCredentialOptions).then((resp) => { - if (resp && - (resp as any).response.attestationObject && - (resp as any).response.clientDataJSON && - (resp as any).rawId) { - - const attestationObject = (resp as any).response.attestationObject; - const clientDataJSON = (resp as any).response.clientDataJSON; - const rawId = (resp as any).rawId; - - const data = JSON.stringify({ - id: resp.id, - rawId: _arrayBufferToBase64(rawId), - type: resp.type, - response: { - attestationObject: _arrayBufferToBase64(attestationObject), - clientDataJSON: _arrayBufferToBase64(clientDataJSON), - }, - }); - - const base64 = btoa(data); - - this.authService.verifyMyMultiFactorU2F(base64, this.u2fname).then(() => { - this.translate.get('USER.MFA.U2F_SUCCESS').pipe(take(1)).subscribe(msg => { - this.toast.showInfo(msg); - }); - this.dialogRef.close(true); - this.u2fLoading = false; - }).catch(error => { - this.u2fLoading = false; - this.toast.showError(error); - }); - } else { - this.u2fLoading = false; - this.translate.get('USER.MFA.U2F_ERROR').pipe(take(1)).subscribe(msg => { - this.toast.showInfo(msg); - }); - this.dialogRef.close(true); - } - }).catch(error => { - this.u2fLoading = false; - this.u2fError = error; - this.toast.showInfo(error.message); - }); + this.u2fLoading = false; + }).catch(error => { + this.u2fLoading = false; + this.toast.showError(error); + }); + } else { + this.u2fLoading = false; + this.translate.get('USER.MFA.U2F_ERROR').pipe(take(1)).subscribe(msg => { + this.toast.showInfo(msg); + }); + this.dialogRef.close(true); } + }).catch(error => { + this.u2fLoading = false; + this.u2fError = error; + this.toast.showInfo(error.message); + }); } + } } diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/auth-passwordless/auth-passwordless.component.html b/console/src/app/pages/users/user-detail/auth-user-detail/auth-passwordless/auth-passwordless.component.html index 9897534651..0da43c1339 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/auth-passwordless/auth-passwordless.component.html +++ b/console/src/app/pages/users/user-detail/auth-user-detail/auth-passwordless/auth-passwordless.component.html @@ -1,10 +1,10 @@ - - + @@ -37,7 +37,7 @@
    {{ 'USER.PASSWORDLESS.NAME' | translate }}
    -     +
    - \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/auth-passwordless/auth-passwordless.component.ts b/console/src/app/pages/users/user-detail/auth-user-detail/auth-passwordless/auth-passwordless.component.ts index fa480f36e9..698d9f401b 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/auth-passwordless/auth-passwordless.component.ts +++ b/console/src/app/pages/users/user-detail/auth-user-detail/auth-passwordless/auth-passwordless.component.ts @@ -23,7 +23,7 @@ export interface WebAuthNOptions { } @Component({ - selector: 'app-auth-passwordless', + selector: 'cnsl-auth-passwordless', templateUrl: './auth-passwordless.component.html', styleUrls: ['./auth-passwordless.component.scss'], }) diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/auth-passwordless/dialog-passwordless/dialog-passwordless.component.ts b/console/src/app/pages/users/user-detail/auth-user-detail/auth-passwordless/dialog-passwordless/dialog-passwordless.component.ts index d1994f7500..011e739e77 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/auth-passwordless/dialog-passwordless/dialog-passwordless.component.ts +++ b/console/src/app/pages/users/user-detail/auth-user-detail/auth-passwordless/dialog-passwordless/dialog-passwordless.component.ts @@ -13,7 +13,7 @@ export enum U2FComponentDestination { } @Component({ - selector: 'app-dialog-passwordless', + selector: 'cnsl-dialog-passwordless', templateUrl: './dialog-passwordless.component.html', styleUrls: ['./dialog-passwordless.component.scss'], }) diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.html b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.html index ff14e45fe1..b6377906fd 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.html +++ b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.html @@ -1,4 +1,4 @@ - +
    @@ -7,7 +7,7 @@
    - +
    @@ -16,40 +16,40 @@ - - + - - + + - - - - + + - + - + - + - - - - + [disableWrite]="((['user.grant.write$'] | hasRole) | async) === false" + [disableDelete]="((['user.grant.delete$'] | hasRole) | async) === false"> + + - +
    @@ -65,18 +65,18 @@ {{user.preferredLoginName}}
    - +
    - - + +
    - - + +
    - \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.ts b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.ts index 51c7f19bab..dc2b9a1ef7 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.ts +++ b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.ts @@ -11,7 +11,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { EditDialogComponent, EditDialogType } from './edit-dialog/edit-dialog.component'; @Component({ - selector: 'app-auth-user-detail', + selector: 'cnsl-auth-user-detail', templateUrl: './auth-user-detail.component.html', styleUrls: ['./auth-user-detail.component.scss'], }) diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-mfa/auth-user-mfa.component.html b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-mfa/auth-user-mfa.component.html index 87b826830d..d2f0645bac 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-mfa/auth-user-mfa.component.html +++ b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-mfa/auth-user-mfa.component.html @@ -1,8 +1,8 @@ - + - + @@ -44,7 +44,7 @@
    {{ 'USER.MFA.TABLETYPE' | translate }}
    -     +
    - \ No newline at end of file + \ No newline at end of file diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-mfa/auth-user-mfa.component.ts b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-mfa/auth-user-mfa.component.ts index e2fdfe6add..f9f9e03279 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-mfa/auth-user-mfa.component.ts +++ b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-mfa/auth-user-mfa.component.ts @@ -11,121 +11,121 @@ import { ToastService } from 'src/app/services/toast.service'; import { AuthFactorDialogComponent } from '../auth-factor-dialog/auth-factor-dialog.component'; export interface WebAuthNOptions { - challenge: string; - rp: { name: string, id: string; }; - user: { name: string, id: string, displayName: string; }; - pubKeyCredParams: any; - authenticatorSelection: { userVerification: string; }; - timeout: number; - attestation: string; + challenge: string; + rp: { name: string, id: string; }; + user: { name: string, id: string, displayName: string; }; + pubKeyCredParams: any; + authenticatorSelection: { userVerification: string; }; + timeout: number; + attestation: string; } @Component({ - selector: 'app-auth-user-mfa', - templateUrl: './auth-user-mfa.component.html', - styleUrls: ['./auth-user-mfa.component.scss'], + selector: 'cnsl-auth-user-mfa', + templateUrl: './auth-user-mfa.component.html', + styleUrls: ['./auth-user-mfa.component.scss'], }) export class AuthUserMfaComponent implements OnInit, OnDestroy { - public displayedColumns: string[] = ['type', 'name', 'state', 'actions']; - private loadingSubject: BehaviorSubject = new BehaviorSubject(false); - public loading$: Observable = this.loadingSubject.asObservable(); + public displayedColumns: string[] = ['type', 'name', 'state', 'actions']; + private loadingSubject: BehaviorSubject = new BehaviorSubject(false); + public loading$: Observable = this.loadingSubject.asObservable(); - @ViewChild(MatTable) public table!: MatTable; - @ViewChild(MatSort) public sort!: MatSort; - public dataSource!: MatTableDataSource; + @ViewChild(MatTable) public table!: MatTable; + @ViewChild(MatSort) public sort!: MatSort; + public dataSource!: MatTableDataSource; - public AuthFactorState: any = AuthFactorState; + public AuthFactorState: any = AuthFactorState; - public error: string = ''; - public otpAvailable: boolean = false; + public error: string = ''; + public otpAvailable: boolean = false; - constructor( - private service: GrpcAuthService, - private toast: ToastService, - private dialog: MatDialog, - ) { } + constructor( + private service: GrpcAuthService, + private toast: ToastService, + private dialog: MatDialog, + ) { } - public ngOnInit(): void { - this.getMFAs(); - } + public ngOnInit(): void { + this.getMFAs(); + } - public ngOnDestroy(): void { - this.loadingSubject.complete(); - } + public ngOnDestroy(): void { + this.loadingSubject.complete(); + } - public addAuthFactor(): void { - const dialogRef = this.dialog.open(AuthFactorDialogComponent, { - data: { - otpDisabled: !this.otpAvailable, - }, + public addAuthFactor(): void { + const dialogRef = this.dialog.open(AuthFactorDialogComponent, { + data: { + otpDisabled: !this.otpAvailable, + }, + }); + + dialogRef.afterClosed().subscribe((code) => { + if (code) { + this.service.verifyMyMultiFactorOTP(code).then(() => { + this.getMFAs(); }); + } + }); + } - dialogRef.afterClosed().subscribe((code) => { - if (code) { - this.service.verifyMyMultiFactorOTP(code).then(() => { - this.getMFAs(); - }); + public getMFAs(): void { + this.service.listMyMultiFactors().then(mfas => { + const list = mfas.resultList; + this.dataSource = new MatTableDataSource(list); + this.dataSource.sort = this.sort; + + const index = list.findIndex(mfa => mfa.otp); + if (index === -1) { + this.otpAvailable = true; + } + }).catch(error => { + this.error = error.message; + }); + } + + public deleteMFA(factor: AuthFactor.AsObject): void { + const dialogRef = this.dialog.open(WarnDialogComponent, { + data: { + confirmKey: 'ACTIONS.DELETE', + cancelKey: 'ACTIONS.CANCEL', + titleKey: 'USER.MFA.DIALOG.MFA_DELETE_TITLE', + descriptionKey: 'USER.MFA.DIALOG.MFA_DELETE_DESCRIPTION', + }, + width: '400px', + }); + + dialogRef.afterClosed().subscribe(resp => { + if (resp) { + if (factor.otp) { + this.service.removeMyMultiFactorOTP().then(() => { + this.toast.showInfo('USER.TOAST.OTPREMOVED', true); + + const index = this.dataSource.data.findIndex(mfa => !!mfa.otp); + if (index > -1) { + this.dataSource.data.splice(index, 1); } - }); - } + this.getMFAs(); + }).catch(error => { + this.toast.showError(error); + }); + } else + if (factor.u2f) { + this.service.removeMyMultiFactorU2F(factor.u2f.id).then(() => { + this.toast.showInfo('USER.TOAST.U2FREMOVED', true); - public getMFAs(): void { - this.service.listMyMultiFactors().then(mfas => { - const list = mfas.resultList; - this.dataSource = new MatTableDataSource(list); - this.dataSource.sort = this.sort; - - const index = list.findIndex(mfa => mfa.otp); - if (index === -1) { - this.otpAvailable = true; - } - }).catch(error => { - this.error = error.message; - }); - } - - public deleteMFA(factor: AuthFactor.AsObject): void { - const dialogRef = this.dialog.open(WarnDialogComponent, { - data: { - confirmKey: 'ACTIONS.DELETE', - cancelKey: 'ACTIONS.CANCEL', - titleKey: 'USER.MFA.DIALOG.MFA_DELETE_TITLE', - descriptionKey: 'USER.MFA.DIALOG.MFA_DELETE_DESCRIPTION', - }, - width: '400px', - }); - - dialogRef.afterClosed().subscribe(resp => { - if (resp) { - if (factor.otp) { - this.service.removeMyMultiFactorOTP().then(() => { - this.toast.showInfo('USER.TOAST.OTPREMOVED', true); - - const index = this.dataSource.data.findIndex(mfa => !!mfa.otp); - if (index > -1) { - this.dataSource.data.splice(index, 1); - } - this.getMFAs(); - }).catch(error => { - this.toast.showError(error); - }); - } else - if (factor.u2f) { - this.service.removeMyMultiFactorU2F(factor.u2f.id).then(() => { - this.toast.showInfo('USER.TOAST.U2FREMOVED', true); - - const index = this.dataSource.data.findIndex(mfa => !!mfa.u2f); - if (index > -1) { - this.dataSource.data.splice(index, 1); - } - this.getMFAs(); - }).catch(error => { - this.toast.showError(error); - }); - } - } - }); - } + const index = this.dataSource.data.findIndex(mfa => !!mfa.u2f); + if (index > -1) { + this.dataSource.data.splice(index, 1); + } + this.getMFAs(); + }).catch(error => { + this.toast.showError(error); + }); + } + } + }); + } } diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/code-dialog/code-dialog.component.ts b/console/src/app/pages/users/user-detail/auth-user-detail/code-dialog/code-dialog.component.ts index 6fee531c27..7595c09eb9 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/code-dialog/code-dialog.component.ts +++ b/console/src/app/pages/users/user-detail/auth-user-detail/code-dialog/code-dialog.component.ts @@ -2,17 +2,17 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ - selector: 'app-code-dialog', - templateUrl: './code-dialog.component.html', - styleUrls: ['./code-dialog.component.scss'], + selector: 'cnsl-code-dialog', + templateUrl: './code-dialog.component.html', + styleUrls: ['./code-dialog.component.scss'], }) export class CodeDialogComponent { - public code: string = ''; - constructor(public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any) { } + public code: string = ''; + constructor(public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any) { } - closeDialog(code: string = ''): void { - this.dialogRef.close(code); - } + closeDialog(code: string = ''): void { + this.dialogRef.close(code); + } } diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/dialog-u2f/dialog-u2f.component.ts b/console/src/app/pages/users/user-detail/auth-user-detail/dialog-u2f/dialog-u2f.component.ts index 6974150e59..2ee8b8dbaa 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/dialog-u2f/dialog-u2f.component.ts +++ b/console/src/app/pages/users/user-detail/auth-user-detail/dialog-u2f/dialog-u2f.component.ts @@ -8,93 +8,93 @@ import { ToastService } from 'src/app/services/toast.service'; import { _arrayBufferToBase64 } from '../u2f_util'; export enum U2FComponentDestination { - MFA = 'mfa', - PASSWORDLESS = 'passwordless', + MFA = 'mfa', + PASSWORDLESS = 'passwordless', } @Component({ - selector: 'app-dialog-u2f', - templateUrl: './dialog-u2f.component.html', - styleUrls: ['./dialog-u2f.component.scss'], + selector: 'cnsl-dialog-u2f', + templateUrl: './dialog-u2f.component.html', + styleUrls: ['./dialog-u2f.component.scss'], }) export class DialogU2FComponent { - private type!: U2FComponentDestination; - public name: string = ''; - public error: string = ''; - public loading: boolean = false; + private type!: U2FComponentDestination; + public name: string = ''; + public error: string = ''; + public loading: boolean = false; - constructor(public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: { credOptions: any; type: U2FComponentDestination; }, - private service: GrpcAuthService, private translate: TranslateService, private toast: ToastService) { - this.type = data.type; - } + constructor(public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: { credOptions: any; type: U2FComponentDestination; }, + private service: GrpcAuthService, private translate: TranslateService, private toast: ToastService) { + this.type = data.type; + } - public closeDialog(): void { - this.dialogRef.close(); - } + public closeDialog(): void { + this.dialogRef.close(); + } - public closeDialogWithCode(): void { - this.error = ''; - this.loading = true; - if (this.name && this.data.credOptions.publicKey) { - // this.data.credOptions.publicKey.rp.id = 'localhost'; - navigator.credentials.create(this.data.credOptions).then((resp) => { - if (resp && - (resp as any).response.attestationObject && - (resp as any).response.clientDataJSON && - (resp as any).rawId) { + public closeDialogWithCode(): void { + this.error = ''; + this.loading = true; + if (this.name && this.data.credOptions.publicKey) { + // this.data.credOptions.publicKey.rp.id = 'localhost'; + navigator.credentials.create(this.data.credOptions).then((resp) => { + if (resp && + (resp as any).response.attestationObject && + (resp as any).response.clientDataJSON && + (resp as any).rawId) { - const attestationObject = (resp as any).response.attestationObject; - const clientDataJSON = (resp as any).response.clientDataJSON; - const rawId = (resp as any).rawId; + const attestationObject = (resp as any).response.attestationObject; + const clientDataJSON = (resp as any).response.clientDataJSON; + const rawId = (resp as any).rawId; - const data = JSON.stringify({ - id: resp.id, - rawId: _arrayBufferToBase64(rawId), - type: resp.type, - response: { - attestationObject: _arrayBufferToBase64(attestationObject), - clientDataJSON: _arrayBufferToBase64(clientDataJSON), - }, - }); + const data = JSON.stringify({ + id: resp.id, + rawId: _arrayBufferToBase64(rawId), + type: resp.type, + response: { + attestationObject: _arrayBufferToBase64(attestationObject), + clientDataJSON: _arrayBufferToBase64(clientDataJSON), + }, + }); - const base64 = btoa(data); - if (this.type === U2FComponentDestination.MFA) { - this.service.verifyMyMultiFactorU2F(base64, this.name).then(() => { - this.translate.get('USER.MFA.U2F_SUCCESS').pipe(take(1)).subscribe(msg => { - this.toast.showInfo(msg); - }); - this.dialogRef.close(true); - this.loading = false; - }).catch(error => { - this.loading = false; - this.toast.showError(error); - }); - } else if (this.type === U2FComponentDestination.PASSWORDLESS) { - this.service.verifyMyPasswordless(base64, this.name).then(() => { - this.translate.get('USER.PASSWORDLESS.U2F_SUCCESS').pipe(take(1)).subscribe(msg => { - this.toast.showInfo(msg); - }); - this.dialogRef.close(true); - this.loading = false; - }).catch(error => { - this.loading = false; - this.toast.showError(error); - }); - } - } else { - this.loading = false; - this.translate.get('USER.MFA.U2F_ERROR').pipe(take(1)).subscribe(msg => { - this.toast.showInfo(msg); - }); - this.dialogRef.close(true); - } + const base64 = btoa(data); + if (this.type === U2FComponentDestination.MFA) { + this.service.verifyMyMultiFactorU2F(base64, this.name).then(() => { + this.translate.get('USER.MFA.U2F_SUCCESS').pipe(take(1)).subscribe(msg => { + this.toast.showInfo(msg); + }); + this.dialogRef.close(true); + this.loading = false; }).catch(error => { - this.loading = false; - this.error = error; - this.toast.showInfo(error.message); + this.loading = false; + this.toast.showError(error); }); + } else if (this.type === U2FComponentDestination.PASSWORDLESS) { + this.service.verifyMyPasswordless(base64, this.name).then(() => { + this.translate.get('USER.PASSWORDLESS.U2F_SUCCESS').pipe(take(1)).subscribe(msg => { + this.toast.showInfo(msg); + }); + this.dialogRef.close(true); + this.loading = false; + }).catch(error => { + this.loading = false; + this.toast.showError(error); + }); + } + } else { + this.loading = false; + this.translate.get('USER.MFA.U2F_ERROR').pipe(take(1)).subscribe(msg => { + this.toast.showInfo(msg); + }); + this.dialogRef.close(true); } - + }).catch(error => { + this.loading = false; + this.error = error; + this.toast.showInfo(error.message); + }); } + + } } diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/edit-dialog/edit-dialog.component.ts b/console/src/app/pages/users/user-detail/auth-user-detail/edit-dialog/edit-dialog.component.ts index ba66f500cf..78ee1e9578 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/edit-dialog/edit-dialog.component.ts +++ b/console/src/app/pages/users/user-detail/auth-user-detail/edit-dialog/edit-dialog.component.ts @@ -4,55 +4,55 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { parsePhoneNumber } from 'libphonenumber-js'; export enum EditDialogType { - PHONE = 1, - EMAIL = 2, + PHONE = 1, + EMAIL = 2, } @Component({ - selector: 'app-edit-email-dialog', - templateUrl: './edit-dialog.component.html', - styleUrls: ['./edit-dialog.component.scss'], + selector: 'cnsl-edit-email-dialog', + templateUrl: './edit-dialog.component.html', + styleUrls: ['./edit-dialog.component.scss'], }) export class EditDialogComponent { - public isPhone: boolean = false; - public phoneCountry: string = 'CH'; - public valueControl: FormControl = new FormControl(['', [Validators.required]]); - constructor(public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any) { - this.valueControl.setValue(data.value); - if (data.type === EditDialogType.PHONE) { - this.isPhone = true; + public isPhone: boolean = false; + public phoneCountry: string = 'CH'; + public valueControl: FormControl = new FormControl(['', [Validators.required]]); + constructor(public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any) { + this.valueControl.setValue(data.value); + if (data.type === EditDialogType.PHONE) { + this.isPhone = true; + } + + this.valueControl.valueChanges.subscribe(value => { + if (value && value.length > 1) { + this.changeValue(value); + } + }); + } + + private changeValue(changedValue: string): void { + if (this.isPhone && changedValue) { + try { + const phoneNumber = parsePhoneNumber(changedValue ?? '', 'CH'); + if (phoneNumber) { + const formmatted = phoneNumber.formatInternational(); + this.phoneCountry = phoneNumber.country || ''; + if (formmatted !== this.valueControl.value) { + this.valueControl.setValue(formmatted); + } } - - this.valueControl.valueChanges.subscribe(value => { - if (value && value.length > 1) { - this.changeValue(value); - } - }); + } catch (error) { + console.error(error); + } } + } - private changeValue(changedValue: string): void { - if (this.isPhone && changedValue) { - try { - const phoneNumber = parsePhoneNumber(changedValue ?? '', 'CH'); - if (phoneNumber) { - const formmatted = phoneNumber.formatInternational(); - this.phoneCountry = phoneNumber.country || ''; - if (formmatted !== this.valueControl.value) { - this.valueControl.setValue(formmatted); - } - } - } catch (error) { - console.error(error); - } - } - } + closeDialog(): void { + this.dialogRef.close(); + } - closeDialog(): void { - this.dialogRef.close(); - } - - closeDialogWithValue(): void { - this.dialogRef.close(this.valueControl.value); - } + closeDialogWithValue(): void { + this.dialogRef.close(this.valueControl.value); + } } diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/resend-email-dialog/resend-email-dialog.component.ts b/console/src/app/pages/users/user-detail/auth-user-detail/resend-email-dialog/resend-email-dialog.component.ts index 79b560d555..fb464d5ca8 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/resend-email-dialog/resend-email-dialog.component.ts +++ b/console/src/app/pages/users/user-detail/auth-user-detail/resend-email-dialog/resend-email-dialog.component.ts @@ -2,20 +2,20 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ - selector: 'app-resend-email-dialog', - templateUrl: './resend-email-dialog.component.html', - styleUrls: ['./resend-email-dialog.component.scss'], + selector: 'cnsl-resend-email-dialog', + templateUrl: './resend-email-dialog.component.html', + styleUrls: ['./resend-email-dialog.component.scss'], }) export class ResendEmailDialogComponent { - public email: string = ''; - constructor(public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any) { } + public email: string = ''; + constructor(public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any) { } - closeDialog(email: string = ''): void { - this.dialogRef.close(email); - } + closeDialog(email: string = ''): void { + this.dialogRef.close(email); + } - closeDialogWithSend(email: string = ''): void { - this.dialogRef.close({ send: true, email }); - } + closeDialogWithSend(email: string = ''): void { + this.dialogRef.close({ send: true, email }); + } } diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/theme-setting/theme-setting.component.html b/console/src/app/pages/users/user-detail/auth-user-detail/theme-setting/theme-setting.component.html index 350dc49ff5..7be70bcdf2 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/theme-setting/theme-setting.component.html +++ b/console/src/app/pages/users/user-detail/auth-user-detail/theme-setting/theme-setting.component.html @@ -1,4 +1,4 @@ - +