diff --git a/gui/angular.json b/gui/angular.json index 21ae1513..c025901b 100644 --- a/gui/angular.json +++ b/gui/angular.json @@ -13,7 +13,7 @@ "prefix": "app", "schematics": { "@schematics/angular:component": { - "styleext": "scss" + "style": "scss" } }, "architect": { diff --git a/gui/package-lock.json b/gui/package-lock.json index 38190762..4e090591 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -1,7 +1,7 @@ { "name": "service-creation", "version": "0.0.0", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, "packages": { "": { @@ -17452,6 +17452,21 @@ "tslib": "^2.3.0" } }, + "@angular/http": { + "version": "7.2.16", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.16.tgz", + "integrity": "sha512-yvjbNyzFSmmz4UTjCdy5M8mk0cZqf9TvSf8yN5UVIwtw4joyuUdlgJCuin0qSbQOKIf/JjHoofpO2JkPCGSNww==", + "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==" + } + } + }, "@angular/language-service": { "version": "13.2.0", "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-13.2.0.tgz", @@ -17551,7 +17566,8 @@ "@babel/compat-data": { "version": "7.16.8", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz", - "integrity": "sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==" + "integrity": "sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==", + "dev": true }, "@babel/core": { "version": "7.16.12", @@ -17578,12 +17594,14 @@ "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true } } }, @@ -17627,6 +17645,7 @@ "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz", "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==", + "dev": true, "requires": { "@babel/compat-data": "^7.16.4", "@babel/helper-validator-option": "^7.16.7", @@ -17637,7 +17656,8 @@ "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true } } }, @@ -17746,6 +17766,7 @@ "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz", "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==", + "dev": true, "requires": { "@babel/types": "^7.16.7" } @@ -17754,6 +17775,7 @@ "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz", "integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==", + "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.16.7", "@babel/helper-module-imports": "^7.16.7", @@ -17763,6 +17785,19 @@ "@babel/template": "^7.16.7", "@babel/traverse": "^7.16.7", "@babel/types": "^7.16.7" + }, + "dependencies": { + "@babel/template": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz", + "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.16.7", + "@babel/parser": "^7.16.7", + "@babel/types": "^7.16.7" + } + } } }, "@babel/helper-optimise-call-expression": { @@ -17808,6 +17843,7 @@ "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz", "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==", + "dev": true, "requires": { "@babel/types": "^7.16.7" } @@ -17837,7 +17873,8 @@ "@babel/helper-validator-option": { "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz", - "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==" + "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==", + "dev": true }, "@babel/helper-wrap-function": { "version": "7.16.8", @@ -19762,8 +19799,7 @@ "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": {} + "dev": true }, "semver": { "version": "7.3.4", @@ -20025,6 +20061,26 @@ "@sinonjs/commons": "^1.7.0" } }, + "@swimlane/ngx-charts": { + "version": "20.0.1", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-20.0.1.tgz", + "integrity": "sha512-gceTOLm4vZHBvNPyNAFqQf96xM+NLy56nRGX1cGR0dBQJq/0PtexrbEttg3AiZy5DvyXNF6rNdeZynUMZUi61Q==", + "requires": { + "@types/d3-shape": "^2.0.0", + "d3-array": "^2.9.1", + "d3-brush": "^2.1.0", + "d3-color": "^2.0.0", + "d3-format": "^2.0.0", + "d3-hierarchy": "^2.0.0", + "d3-interpolate": "^2.0.1", + "d3-scale": "^3.2.3", + "d3-selection": "^2.0.0", + "d3-shape": "^2.0.0", + "d3-time-format": "^3.0.0", + "d3-transition": "^2.0.0", + "tslib": "^2.0.0" + } + }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -20784,14 +20840,12 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "dev": true, - "requires": {} + "dev": true }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "requires": {} + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" }, "acorn-walk": { "version": "7.2.0", @@ -20882,6 +20936,14 @@ "fast-deep-equal": "^3.1.3" } }, + "angular-bootstrap-md": { + "version": "12.2.0", + "resolved": "https://registry.npmjs.org/angular-bootstrap-md/-/angular-bootstrap-md-12.2.0.tgz", + "integrity": "sha512-oGbYkHUB+uIS93MZM05Vjx/1HuOeh6m52QSzwqvcWWKXQc/r7q3WqqOuobaKY+lF6fNpxRCsUwoH6yv5EaTkQA==", + "requires": { + "tslib": "^2.0.0" + } + }, "ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -20920,6 +20982,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -21296,7 +21359,8 @@ "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true }, "bl": { "version": "4.1.0", @@ -21373,8 +21437,7 @@ "bootstrap": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.1.tgz", - "integrity": "sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==", - "requires": {} + "integrity": "sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==" }, "brace-expansion": { "version": "1.1.11", @@ -21389,6 +21452,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, "requires": { "fill-range": "^7.0.1" } @@ -21403,6 +21467,7 @@ "version": "4.19.1", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz", "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==", + "dev": true, "requires": { "caniuse-lite": "^1.0.30001286", "electron-to-chromium": "^1.4.17", @@ -21509,7 +21574,8 @@ "canonical-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz", - "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==" + "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==", + "dev": true }, "chalk": { "version": "2.4.2", @@ -21533,10 +21599,16 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "chart.js": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.7.0.tgz", + "integrity": "sha512-31gVuqqKp3lDIFmzpKIrBeum4OpZsQjSIAqlOpgjosHDJZlULtvwLEZKtEhIAZc7JMPaHlYMys40Qy9Mf+1AAg==" + }, "chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, "requires": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -21570,8 +21642,7 @@ "version": "5.2.2", "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz", "integrity": "sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==", - "dev": true, - "requires": {} + "dev": true }, "cjs-module-lexer": { "version": "1.2.2", @@ -22119,6 +22190,131 @@ } } }, + "d3-array": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", + "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", + "requires": { + "internmap": "^1.0.0" + } + }, + "d3-brush": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-2.1.0.tgz", + "integrity": "sha512-cHLLAFatBATyIKqZOkk/mDHUbzne2B3ZwxkzMHvFTCZCmLaXDpZRihQSn8UNXTkGD/3lb/W2sQz0etAftmHMJQ==", + "requires": { + "d3-dispatch": "1 - 2", + "d3-drag": "2", + "d3-interpolate": "1 - 2", + "d3-selection": "2", + "d3-transition": "2" + } + }, + "d3-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", + "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==" + }, + "d3-dispatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz", + "integrity": "sha512-S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA==" + }, + "d3-drag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-2.0.0.tgz", + "integrity": "sha512-g9y9WbMnF5uqB9qKqwIIa/921RYWzlUDv9Jl1/yONQwxbOfszAWTCm8u7HOTgJgRDXiRZN56cHT9pd24dmXs8w==", + "requires": { + "d3-dispatch": "1 - 2", + "d3-selection": "2" + } + }, + "d3-ease": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-2.0.0.tgz", + "integrity": "sha512-68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ==" + }, + "d3-format": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz", + "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==" + }, + "d3-hierarchy": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-2.0.0.tgz", + "integrity": "sha512-SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw==" + }, + "d3-interpolate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", + "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "requires": { + "d3-color": "1 - 2" + } + }, + "d3-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-2.0.0.tgz", + "integrity": "sha512-ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA==" + }, + "d3-scale": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz", + "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==", + "requires": { + "d3-array": "^2.3.0", + "d3-format": "1 - 2", + "d3-interpolate": "1.2.0 - 2", + "d3-time": "^2.1.1", + "d3-time-format": "2 - 3" + } + }, + "d3-selection": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz", + "integrity": "sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==" + }, + "d3-shape": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-2.1.0.tgz", + "integrity": "sha512-PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA==", + "requires": { + "d3-path": "1 - 2" + } + }, + "d3-time": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz", + "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==", + "requires": { + "d3-array": "2" + } + }, + "d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "requires": { + "d3-time": "1 - 2" + } + }, + "d3-timer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz", + "integrity": "sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==" + }, + "d3-transition": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-2.0.0.tgz", + "integrity": "sha512-42ltAGgJesfQE3u9LuuBHNbGrI/AJjNL2OAUdclE70UE6Vy239GCBEYD38uBPoLeNsOhFStGpPI0BAOV+HMxog==", + "requires": { + "d3-color": "1 - 2", + "d3-dispatch": "1 - 2", + "d3-ease": "1 - 2", + "d3-interpolate": "1 - 2", + "d3-timer": "1 - 2" + } + }, "data-urls": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", @@ -22257,7 +22453,8 @@ "dependency-graph": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", - "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==" + "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", + "dev": true }, "destroy": { "version": "1.0.4", @@ -22948,8 +23145,7 @@ "version": "8.3.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz", "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==", - "dev": true, - "requires": {} + "dev": true }, "eslint-import-resolver-node": { "version": "0.3.6", @@ -23186,8 +23382,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-7.0.0.tgz", "integrity": "sha512-U3vEDB5zhYPNfxT5TYR7u01dboFZp+HNpnGhkDB2g/2E4wZ/g1Q9Ton8UwCLfRV9yAKyYqDh62oHOamvkFxsvw==", - "dev": true, - "requires": {} + "dev": true }, "eslint-scope": { "version": "5.1.1", @@ -23502,6 +23697,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, "requires": { "to-regex-range": "^5.0.1" } @@ -23655,6 +23851,7 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, "optional": true }, "function-bind": { @@ -23744,6 +23941,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "requires": { "is-glob": "^4.0.1" } @@ -24040,8 +24238,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true, - "requires": {} + "dev": true }, "identity-obj-proxy": { "version": "3.0.0", @@ -24222,6 +24419,11 @@ "side-channel": "^1.0.4" } }, + "internmap": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz", + "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==" + }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -24263,6 +24465,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, "requires": { "binary-extensions": "^2.0.0" } @@ -24360,7 +24563,8 @@ "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true }, "is-number-object": { "version": "1.0.6", @@ -25434,8 +25638,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", - "dev": true, - "requires": {} + "dev": true }, "jest-regex-util": { "version": "27.4.0", @@ -26366,6 +26569,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, "requires": { "yallist": "^4.0.0" } @@ -26374,6 +26578,7 @@ "version": "0.25.7", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz", "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==", + "dev": true, "requires": { "sourcemap-codec": "^1.4.4" } @@ -26765,7 +26970,8 @@ "node-releases": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", - "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==" + "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", + "dev": true }, "nopt": { "version": "5.0.0", @@ -26779,7 +26985,8 @@ "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true }, "normalize-range": { "version": "0.1.2", @@ -27339,12 +27546,14 @@ "picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true }, "picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true }, "pify": { "version": "2.3.0", @@ -27620,8 +27829,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true, - "requires": {} + "dev": true }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -27947,6 +28155,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, "requires": { "picomatch": "^2.2.1" } @@ -27954,7 +28163,8 @@ "reflect-metadata": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", - "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==" + "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==", + "dev": true }, "regenerate": { "version": "1.4.2", @@ -28248,8 +28458,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "json-schema-traverse": { "version": "0.4.1", @@ -28278,6 +28487,7 @@ "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, "requires": { "lru-cache": "^6.0.0" } @@ -28565,7 +28775,8 @@ "sourcemap-codec": { "version": "1.4.8", "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", - "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", + "dev": true }, "spdy": { "version": "4.0.2", @@ -28632,23 +28843,6 @@ "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", "dev": true }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "requires": { - "safe-buffer": "~5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, "string-length": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", @@ -28689,6 +28883,23 @@ "define-properties": "^1.1.3" } }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "requires": { + "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true + } + } + }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -28861,8 +29072,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "json-schema-traverse": { "version": "0.4.1", @@ -28947,6 +29157,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "requires": { "is-number": "^7.0.0" } @@ -29342,8 +29553,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "json-schema-traverse": { "version": "0.4.1", @@ -29459,8 +29669,7 @@ "version": "8.4.2", "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz", "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==", - "dev": true, - "requires": {} + "dev": true } } }, @@ -29633,8 +29842,7 @@ "version": "7.5.6", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz", "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==", - "dev": true, - "requires": {} + "dev": true }, "xml-name-validator": { "version": "3.0.0", @@ -29656,7 +29864,8 @@ "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "yaml": { "version": "1.10.2", diff --git a/gui/package.json b/gui/package.json index afeeb746..9a90b445 100644 --- a/gui/package.json +++ b/gui/package.json @@ -28,7 +28,10 @@ "@fortawesome/free-solid-svg-icons": "5.15.4", "@ngx-translate/core": "14.0.0", "@ngx-translate/http-loader": "7.0.0", + "@swimlane/ngx-charts": "^20.0.1", + "angular-bootstrap-md": "12.2.0", "bootstrap": "4.6.1", + "chart.js": "^3.7.0", "core-js": "3.20.3", "eslint": "8.8.0", "font-awesome": "4.7.0", diff --git a/gui/src/app/app-routing.module.ts b/gui/src/app/app-routing.module.ts index c71d529e..11232f6c 100644 --- a/gui/src/app/app-routing.module.ts +++ b/gui/src/app/app-routing.module.ts @@ -6,6 +6,9 @@ import {NotAuthorizedPageComponent} from './shared/not-authorized-page/not-autho import {LoginComponent} from './login/login.component'; import {DocumentSignComponent} from './document-sign/document-sign.component'; import {ToolsComponent} from './tools/tools.component'; +import { + FacilitiesServicesListComponent +} from "./statistics/facilities-services-list/facilities-services-list.component"; const routes: Routes = [ @@ -13,6 +16,10 @@ const routes: Routes = [ path: '', component: LoginComponent, }, + { + path: 'services', + component: FacilitiesServicesListComponent, + }, { path: 'auth', component: MainMenuComponent, diff --git a/gui/src/app/app.component.html b/gui/src/app/app.component.html index 37393087..226b0670 100644 --- a/gui/src/app/app.component.html +++ b/gui/src/app/app.component.html @@ -48,6 +48,11 @@ {{'MENU.HOME' | translate}} +
  • + + {{'MENU.STATISTICS' | translate}} + +
  • {{'MENU.ADMIN' | translate}} diff --git a/gui/src/app/app.module.ts b/gui/src/app/app.module.ts index 1130a61a..84a54a1b 100644 --- a/gui/src/app/app.module.ts +++ b/gui/src/app/app.module.ts @@ -1,5 +1,5 @@ import { BrowserModule } from '@angular/platform-browser'; -import { NgModule } from '@angular/core'; +import {APP_INITIALIZER, NgModule} from '@angular/core'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; @@ -20,11 +20,29 @@ import {AttributeValuePipe} from './attribute-value.pipe'; import {DocumentSignItemLocalePipe} from "./document-sign-item-locale.pipe"; import {LanguageEntryPipe} from "./language-entry.pipe"; import { HammerModule} from '@angular/platform-browser'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; +import {StatisticsModule} from "./statistics/statistics.module"; +import {ConfService} from "./shared/conf-service"; +import {map} from "rxjs"; export function HttpLoaderFactory(http: HttpClient) { return new TranslateHttpLoader(http, './assets/i18n/', '.json'); } +function initialize(http: HttpClient, config: ConfService) { + return (): Promise => { + return new Promise((resolve: (a: boolean) => void): void => { + http.get('/assets/config/config.json') + .pipe( + map((x: ConfService) => { + config.statisticsDisplayedAttributes = x.statisticsDisplayedAttributes; + resolve(true); + }) + ).subscribe(); + }); + }; +} + @NgModule({ declarations: [ AppComponent, @@ -54,8 +72,20 @@ export function HttpLoaderFactory(http: HttpClient) { MatDialogModule, MatTabsModule, HammerModule, + StatisticsModule, + NgxChartsModule + ], + providers: [ + { + provide: APP_INITIALIZER, + useFactory: initialize, + deps: [ + HttpClient, + ConfService + ], + multi: true + } ], - providers: [ ], bootstrap: [AppComponent] }) export class AppModule {} diff --git a/gui/src/app/core/models/ProvidedServiceOverview.ts b/gui/src/app/core/models/ProvidedServiceOverview.ts new file mode 100644 index 00000000..3e3cf67f --- /dev/null +++ b/gui/src/app/core/models/ProvidedServiceOverview.ts @@ -0,0 +1,30 @@ +export class ProvidedServiceOverview { + constructor(item: any) { + if (!item) { + return; + } + + this.name = new Map(); + if (item.hasOwnProperty('description') && item.name !== null && item.name !== undefined) { + for (const k of Object.keys(item.name)) { + this.name.set(k.toLowerCase(), item.name[k]); + } + } + + this.description = new Map(); + if (item.hasOwnProperty('description') && item.description !== null && item.description !== undefined) { + for (const k of Object.keys(item.description)) { + this.description.set(k.toLowerCase(), item.description[k]); + } + } + + this.protocol = item.protocol; + this.environment = item.environment; + } + + name: Map; + description: Map; + environment: string; + protocol: string; + +} diff --git a/gui/src/app/core/models/ProvidedServicesOverview.ts b/gui/src/app/core/models/ProvidedServicesOverview.ts new file mode 100644 index 00000000..96ab94b4 --- /dev/null +++ b/gui/src/app/core/models/ProvidedServicesOverview.ts @@ -0,0 +1,57 @@ +import {ProvidedServiceOverview} from "./ProvidedServiceOverview"; + +export class ProvidedServicesOverview { + samlServicesCount: Map; + oidcServicesCount: Map; + + productionServices: ProvidedServiceOverview[] = []; + stagingServices: ProvidedServiceOverview[] = []; + testingServices: ProvidedServiceOverview[] = []; + + displayableProductionServices = false; + displayableStagingServices = false; + displayableTestingServices = false; + + constructor(item: any) { + this.samlServicesCount = new Map(); + this.oidcServicesCount = new Map(); + this.productionServices = []; + this.stagingServices = []; + this.testingServices = []; + this.displayableProductionServices = false; + this.displayableStagingServices = false; + this.displayableTestingServices = false; + + if (!item) { + return; + } + + if (item['samlServicesCount']) { + for (const k of Object.keys(item.samlServicesCount)) { + this.samlServicesCount.set(k, item.samlServicesCount[k]); + } + } + + if (item['oidcServicesCount']) { + for (const k of Object.keys(item.oidcServicesCount)) { + this.oidcServicesCount.set(k, item.oidcServicesCount[k]); + } + } + + if (item['services'] && item.services['PRODUCTION']) { + this.displayableProductionServices = true; + item.services['PRODUCTION'].map(s => this.productionServices.push(new ProvidedServiceOverview(s))); + } + + if (item['services'] && item.services['STAGING']) { + this.displayableStagingServices = true; + item.services['STAGING'].map(s => this.stagingServices.push(new ProvidedServiceOverview(s))); + } + + if (item['services'] && item.services['TESTING']) { + this.displayableTestingServices = true; + item.services['TESTING'].map(s => this.testingServices.push(new ProvidedServiceOverview(s))); + } + } + +} diff --git a/gui/src/app/core/services/config.service.ts b/gui/src/app/core/services/config.service.ts index 6359db9d..23811a0f 100644 --- a/gui/src/app/core/services/config.service.ts +++ b/gui/src/app/core/services/config.service.ts @@ -44,4 +44,8 @@ export class ConfigService { getLanguages(): Observable { return this.apiService.get('/config/langs'); } + + getEnvironments(): Observable { + return this.apiService.get('/config/envs'); + } } diff --git a/gui/src/app/core/services/facilities.service.ts b/gui/src/app/core/services/facilities.service.ts index 61ed4acd..f9e771bf 100644 --- a/gui/src/app/core/services/facilities.service.ts +++ b/gui/src/app/core/services/facilities.service.ts @@ -6,6 +6,7 @@ import { Request } from "../models/Request"; import {PerunAttribute} from "../models/PerunAttribute"; import {LinkCode} from "../models/LinkCode"; import {ProvidedService} from "../models/ProvidedService"; +import {ProvidedServicesOverview} from "../models/ProvidedServicesOverview"; @Injectable({ providedIn: 'root' @@ -20,6 +21,10 @@ export class FacilitiesService { return this.apiService.get('/allFacilities'); } + getProvidedServicesOverview(): Observable { + return this.apiService.get('/services') + } + getAllExternalFacilities(): Observable { return this.apiService.get('/allFacilitiesExternal'); } diff --git a/gui/src/app/facilities/facilities.module.ts b/gui/src/app/facilities/facilities.module.ts index 2b6a4270..cfb029c8 100644 --- a/gui/src/app/facilities/facilities.module.ts +++ b/gui/src/app/facilities/facilities.module.ts @@ -4,14 +4,12 @@ import { FacilitiesRoutingModule } from './facilities-routing.module'; import { FacilitiesUserComponent } from './facilities-user/facilities-user.component'; import { SharedModule } from '../shared/shared.module'; import { FacilitiesDetailComponent } from './facilities-detail/facilities-detail.component'; -import {FacilitiesAttributeValuePipe} from './facilities-attribute-value.pipe'; import { FacilityMoveToProductionComponent } from './facilities-detail/facility-move-to-production/facility-move-to-production.component'; import { FacilitiesDetailDeleteDialogComponent } from './facilities-detail/facilities-detail-delete-dialog/facilities-detail-delete-dialog.component'; import { FacilityAddAdminComponent } from './facilities-detail/facility-add-admin/facility-add-admin.component'; import { FacilityAddAdminSignComponent } from './facilities-detail/facility-add-admin/facility-add-admin-sign/facility-add-admin-sign.component'; import { FacilitiesAdminComponent } from './facilities-admin/facilities-admin.component'; import { FacilitiesEditComponent } from './facilities-edit/facilities-edit.component'; -import {FacilitiesEnvironmentPipe} from './facilities-environment.pipe'; import {MatTabsModule} from '@angular/material/tabs'; import {MatDialogModule} from '@angular/material/dialog'; import {MatPaginatorIntl, MatPaginatorModule} from '@angular/material/paginator'; @@ -34,7 +32,6 @@ import {FacilitiesRemoveAdminDialogComponent} from "./facilities-detail/faciliti declarations: [ FacilitiesUserComponent, FacilitiesDetailComponent, - FacilitiesAttributeValuePipe, FacilityMoveToProductionComponent, FacilitiesEditComponent, FacilityMoveToProductionComponent, @@ -43,8 +40,7 @@ import {FacilitiesRemoveAdminDialogComponent} from "./facilities-detail/faciliti FacilitiesDetailClientSecretDialogComponent, FacilityAddAdminComponent, FacilityAddAdminSignComponent, - FacilitiesAdminComponent, - FacilitiesEnvironmentPipe + FacilitiesAdminComponent ], providers: [ { diff --git a/gui/src/app/main-menu/main-menu.component.html b/gui/src/app/main-menu/main-menu.component.html index a2fdaa66..549ca776 100644 --- a/gui/src/app/main-menu/main-menu.component.html +++ b/gui/src/app/main-menu/main-menu.component.html @@ -5,6 +5,9 @@

    {{'MENU.MAIN' | translate}}

    + + diff --git a/gui/src/app/main-menu/main-menu.component.ts b/gui/src/app/main-menu/main-menu.component.ts index 6e42f3e5..54dc392b 100644 --- a/gui/src/app/main-menu/main-menu.component.ts +++ b/gui/src/app/main-menu/main-menu.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit} from '@angular/core'; -import {faClipboardList, faNotesMedical, faServer, faToolbox} from '@fortawesome/free-solid-svg-icons'; +import {faChartPie, faClipboardList, faNotesMedical, faServer, faToolbox} from '@fortawesome/free-solid-svg-icons'; import {User} from '../core/models/User'; import {AppComponent} from '../app.component'; import {UsersService} from "../core/services/users.service"; @@ -21,6 +21,7 @@ export class MainMenuComponent implements OnInit { facilitiesIcon = faServer; newRequestIcon = faNotesMedical; toolboxIcon = faToolbox; + statisticsIcon = faChartPie; ngOnInit() { this.usersService.getUser().subscribe(user => { diff --git a/gui/src/app/shared/conf-service.ts b/gui/src/app/shared/conf-service.ts new file mode 100644 index 00000000..13d5f9d4 --- /dev/null +++ b/gui/src/app/shared/conf-service.ts @@ -0,0 +1,10 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class ConfService { + "statisticsDisplayedAttributes": string[]; + + constructor() { } +} diff --git a/gui/src/app/facilities/facilities-attribute-value.pipe.ts b/gui/src/app/shared/facilities-attribute-value.pipe.ts similarity index 100% rename from gui/src/app/facilities/facilities-attribute-value.pipe.ts rename to gui/src/app/shared/facilities-attribute-value.pipe.ts diff --git a/gui/src/app/facilities/facilities-environment.pipe.ts b/gui/src/app/shared/facilities-environment.pipe.ts similarity index 78% rename from gui/src/app/facilities/facilities-environment.pipe.ts rename to gui/src/app/shared/facilities-environment.pipe.ts index 7f320303..bee31b1a 100644 --- a/gui/src/app/facilities/facilities-environment.pipe.ts +++ b/gui/src/app/shared/facilities-environment.pipe.ts @@ -8,6 +8,7 @@ export class FacilitiesEnvironmentPipe implements PipeTransform { private testEnvText: string = "TEXT"; private prodEnvText: string = "TEXT2"; + private stagingEnvText: string = "TEXT3"; constructor( private translate: TranslateService @@ -18,12 +19,16 @@ export class FacilitiesEnvironmentPipe implements PipeTransform { this.translate.get('FACILITIES.ENV_PROD').subscribe(text => { this.prodEnvText = text; }); + this.translate.get('FACILITIES.ENV_STAGING').subscribe(text => { + this.stagingEnvText = text; + }); } transform(env: any, args?: any): any { switch(env) { case "TESTING": return this.testEnvText; case "PRODUCTION": return this.prodEnvText; + case "STAGING": return this.stagingEnvText; } } diff --git a/gui/src/app/shared/shared.module.ts b/gui/src/app/shared/shared.module.ts index e14ea3b4..80e0bc12 100644 --- a/gui/src/app/shared/shared.module.ts +++ b/gui/src/app/shared/shared.module.ts @@ -52,6 +52,8 @@ import {DetailedViewItemValuePipe} from './detailed-view-item-value.pipe'; import {ItemLocalePipe} from './item-locale.pipe'; import {RequestItemInputErrorComponent} from './request-item-input/request-item-input-error/request-item-input-error.component'; import {RequestInputItemSelectComponent} from "./request-item-input/request-item-input-select/request-input-item-select.component"; +import {FacilitiesAttributeValuePipe} from "./facilities-attribute-value.pipe"; +import {FacilitiesEnvironmentPipe} from "./facilities-environment.pipe"; @NgModule({ imports: [ @@ -109,7 +111,9 @@ import {RequestInputItemSelectComponent} from "./request-item-input/request-item DetailItemSubCommentButtonComponent, DetailedViewItemValuePipe, ItemLocalePipe, - AuditTypePipe + AuditTypePipe, + FacilitiesAttributeValuePipe, + FacilitiesEnvironmentPipe ], exports: [ FontAwesomeModule, @@ -154,7 +158,9 @@ import {RequestInputItemSelectComponent} from "./request-item-input/request-item DetailItemSubCommentButtonComponent, ItemLocalePipe, DetailedViewItemValuePipe, - AuditTypePipe + AuditTypePipe, + FacilitiesAttributeValuePipe, + FacilitiesEnvironmentPipe ], }) export class SharedModule { } diff --git a/gui/src/app/statistics/facilities-services-list/facilities-services-list.component.html b/gui/src/app/statistics/facilities-services-list/facilities-services-list.component.html new file mode 100644 index 00000000..711a0af0 --- /dev/null +++ b/gui/src/app/statistics/facilities-services-list/facilities-services-list.component.html @@ -0,0 +1,215 @@ +
    +
    +
    +

    + {{ 'MENU.STATISTICS' | translate }} +

    + +
    +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'SERVICES.PRODUCTION_SERVICES' | translate }}{{ 'SERVICES.STAGING_SERVICES' | translate }}{{ 'SERVICES.TESTING_SERVICES' | translate }}
    {{ 'SERVICES.ALL' | translate }}{{ getProductionCount() }}{{ getStagingCount() }}{{ getTestingCount() }}
    {{ 'SERVICES.SAML' | translate }}{{ getSamlProductionCount() }}{{ getSamlStagingCount() }}{{ getSamlTestingCount() }}
    {{ 'SERVICES.OIDC' | translate }}{{ getOidcProductionCount() }}{{ getOidcStagingCount() }}{{ getOidcTestingCount() }}
    +
    +
    +
    + +
    + + + + +
    +
    + +
    + + + +
    +
    {{ 'SERVICES.PRODUCTION_SERVICES_LIST' | translate }}
    + + search + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'FACILITIES.NAME' | translate }}{{ providedService.name | itemLocale }}{{ 'FACILITIES.DESCRIPTION' | translate }}{{ providedService.description | itemLocale }}{{ 'FACILITIES.ENVIRONMENT' | translate }}{{ providedService.environment | facilityEnvironment }}{{ 'FACILITIES.PROTOCOL' | translate }}{{ providedService.protocol }}
    + +
    +     + + + +
    + + + +
    {{ 'SERVICES.PRODUCTION_SERVICES_LIST' | translate }}
    +     +     + + search + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'FACILITIES.NAME' | translate }}{{ providedService.name | itemLocale }}{{ 'FACILITIES.DESCRIPTION' | translate }}{{ providedService.description | itemLocale }}{{ 'FACILITIES.ENVIRONMENT' | translate }}{{ providedService.environment | facilityEnvironment }}{{ 'FACILITIES.PROTOCOL' | translate }}{{ providedService.protocol }}
    + +     +
    + + +
    + + + +
    {{'SERVICES.STAGING_SERVICES_LIST' | translate}}
    +     +     + + search + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'FACILITIES.NAME' | translate }}{{ providedService.name | itemLocale }}{{ 'FACILITIES.DESCRIPTION' | translate }}{{ providedService.description | itemLocale }}{{ 'FACILITIES.ENVIRONMENT' | translate }}{{ providedService.environment | facilityEnvironment }}{{ 'FACILITIES.PROTOCOL' | translate }}{{ providedService.protocol }}
    + +     +
    + + +
    + + + +
    {{'SERVICES.TESTING_SERVICES_LIST' | translate}}
    +     +     + + search + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'FACILITIES.NAME' | translate }}{{ providedService.name | itemLocale }}{{ 'FACILITIES.DESCRIPTION' | translate }}{{ providedService.description | itemLocale }}{{ 'FACILITIES.ENVIRONMENT' | translate }}{{ providedService.environment | facilityEnvironment }}{{ 'FACILITIES.PROTOCOL' | translate }}{{ providedService.protocol }}
    + +     +
    +     +
    +
    +
    +
    diff --git a/gui/src/app/statistics/facilities-services-list/facilities-services-list.component.scss b/gui/src/app/statistics/facilities-services-list/facilities-services-list.component.scss new file mode 100644 index 00000000..dc2d6f96 --- /dev/null +++ b/gui/src/app/statistics/facilities-services-list/facilities-services-list.component.scss @@ -0,0 +1,17 @@ +th { + vertical-align: middle; +} + +.overview-table { + text-align: center; + font-weight: bold; + height: 100%; +} + +.card-title { + margin-bottom: 40px; +} + +.overview-row { + margin-bottom: 60px; +} diff --git a/gui/src/app/statistics/facilities-services-list/facilities-services-list.component.ts b/gui/src/app/statistics/facilities-services-list/facilities-services-list.component.ts new file mode 100644 index 00000000..2a86f7bc --- /dev/null +++ b/gui/src/app/statistics/facilities-services-list/facilities-services-list.component.ts @@ -0,0 +1,455 @@ +import { Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; +import { FacilitiesService } from '../../core/services/facilities.service'; +import { Subscription } from 'rxjs'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; +import { MatPaginator } from '@angular/material/paginator'; +import { TranslateService } from '@ngx-translate/core'; +import {ProvidedServiceOverview} from '../../core/models/ProvidedServiceOverview'; +import {ProvidedServicesOverview} from '../../core/models/ProvidedServicesOverview'; +import {AppComponent} from '../../app.component'; +import {ConfService} from '../../shared/conf-service'; +import {ConfigService} from '../../core/services/config.service'; + +const PRODUCTION = 'PRODUCTION'; +const STAGING = 'STAGING'; +const TESTING = 'TESTING'; + +@Component({ + selector: 'app-facilities-overview', + templateUrl: './facilities-services-list.component.html', + styleUrls: ['./facilities-services-list.component.scss'] +}) +export class FacilitiesServicesListComponent implements OnInit, OnDestroy { + + displayedColumns: string[] = ['name', 'description', 'protocol']; + + servicesOverview: ProvidedServicesOverview = new ProvidedServicesOverview(null); + + productionServicesDataSource: MatTableDataSource = + new MatTableDataSource([]); + stagingServicesDataSource: MatTableDataSource = + new MatTableDataSource([]); + testingServicesDataSource: MatTableDataSource = + new MatTableDataSource([]); + + isLoadingTable = true; + + overviewTableData = []; + colorScheme = [ + { name: 'SAML - PROD', value: '#FF0000' }, + { name: 'SAML - STAGE', value: '#FF6666' }, + { name: 'SAML - TEST', value: '#FFCCCC' }, + { name: 'OIDC - PROD', value: '#0000FF' }, + { name: 'OIDC - STAGE', value: '#6666FF' }, + { name: 'OIDC - TEST', value: '#CCCCFF' } + ]; + + enabledProtocols: string[] = []; + enabledEnvironments: string[] = []; + + private paginatorProduction: MatPaginator = undefined; + private sortProduction: MatSort = undefined; + + private paginatorStaging: MatPaginator = undefined; + private sortStaging: MatSort = undefined; + + private paginatorTesting: MatPaginator = undefined; + private sortTesting: MatSort = undefined; + + private servicesOverviewSubscription: Subscription; + private protocolsSubscription: Subscription; + private environmentsSubscription: Subscription; + + constructor( + private facilitiesService: FacilitiesService, + private translate: TranslateService, + private confService: ConfService, + private configService: ConfigService + ) { + if (confService.statisticsDisplayedAttributes) { + this.displayedColumns = confService.statisticsDisplayedAttributes; + } + } + + @ViewChild('paginatorProduction', {static: false}) set matPaginatorProduction(mp: MatPaginator) { + this.paginatorProduction = mp; + this.setProductionServicesDataSource(); + } + @ViewChild('sortProduction', {static: false}) set matSortProduction(ms: MatSort) { + this.sortProduction = ms; + this.setProductionServicesDataSource(); + } + + @ViewChild('paginatorStaging', {static: false}) set matPaginatorStaging(mp: MatPaginator) { + this.paginatorStaging = mp; + this.setStagingServicesDataSource(); + } + @ViewChild('sortStaging', {static: false}) set matSortStaging(ms: MatSort) { + this.sortStaging = ms; + this.setStagingServicesDataSource(); + } + + @ViewChild('paginatorTesting', {static: false}) set matPaginatorTesting(mp: MatPaginator) { + this.paginatorTesting = mp; + this.setTestingServicesDataSource(); + } + @ViewChild('sortTesting', {static: false}) set matSortTesting(ms: MatSort) { + this.sortTesting = ms; + this.setTestingServicesDataSource(); + } + + private static extractData(map: Map, key: string): number { + if (map && map.has(key)) { + return map.get(key); + } + return null; + } + + private static pushData(data: object[], servicesCount: number, label: string) { + if (servicesCount === null || servicesCount === undefined) { + return; + } + data.push({ name: label, value: servicesCount }); + } + + ngOnInit() { + this.protocolsSubscription = this.configService.getProtocolsEnabled().subscribe(protocols => { + this.enabledProtocols = protocols; + this.environmentsSubscription = this.configService.getEnvironments().subscribe(environments => { + this.enabledEnvironments = environments; + this.servicesOverviewSubscription = this.facilitiesService.getProvidedServicesOverview().subscribe(overview => { + this.servicesOverview = new ProvidedServicesOverview(overview); + this.setDataSources(); + this.setOverviewTableData(); + this.isLoadingTable = false; + }); + }); + }); + } + + ngOnDestroy() { + if (this.servicesOverviewSubscription) { + this.servicesOverviewSubscription.unsubscribe(); + } + if (this.environmentsSubscription) { + this.environmentsSubscription.unsubscribe(); + } + if (this.protocolsSubscription) { + this.protocolsSubscription.unsubscribe(); + } + } + + doFilterProduction(value: string): void { + if (this.productionServicesDataSource) { + value = value ? value.trim().toLowerCase(): ''; + this.productionServicesDataSource.filter = value; + } + } + + doFilterStaging(value: string): void { + if (this.productionServicesDataSource) { + value = value ? value.trim().toLowerCase() : ''; + this.productionServicesDataSource.filter = value; + } + } + + doFilterTesting(value: string): void { + if (this.productionServicesDataSource) { + value = value ? value.trim().toLowerCase() : ''; + this.productionServicesDataSource.filter = value; + } + } + + hasDisplayableProductionServices() { + return this.servicesOverview && this.servicesOverview.displayableProductionServices; + } + + hasDisplayableStagingServices() { + return this.servicesOverview && this.servicesOverview.displayableStagingServices && AppComponent.isApplicationAdmin(); + } + + hasDisplayableTestingServices() { + return this.servicesOverview && this.servicesOverview.displayableTestingServices && AppComponent.isApplicationAdmin(); + } + + axisFormat(val) { + if (val % 1 === 0) { + return val.toLocaleString(); + } else { + return ''; + } + } + + hasProductionEnabled() { + return this.enabledEnvironments.indexOf('production') !== -1; + } + + hasStagingEnabled() { + return this.enabledEnvironments.indexOf('staging') !== -1; + } + + hasTestingEnabled() { + return this.enabledEnvironments.indexOf('testing') !== -1; + } + + hasSamlEnabled() { + return this.enabledProtocols.indexOf('SAML') !== -1; + } + + hasOidcEnabled() { + return this.enabledProtocols.indexOf('OIDC') !== -1; + } + + getSamlProductionCount(): number { + if (!this.hasProductionEnabled() || !this.hasSamlEnabled() || !this.servicesOverview) { + return null; + } + return FacilitiesServicesListComponent.extractData(this.servicesOverview.samlServicesCount, PRODUCTION); + } + + getSamlStagingCount(): number { + if (!this.hasStagingEnabled() || !this.hasSamlEnabled() || !this.servicesOverview) { + return null; + } + return FacilitiesServicesListComponent.extractData(this.servicesOverview.samlServicesCount, STAGING); + } + + getSamlTestingCount(): number { + if (!this.hasTestingEnabled() || !this.hasSamlEnabled() || !this.servicesOverview) { + return null; + } + return FacilitiesServicesListComponent.extractData(this.servicesOverview.samlServicesCount, TESTING); + } + + getOidcProductionCount(): number { + if (!this.hasProductionEnabled() || !this.hasOidcEnabled() || !this.servicesOverview) { + return null; + } + return FacilitiesServicesListComponent.extractData(this.servicesOverview.oidcServicesCount, PRODUCTION); + } + + getOidcStagingCount(): number { + if (!this.hasStagingEnabled() || !this.hasOidcEnabled() || !this.servicesOverview) { + return null; + } + return FacilitiesServicesListComponent.extractData(this.servicesOverview.oidcServicesCount, STAGING); + } + + getOidcTestingCount(): number { + if (!this.hasTestingEnabled() || !this.hasOidcEnabled() || !this.servicesOverview) { + return null; + } + return FacilitiesServicesListComponent.extractData(this.servicesOverview.oidcServicesCount, TESTING); + } + + getProductionCount(): number { + let val = null; + if (!this.hasProductionEnabled()) { + return null; + } + if (this.hasSamlEnabled()) { + val = this.getSamlProductionCount(); + } + if (this.hasOidcEnabled()) { + if (val === null || val === undefined) { + val = this.getOidcProductionCount(); + } else { + val += this.getOidcProductionCount(); + } + } + return val; + } + + getStagingCount(): number { + let val = null; + if (!this.hasStagingEnabled()) { + return null; + } + if (this.hasSamlEnabled()) { + val = this.getSamlStagingCount(); + } + if (this.hasOidcEnabled()) { + if (val === null || val === undefined) { + val = this.getOidcStagingCount(); + } else { + val += this.getOidcStagingCount(); + } + } + return val; + } + + getTestingCount(): number { + let val = null; + if (!this.hasTestingEnabled()) { + return null; + } + if (this.hasSamlEnabled()) { + val = this.getSamlTestingCount(); + } + if (this.hasOidcEnabled()) { + if (val === null || val === undefined) { + val = this.getOidcTestingCount(); + } else { + val += this.getOidcTestingCount(); + } + } + return val; + } + + chartClicked(e: any): void { } + + chartHovered(e: any): void { } + + isApplicationAdmin(): boolean { + return AppComponent.isApplicationAdmin(); + } + + private setDataSources(): void { + this.setProductionServicesDataSource(); + this.setStagingServicesDataSource(); + this.setTestingServicesDataSource(); + } + + private setProductionServicesDataSource(): void { + if (!this.hasProductionEnabled()) { + return; + } + this.setServicesDataSource( + this.productionServicesDataSource, + this.servicesOverview.productionServices, + this.sortProduction, + this.paginatorProduction + ) + } + + private setStagingServicesDataSource(): void { + if (!this.hasStagingEnabled()) { + return; + } + this.setServicesDataSource( + this.stagingServicesDataSource, + this.servicesOverview.stagingServices, + this.sortStaging, + this.paginatorStaging + ); + } + + private setTestingServicesDataSource(): void { + if (!this.hasTestingEnabled()) { + return; + } + this.setServicesDataSource( + this.testingServicesDataSource, + this.servicesOverview.testingServices, + this.sortTesting, + this.paginatorTesting + ); + } + + private setServicesDataSource(datasource: MatTableDataSource, + data: ProvidedServiceOverview[], + sort: MatSort, paginator: MatPaginator): void + { + if (datasource) { + datasource.data = data; + datasource.sort = sort; + datasource.paginator = paginator; + + this.setSorting(datasource); + this.setFiltering(datasource); + } + } + + private setSorting(dataSource: MatTableDataSource) { + if (!dataSource) { + return; + } + dataSource.sortingDataAccessor = ((data, sortHeaderId) => { + switch (sortHeaderId) { + case 'name': { + if (data.name && data.name.has(this.translate.currentLang)) { + return data.name.get(this.translate.currentLang).toLowerCase(); + } else { + return ''; + } + } + case 'description': { + if (data.description && data.description.has(this.translate.currentLang)) { + return data.description.get(this.translate.currentLang).toLowerCase(); + } else { + return ''; + } + } + case 'environment': return data.environment; + case 'protocol': return data.protocol; + } + }); + } + + private setFiltering(dataSource: MatTableDataSource) { + if (!dataSource) { + return; + } + dataSource.filterPredicate = ((data: ProvidedServiceOverview, filter: string) => { + if (!filter) { + return true; + } + let name = ''; + if (data.name && data.name.has(this.translate.currentLang)) { + name = data.name.get(this.translate.currentLang).replace(/\s/g, '').toLowerCase(); + } + let desc = ''; + if (data.description && data.description.has(this.translate.currentLang)) { + desc = data.description.get(this.translate.currentLang).replace(/\s/g, '').toLowerCase(); + } + const protocol = data.protocol.replace(/\s/g, '').toLowerCase(); + const env = data.environment.replace(/\s/g, '').toLowerCase(); + + const parts = filter.split(' '); + for (const part of parts) { + if (name.includes(part) || desc.includes(part) || protocol.includes(part) || env.includes(part)) { + return true; + } + } + return false; + }); + } + + private setOverviewTableData() { + if (!this.servicesOverview) { + return; + } + const data = []; + if (this.servicesOverview.samlServicesCount) { + if (this.hasProductionEnabled()) { + const productionSamlCount = FacilitiesServicesListComponent.extractData(this.servicesOverview.samlServicesCount, PRODUCTION); + FacilitiesServicesListComponent.pushData(data, productionSamlCount, 'SAML - PROD'); + } + if (this.hasStagingEnabled()) { + const stagingSamlCount = FacilitiesServicesListComponent.extractData(this.servicesOverview.samlServicesCount, STAGING); + FacilitiesServicesListComponent.pushData(data, stagingSamlCount, 'SAML - STAGE'); + } + if (this.hasTestingEnabled()) { + const testingSamlCount = FacilitiesServicesListComponent.extractData(this.servicesOverview.samlServicesCount, TESTING); + FacilitiesServicesListComponent.pushData(data, testingSamlCount, 'SAML - TEST'); + } + } + if (this.servicesOverview.oidcServicesCount) { + if (this.hasProductionEnabled()) { + const productionOidcCount = FacilitiesServicesListComponent.extractData(this.servicesOverview.oidcServicesCount, PRODUCTION); + FacilitiesServicesListComponent.pushData(data, productionOidcCount, 'OIDC - PROD'); + } + if (this.hasStagingEnabled()) { + const stagingOidcCount = FacilitiesServicesListComponent.extractData(this.servicesOverview.oidcServicesCount, STAGING); + FacilitiesServicesListComponent.pushData(data, stagingOidcCount, 'OIDC - STAGE'); + } + if (this.hasTestingEnabled()) { + const testingOidcCount = FacilitiesServicesListComponent.extractData(this.servicesOverview.oidcServicesCount, TESTING); + FacilitiesServicesListComponent.pushData(data, testingOidcCount, 'OIDC - TEST'); + } + } + this.overviewTableData = data; + } + +} diff --git a/gui/src/app/statistics/statistics-routing.module.ts b/gui/src/app/statistics/statistics-routing.module.ts new file mode 100644 index 00000000..42df11c2 --- /dev/null +++ b/gui/src/app/statistics/statistics-routing.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +const routes: Routes = []; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class StatisticsRoutingModule { } diff --git a/gui/src/app/statistics/statistics.module.ts b/gui/src/app/statistics/statistics.module.ts new file mode 100644 index 00000000..6e0dc9aa --- /dev/null +++ b/gui/src/app/statistics/statistics.module.ts @@ -0,0 +1,31 @@ +import { NgModule } from '@angular/core'; +import {FacilitiesServicesListComponent} from "./facilities-services-list/facilities-services-list.component"; +import {MatPaginatorIntl, MatPaginatorModule} from "@angular/material/paginator"; +import {TranslateParser, TranslateService} from "@ngx-translate/core"; +import {PaginatorI18n} from "../core/parts/paginatorI18n"; +import {CommonModule} from "@angular/common"; +import {SharedModule} from "../shared/shared.module"; +import {MatSortModule} from "@angular/material/sort"; +import {StatisticsRoutingModule} from "./statistics-routing.module"; +import { NgxChartsModule } from '@swimlane/ngx-charts'; + +@NgModule({ + imports: [ + CommonModule, + StatisticsRoutingModule, + SharedModule, + MatSortModule, + MatPaginatorModule, + NgxChartsModule + ], + declarations: [ + FacilitiesServicesListComponent + ], + providers: [ + { + provide: MatPaginatorIntl, deps: [TranslateService, TranslateParser], + useFactory: (translateService: TranslateService, translateParser: TranslateParser) => new PaginatorI18n(translateService, translateParser) + } + ] +}) +export class StatisticsModule { } diff --git a/gui/src/assets/config/config.json b/gui/src/assets/config/config.json new file mode 100644 index 00000000..61cd300c --- /dev/null +++ b/gui/src/assets/config/config.json @@ -0,0 +1,3 @@ +{ + "statisticsDisplayedAttributes": ["name", "description", "environment", "protocol"] +} diff --git a/gui/src/assets/i18n/cs.json b/gui/src/assets/i18n/cs.json index 8f7a44f3..3ab07cd4 100644 --- a/gui/src/assets/i18n/cs.json +++ b/gui/src/assets/i18n/cs.json @@ -24,7 +24,8 @@ "MY_SERVICES": "Mé služby", "MY_REQUESTS": "Mé žádosti", "REGISTER_SERVICE": "Nová služba", - "TOOLS": "Nástroje" + "TOOLS": "Nástroje", + "STATISTICS": "Statistiky" }, "COMMON": { "ID": "Identifikátor", @@ -174,6 +175,7 @@ "ENVIRONMENT": "Prostředí", "ENV_TEST": "Testovací", "ENV_PROD": "Produkční", + "ENV_STAGING": "Akceptační", "MOVE_TO_PRODUCTION_REJECT": "Zamítnout", "CLIENT_ID": "Client ID", "CLIENT_SECRET": "Client SECRET", @@ -222,5 +224,16 @@ "REQUEST_UPDATED": "Žádost byla aktualizovaná", "REQUEST_CANCELED": "Žádost zrušena žadatelem" } + }, + "SERVICES": { + "PRODUCTION_SERVICES_LIST": "Produkční služby", + "STAGING_SERVICES_LIST": "Akceptační služby", + "TESTING_SERVICES_LIST": "Testovací služby", + "PRODUCTION_SERVICES": "Produkční služby", + "STAGING_SERVICES": "Akceptační služby", + "TESTING_SERVICES": "Testovací služby", + "ALL": "Celkem", + "SAML": "SAML", + "OIDC": "OIDC" } } diff --git a/gui/src/assets/i18n/en.json b/gui/src/assets/i18n/en.json index b733fdf0..2146f9d3 100644 --- a/gui/src/assets/i18n/en.json +++ b/gui/src/assets/i18n/en.json @@ -27,7 +27,8 @@ "MY_SERVICES": "My services", "MY_REQUESTS": "My requests", "REGISTER_SERVICE": "New service", - "TOOLS": "Toolbox" + "TOOLS": "Toolbox", + "STATISTICS": "Statistics" }, "COMMON": { "ID": "Identifier", @@ -177,6 +178,7 @@ "ENVIRONMENT": "Environment", "ENV_TEST": "Test", "ENV_PROD": "Production", + "ENV_STAGING": "Staging", "MOVE_TO_PRODUCTION_REJECT": "Reject request", "CLIENT_ID": "Client ID", "CLIENT_SECRET": "Client SECRET", @@ -225,5 +227,16 @@ "REQUEST_UPDATED": "Request updated", "REQUEST_CANCELED": "Request canceled by the requester" } + }, + "SERVICES": { + "PRODUCTION_SERVICES_LIST": "Production services", + "STAGING_SERVICES_LIST": "Staging services", + "TESTING_SERVICES_LIST": "Testing services", + "PRODUCTION_SERVICES": "Production services", + "STAGING_SERVICES": "Staging services", + "TESTING_SERVICES": "Testing services", + "ALL": "All", + "SAML": "SAML", + "OIDC": "OIDC" } } diff --git a/pom.xml b/pom.xml index f2c5f695..f3a8d5db 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,6 @@ bcpkix-jdk15on ${bc-pkix.version} - diff --git a/src/main/java/cz/metacentrum/perun/spRegistration/common/configs/AppBeans.java b/src/main/java/cz/metacentrum/perun/spRegistration/common/configs/AppBeans.java index 784132e5..e4aabc4a 100644 --- a/src/main/java/cz/metacentrum/perun/spRegistration/common/configs/AppBeans.java +++ b/src/main/java/cz/metacentrum/perun/spRegistration/common/configs/AppBeans.java @@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; import java.io.File; import java.io.IOException; diff --git a/src/main/java/cz/metacentrum/perun/spRegistration/common/configs/ApplicationProperties.java b/src/main/java/cz/metacentrum/perun/spRegistration/common/configs/ApplicationProperties.java index 3998a676..15d4932e 100644 --- a/src/main/java/cz/metacentrum/perun/spRegistration/common/configs/ApplicationProperties.java +++ b/src/main/java/cz/metacentrum/perun/spRegistration/common/configs/ApplicationProperties.java @@ -1,5 +1,7 @@ package cz.metacentrum.perun.spRegistration.common.configs; +import static cz.metacentrum.perun.spRegistration.persistence.enums.ServiceProtocol.*; + import cz.metacentrum.perun.spRegistration.persistence.enums.ServiceProtocol; import java.util.HashSet; import java.util.List; @@ -27,38 +29,42 @@ @ConfigurationProperties(prefix = "application") public class ApplicationProperties { - @NotEmpty private Set adminIds; + @NotEmpty private Set adminIds = new HashSet<>(); @NotBlank private String proxyIdentifier; - @NotEmpty private Set protocolsEnabled; - @NotEmpty private Set languagesEnabled; + @NotEmpty private Set protocolsEnabled = Set.of(SAML, OIDC); + @NotEmpty private Set languagesEnabled = Set.of("en"); + @NotEmpty private Set environmentsEnabled = Set.of("testing", "production"); @NotBlank private String secretKey; @NotBlank private String hostUrl; @NotBlank private String logoutUrl; - @NotNull private AttributesProperties attributesProperties; - @NotNull private ApprovalsProperties approvalsProperties; - @NotNull private FrontendProperties frontendProperties; @NotNull private Long spManagersVoId; @NotNull private Long spManagersParentGroupId; @NotBlank private String mailsConfigFilePath; @NotNull private boolean startupSyncEnabled = false; - private String devUserIdentifier; private boolean externalServicesEnabled = false; + private String devUserIdentifier; + + @NotNull private AttributesProperties attributesProperties; + @NotNull private ApprovalsProperties approvalsProperties; + @NotNull private FrontendProperties frontendProperties; + @Override public String toString() { return "ApplicationConfiguration{" + - "adminIds=" + adminIds + - ", proxyIdentifier='" + proxyIdentifier + '\'' + - ", protocolsEnabled=" + protocolsEnabled + - ", languagesEnabled=" + languagesEnabled + - ", secretKey='*******************'" + - ", hostUrl='" + hostUrl + '\'' + - ", logoutUrl='" + logoutUrl + '\'' + - ", mailsConfig='" + mailsConfigFilePath + '\'' + - ", startupSyncEnabled='" + startupSyncEnabled + '\'' + - ", devUserIdentifier=" + devUserIdentifier + - ", externalServicesEnabled=" + externalServicesEnabled + - '}'; + "adminIds=" + adminIds + + ", proxyIdentifier='" + proxyIdentifier + '\'' + + ", protocolsEnabled=" + protocolsEnabled + + ", languagesEnabled=" + languagesEnabled + + ", environmentsEnabled=" + environmentsEnabled + + ", secretKey='*******************'" + + ", hostUrl='" + hostUrl + '\'' + + ", logoutUrl='" + logoutUrl + '\'' + + ", mailsConfig='" + mailsConfigFilePath + '\'' + + ", startupSyncEnabled='" + startupSyncEnabled + '\'' + + ", externalServicesEnabled=" + externalServicesEnabled + + ", devUserIdentifier=" + devUserIdentifier + + '}'; } @PostConstruct @@ -76,7 +82,7 @@ public void setProtocolsEnabled(List protocolsEnabled) { if (!StringUtils.hasText(protocol)) { throw new IllegalArgumentException("No protocol parsed"); } - ServiceProtocol p = ServiceProtocol.fromString(protocol); + ServiceProtocol p = fromString(protocol); if (p == null) { throw new IllegalArgumentException("Unsupported protocol given"); } diff --git a/src/main/java/cz/metacentrum/perun/spRegistration/common/models/ProvidedServiceOverview.java b/src/main/java/cz/metacentrum/perun/spRegistration/common/models/ProvidedServiceOverview.java new file mode 100644 index 00000000..6cc7a1fa --- /dev/null +++ b/src/main/java/cz/metacentrum/perun/spRegistration/common/models/ProvidedServiceOverview.java @@ -0,0 +1,56 @@ +package cz.metacentrum.perun.spRegistration.common.models; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import cz.metacentrum.perun.spRegistration.persistence.enums.ServiceEnvironment; +import cz.metacentrum.perun.spRegistration.persistence.enums.ServiceProtocol; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.NonNull; +import lombok.Setter; +import lombok.ToString; + +import java.util.Map; + +@Getter +@Setter +@ToString +@EqualsAndHashCode +@NoArgsConstructor +public class ProvidedServiceOverview { + + @NonNull private ServiceProtocol protocol; + @NonNull private ServiceEnvironment environment; + @NonNull private Map name; + @NonNull private Map description; + + public ProvidedServiceOverview(@NonNull ServiceProtocol protocol, + @NonNull ServiceEnvironment environment, + @NonNull Map name, + @NonNull Map description) + { + this.setProtocol(protocol); + this.setEnvironment(environment); + this.setName(name); + this.setDescription(description); + } + + public String nameAsJsonString() throws JsonProcessingException { + return new ObjectMapper().writeValueAsString(this.name); + } + + public String descriptionAsJsonString() throws JsonProcessingException { + return new ObjectMapper().writeValueAsString(this.description); + } + + public void nameFromDbJson(String nameJson) throws JsonProcessingException { + this.name = new ObjectMapper().readValue(nameJson, new TypeReference>() {}); + } + + public void descriptionFromDbJson(String descriptionJson) throws JsonProcessingException { + this.description = new ObjectMapper().readValue(descriptionJson, new TypeReference>() {}); + } + +} diff --git a/src/main/java/cz/metacentrum/perun/spRegistration/common/models/ProvidedServicesOverview.java b/src/main/java/cz/metacentrum/perun/spRegistration/common/models/ProvidedServicesOverview.java new file mode 100644 index 00000000..d9c6d2cc --- /dev/null +++ b/src/main/java/cz/metacentrum/perun/spRegistration/common/models/ProvidedServicesOverview.java @@ -0,0 +1,23 @@ +package cz.metacentrum.perun.spRegistration.common.models; + +import cz.metacentrum.perun.spRegistration.persistence.enums.ServiceEnvironment; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; +import java.util.Map; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class ProvidedServicesOverview { + + private Map samlServicesCount; + private Map oidcServicesCount; + + private Map> services; + +} diff --git a/src/main/java/cz/metacentrum/perun/spRegistration/rest/controllers/ConfigController.java b/src/main/java/cz/metacentrum/perun/spRegistration/rest/controllers/ConfigController.java index 02e690f6..9f51db0e 100644 --- a/src/main/java/cz/metacentrum/perun/spRegistration/rest/controllers/ConfigController.java +++ b/src/main/java/cz/metacentrum/perun/spRegistration/rest/controllers/ConfigController.java @@ -8,10 +8,13 @@ import cz.metacentrum.perun.spRegistration.common.models.User; import cz.metacentrum.perun.spRegistration.persistence.enums.ServiceProtocol; import cz.metacentrum.perun.spRegistration.service.UtilsService; +import java.util.HashSet; +import java.util.Locale; import java.util.stream.Collectors; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.SessionAttribute; @@ -89,7 +92,30 @@ public Set getProtocolsEnabled() { @GetMapping(path = "/api/config/langs") public Set getLangs() { - return applicationProperties.getLanguagesEnabled(); + Set set = new HashSet<>(); + if (applicationProperties.getLanguagesEnabled() != null) { + for (String lang : applicationProperties.getLanguagesEnabled()) { + if (!StringUtils.hasText(lang)) { + continue; + } + set.add(lang.trim().toLowerCase()); + } + } + return set; + } + + @GetMapping(path = "/api/config/envs") + public Set getEnvs() { + Set set = new HashSet<>(); + if (applicationProperties.getEnvironmentsEnabled() != null) { + for (String env : applicationProperties.getEnvironmentsEnabled()) { + if (!StringUtils.hasText(env)) { + continue; + } + set.add(env.trim().toLowerCase()); + } + } + return set; } @GetMapping(path = "/api/config/isUserAdmin") diff --git a/src/main/java/cz/metacentrum/perun/spRegistration/rest/controllers/FacilitiesController.java b/src/main/java/cz/metacentrum/perun/spRegistration/rest/controllers/FacilitiesController.java index 189ee8c0..34cc29cf 100644 --- a/src/main/java/cz/metacentrum/perun/spRegistration/rest/controllers/FacilitiesController.java +++ b/src/main/java/cz/metacentrum/perun/spRegistration/rest/controllers/FacilitiesController.java @@ -9,6 +9,8 @@ import cz.metacentrum.perun.spRegistration.common.models.LinkCode; import cz.metacentrum.perun.spRegistration.common.models.PerunAttribute; import cz.metacentrum.perun.spRegistration.common.models.ProvidedService; +import cz.metacentrum.perun.spRegistration.common.models.ProvidedServiceOverview; +import cz.metacentrum.perun.spRegistration.common.models.ProvidedServicesOverview; import cz.metacentrum.perun.spRegistration.common.models.User; import cz.metacentrum.perun.spRegistration.persistence.exceptions.PerunConnectionException; import cz.metacentrum.perun.spRegistration.persistence.exceptions.PerunUnknownException; @@ -165,6 +167,12 @@ public List allFacilities(@NonNull @SessionAttribute("user") Us return facilitiesService.getAllFacilities(user.getId()); } + @GetMapping(path = "/api/services") + public ProvidedServicesOverview allFacilitiesOverview(@SessionAttribute("user") User user) throws PerunUnknownException, PerunConnectionException + { + return facilitiesService.getFacilitiesOverview(utilsService.isAppAdmin(user)); + } + @GetMapping(path = "/api/allFacilitiesExternal") public List allFacilitiesExternal(@NonNull @SessionAttribute("user") User user) throws UnauthorizedActionException, PerunUnknownException, PerunConnectionException diff --git a/src/main/java/cz/metacentrum/perun/spRegistration/service/FacilitiesService.java b/src/main/java/cz/metacentrum/perun/spRegistration/service/FacilitiesService.java index 10f576b8..89dfcd8c 100644 --- a/src/main/java/cz/metacentrum/perun/spRegistration/service/FacilitiesService.java +++ b/src/main/java/cz/metacentrum/perun/spRegistration/service/FacilitiesService.java @@ -1,9 +1,11 @@ package cz.metacentrum.perun.spRegistration.service; import cz.metacentrum.perun.spRegistration.common.exceptions.InternalErrorException; -import cz.metacentrum.perun.spRegistration.common.exceptions.UnauthorizedActionException; import cz.metacentrum.perun.spRegistration.common.models.ProvidedService; import cz.metacentrum.perun.spRegistration.common.models.Facility; +import cz.metacentrum.perun.spRegistration.common.models.ProvidedServiceOverview; +import cz.metacentrum.perun.spRegistration.common.models.ProvidedServicesOverview; +import cz.metacentrum.perun.spRegistration.common.models.User; import cz.metacentrum.perun.spRegistration.persistence.exceptions.PerunConnectionException; import cz.metacentrum.perun.spRegistration.persistence.exceptions.PerunUnknownException; import lombok.NonNull; @@ -18,6 +20,9 @@ public interface FacilitiesService { List getAllFacilities(@NonNull Long adminId) throws PerunUnknownException, PerunConnectionException; + ProvidedServicesOverview getFacilitiesOverview(boolean isAdmin) + throws PerunUnknownException, PerunConnectionException; + List getAllFacilitiesExternal(@NonNull Long userId) throws PerunUnknownException, PerunConnectionException; diff --git a/src/main/java/cz/metacentrum/perun/spRegistration/service/impl/FacilitiesServiceImpl.java b/src/main/java/cz/metacentrum/perun/spRegistration/service/impl/FacilitiesServiceImpl.java index 65679511..49dcf6bc 100644 --- a/src/main/java/cz/metacentrum/perun/spRegistration/service/impl/FacilitiesServiceImpl.java +++ b/src/main/java/cz/metacentrum/perun/spRegistration/service/impl/FacilitiesServiceImpl.java @@ -5,14 +5,17 @@ import cz.metacentrum.perun.spRegistration.common.configs.AttributesProperties; import cz.metacentrum.perun.spRegistration.common.enums.AttributeCategory; import cz.metacentrum.perun.spRegistration.common.exceptions.InternalErrorException; -import cz.metacentrum.perun.spRegistration.common.exceptions.UnauthorizedActionException; import cz.metacentrum.perun.spRegistration.common.models.AttrInput; import cz.metacentrum.perun.spRegistration.common.models.Facility; import cz.metacentrum.perun.spRegistration.common.models.InputsContainer; import cz.metacentrum.perun.spRegistration.common.models.PerunAttribute; import cz.metacentrum.perun.spRegistration.common.models.PerunEntity; import cz.metacentrum.perun.spRegistration.common.models.ProvidedService; +import cz.metacentrum.perun.spRegistration.common.models.ProvidedServiceOverview; +import cz.metacentrum.perun.spRegistration.common.models.ProvidedServicesOverview; +import cz.metacentrum.perun.spRegistration.common.models.User; import cz.metacentrum.perun.spRegistration.persistence.adapters.PerunAdapter; +import cz.metacentrum.perun.spRegistration.persistence.enums.ServiceEnvironment; import cz.metacentrum.perun.spRegistration.persistence.enums.ServiceProtocol; import cz.metacentrum.perun.spRegistration.persistence.exceptions.PerunConnectionException; import cz.metacentrum.perun.spRegistration.persistence.exceptions.PerunUnknownException; @@ -37,6 +40,7 @@ import java.util.stream.Collectors; import static cz.metacentrum.perun.spRegistration.persistence.enums.ServiceEnvironment.PRODUCTION; +import static cz.metacentrum.perun.spRegistration.persistence.enums.ServiceEnvironment.STAGING; import static cz.metacentrum.perun.spRegistration.persistence.enums.ServiceEnvironment.TESTING; import static cz.metacentrum.perun.spRegistration.persistence.enums.ServiceProtocol.OIDC; import static cz.metacentrum.perun.spRegistration.persistence.enums.ServiceProtocol.SAML; @@ -233,6 +237,65 @@ public List getAllFacilities(@NonNull Long userId) { return providedServiceManager.getAll(); } + @Override + public ProvidedServicesOverview getFacilitiesOverview(boolean isAdmin) { + Map samlCounter = new HashMap<>(); + samlCounter.put(PRODUCTION, 0); + samlCounter.put(STAGING, 0); + samlCounter.put(TESTING, 0); + + Map oidcCounter = new HashMap<>(); + oidcCounter.put(PRODUCTION, 0); + oidcCounter.put(STAGING, 0); + oidcCounter.put(TESTING, 0); + + Map> providedServicesOverview = new HashMap<>(); + providedServicesOverview.put(PRODUCTION, new ArrayList<>()); + + if (isAdmin) { + providedServicesOverview.put(STAGING, new ArrayList<>()); + providedServicesOverview.put(TESTING, new ArrayList<>()); + } + + for (ProvidedService providedService : providedServiceManager.getAll()) { + switch (providedService.getProtocol()) { + case SAML: + updateOverview(samlCounter, providedServicesOverview, providedService, isAdmin); + break; + case OIDC: + updateOverview(oidcCounter, providedServicesOverview, providedService, isAdmin); + break; + default: + // should not happen + } + } + + return new ProvidedServicesOverview(samlCounter, oidcCounter, providedServicesOverview); + } + + private void updateOverview(Map counter, + Map> providedServicesOverview, + ProvidedService providedService, + boolean isAdmin) { + ServiceEnvironment environment = providedService.getEnvironment(); + + switch (environment) { + case PRODUCTION: + counter.replace(environment, counter.get(environment) + 1); + providedServicesOverview.get(environment).add(mapProvidedServiceToOverview(providedService)); + break; + case STAGING: + case TESTING: + counter.replace(environment, counter.get(environment) + 1); + if (isAdmin) { + providedServicesOverview.get(environment).add(mapProvidedServiceToOverview(providedService)); + } + break; + default: + // should not happen + } + } + @Override public List getAllFacilitiesExternal(@NonNull Long userId) throws PerunUnknownException, PerunConnectionException @@ -338,4 +401,13 @@ private void decryptClientSecretValueInAttr(Facility facility) JsonNodeFactory.instance.textNode(clientSecretValue)); } + private ProvidedServiceOverview mapProvidedServiceToOverview(ProvidedService providedService) { + return new ProvidedServiceOverview( + providedService.getProtocol(), + providedService.getEnvironment(), + providedService.getName(), + providedService.getDescription() + ); + } + } diff --git a/src/main/resources/sql/mysql_schema.sql b/src/main/resources/sql/mysql_schema.sql index ee577c20..ca3f560b 100644 --- a/src/main/resources/sql/mysql_schema.sql +++ b/src/main/resources/sql/mysql_schema.sql @@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS provided_services id BIGINT PRIMARY KEY AUTO_INCREMENT, facility_id BIGINT UNIQUE NOT NULL, name TINYTEXT NOT NULL, - description TEXT DEFAULT '', + description TEXT, environment VARCHAR(256) NOT NULL, protocol VARCHAR(256) NOT NULL, identifier VARCHAR(4096) NOT NULL,