diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0816c790..3d275122 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,3 +30,9 @@ jobs: - name: Check for production build run: test -f build/browser/index.html + + - name: Run widget build + run: npm run build-widgets + + - name: Check for widget build + run: test -f dist/report-widgets/browser/index.html diff --git a/angular.json b/angular.json index 9363133a..8a1b1e5d 100644 --- a/angular.json +++ b/angular.json @@ -23,11 +23,12 @@ "inlineStyleLanguage": "scss", "stylePreprocessorOptions": { "includePaths": [ - "", - "src/app/webapp-common/shared/ui-components/styles/", "src/app/webapp-common/styles/", "." - ] + ], + "sass": { + "silenceDeprecations": ["import", "mixed-decls"] + } }, "assets": [ "src/assets", @@ -43,6 +44,7 @@ } ], "styles": [ + "src/app/webapp-common/assets/fonts/heebo.css", "node_modules/ngx-markdown-editor/assets/highlight.js/agate.min.css", { "bundleName": "global-styles", @@ -174,7 +176,7 @@ "stylePreprocessorOptions": { "includePaths": [ "", - "src/app/webapp-common/shared/ui-components/styles/" + "src/app/webapp-common/styles/" ] }, "assets": [ @@ -231,8 +233,7 @@ "stylePreprocessorOptions": { "includePaths": [ "", - "src/app/webapp-common/styles/", - "src/app/webapp-common/shared/ui-components/styles/" + "src/app/webapp-common/styles/" ] }, "styles": [ @@ -258,7 +259,10 @@ "taira", "url" ], - "browser": "src/app/webapp-common/clearml-applications/report-widgets/src/main.ts" + "browser": "src/app/webapp-common/clearml-applications/report-widgets/src/main.ts", + "polyfills": [ + "zone.js" + ] }, "configurations": { "production": { @@ -355,7 +359,7 @@ "schematicCollections": [ "@angular-eslint/schematics", "@ngrx/schematics", - "ngxtension" + "ngxtension-plugin" ] } } diff --git a/package-lock.json b/package-lock.json index bb58591c..cde6f277 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,53 +1,56 @@ { "name": "clearml-webapp", - "version": "2.0.0", + "version": "2.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "clearml-webapp", - "version": "2.0.0", + "version": "2.1.0", "dependencies": { - "@angular/animations": "^18.2.12", - "@angular/cdk": "^18.2.14", - "@angular/common": "^18.2.12", - "@angular/compiler": "^18.2.12", - "@angular/core": "^18.2.12", - "@angular/forms": "^18.2.12", - "@angular/material": "^18.2.14", - "@angular/platform-browser": "^18.2.12", - "@angular/platform-browser-dynamic": "^18.2.12", - "@angular/platform-server": "^18.2.12", - "@angular/router": "^18.2.12", - "@angular/service-worker": "^18.2.12", - "@angular/youtube-player": "^18.2.14", - "@aws-sdk/client-s3": "^3.693.0", - "@aws-sdk/s3-request-presigner": "^3.693.0", + "@angular/animations": "19.1.5", + "@angular/cdk": "19.1.3", + "@angular/common": "19.1.5", + "@angular/compiler": "19.1.5", + "@angular/core": "19.1.5", + "@angular/forms": "19.1.5", + "@angular/material": "19.1.3", + "@angular/platform-browser": "19.1.5", + "@angular/platform-browser-dynamic": "19.1.5", + "@angular/platform-server": "19.1.5", + "@angular/router": "19.1.5", + "@angular/service-worker": "19.1.5", + "@angular/youtube-player": "19.1.3", + "@aws-sdk/client-s3": "^3.782.0", + "@aws-sdk/s3-request-presigner": "^3.782.0", "@ctrl/ngx-github-buttons": "^9.0.0", "@ctrl/tinycolor": "^4.1.0", "@ngneat/dag": "^2.0.0", - "@ngrx/component": "^18.1.1", - "@ngrx/effects": "^18.1.1", - "@ngrx/entity": "^18.1.1", - "@ngrx/operators": "^18.1.1", - "@ngrx/router-store": "^18.1.1", - "@ngrx/store": "^18.1.1", - "@typescript-eslint/types": "^8.15.0", - "ace-builds": "^1.36.5", + "@ngrx/component": "19.1.0", + "@ngrx/effects": "19.1.0", + "@ngrx/entity": "19.1.0", + "@ngrx/operators": "19.1.0", + "@ngrx/router-store": "19.1.0", + "@ngrx/signals": "19.1.0", + "@ngrx/store": "19.1.0", + "@primeng/themes": "^19.0.10", + "@typescript-eslint/types": "^8.29.1", + "ace-builds": "^1.39.1", "angular-resizable-element": "^7.0.2", - "angular-split": "^18.0.0", + "angular-split": "^19.0.0", "ansi-to-html": "^0.7.2", - "bootstrap": "^5.3.3", - "chart.js": "^4.4.6", + "bootstrap": "^5.3.5", + "chart.js": "^4.4.8", "chartjs-adapter-date-fns": "^3.0.0", "chartjs-plugin-annotation": "^3.1.0", - "chartjs-plugin-zoom": "^2.1.0", + "chartjs-plugin-zoom": "^2.2.0", "curved-arrows": "^0.3.0", + "d3-interpolate": "^3.0.1", "d3-selection": "^3.0.0", "date-fns": "^4.1.0", "diff": "^7.0.0", "dom-to-image": "^2.6.0", - "dompurify": "^3.2.0", + "dompurify": "^3.2.5", "export-to-csv": "^1.4.0", "filesize": "^10.1.6", "has-ansi": "^6.0.0", @@ -55,64 +58,55 @@ "lodash-es": "^4.17.21", "lucene": "^2.1.1", "marked": "^12.0.2", - "ng2-charts": "^6.0.1", + "ng2-charts": "^8.0.0", "ngx-clipboard": "^16.0.0", - "ngx-color-picker": "^17.0.0", - "ngx-device-detector": "^8.0.0", + "ngx-color-picker": "^19.0.0", + "ngx-device-detector": "^9.0.0", "ngx-markdown-editor": "^5.3.4", - "ngx-print": "^1.5.1", + "ngx-print": "^2.0.0", "ngx-window-token": "^7.0.0", - "ngxtension": "^4.1.0", + "ngxtension": "^5.0.0", "object-hash": "^3.0.0", "primeicons": "^7.0.0", - "primeng": "^17.18.15", - "rxjs": "^7.8.1", + "primeng": "^19.0.10", + "rxjs": "^7.8.2", "string-to-color": "^2.2.2", "taira": "^3.2.2", "tslib": "^2.8.1", "url": "^0.11.4", - "uuid": "^11.0.3", + "uuid": "^11.1.0", "zone.js": "~0.15.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^18.2.12", - "@angular-devkit/core": "^18.2.12", - "@angular-devkit/schematics": "^18.2.12", - "@angular-devkit/schematics-cli": "^18.2.12", - "@angular/cli": "^18.2.12", - "@angular/compiler-cli": "^18.2.12", - "@angular/language-service": "^18.2.12", - "@ngrx/eslint-plugin": "^18.1.1", - "@ngrx/schematics": "^18.1.1", - "@ngrx/store-devtools": "^18.1.1", + "@angular-devkit/build-angular": "^19.2.12", + "@angular-devkit/core": "19.1.6", + "@angular-devkit/schematics": "19.1.6", + "@angular-devkit/schematics-cli": "19.1.6", + "@angular/cli": "19.1.6", + "@angular/compiler-cli": "19.1.5", + "@angular/language-service": "19.1.5", + "@ngrx/eslint-plugin": "19.1.0", + "@ngrx/schematics": "19.1.0", + "@ngrx/store-devtools": "19.1.0", + "@types/d3-interpolate": "^3.0.4", "@types/d3-selection": "^3.0.11", - "@types/diff": "^6.0.0", + "@types/diff": "^7.0.2", "@types/dom-to-image": "^2.6.7", - "@types/dompurify": "^3.0.5", "@types/has-ansi": "^5.0.2", - "@types/jasmine": "^5.1.4", + "@types/jasmine": "^5.1.7", "@types/lodash-es": "^4.17.12", - "@types/node": "^22.9.0", - "@types/plotly.js": "^2.35.0", + "@types/node": "^22.14.0", + "@types/plotly.js": "^2.35.4", "@types/tinycolor2": "^1.4.6", "@types/uuid": "^10.0.0", - "angular-eslint": "^18.4.1", - "eslint": "^9.15.0", + "angular-eslint": "^19.3.0", + "eslint": "^9.24.0", "eslint-plugin-import": "2.31.0", - "eslint-plugin-jsdoc": "^50.5.0", + "eslint-plugin-jsdoc": "^50.6.9", "eslint-plugin-prefer-arrow": "1.2.3", "primeng-sass-theme": "github:primefaces/primeng-sass-theme", - "typescript": "^5.5.4", - "typescript-eslint": "^8.15.0" - } - }, - "node_modules/@aashutoshrathi/word-wrap": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "typescript": "^5.7.3", + "typescript-eslint": "^8.29.1" } }, "node_modules/@ampproject/remapping": { @@ -130,13 +124,13 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.1802.12", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.12.tgz", - "integrity": "sha512-bepVb2/GtJppYKaeW8yTGE6egmoWZ7zagFDsmBdbF+BYp+HmeoPsclARcdryBPVq68zedyTRdvhWSUTbw1AYuw==", + "version": "0.1902.12", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.12.tgz", + "integrity": "sha512-LfUc7k84YL290hAxsG+FvjQpXugQXyw5aDzrQQB4iTYhBgaABu2aaNOU4eu3JH+F8NeXd2EBF/YMr2LDSkYlMw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.12", + "@angular-devkit/core": "19.2.12", "rxjs": "7.8.1" }, "engines": { @@ -145,73 +139,104 @@ "yarn": ">= 1.13.0" } }, + "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": { + "version": "19.2.12", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.12.tgz", + "integrity": "sha512-v5pdfZHZ8MTZozfpkhKoPFBpXQW+2GFbTfdyis8FBtevJWCbIsCR3xhodgI4jwzkSEAraN4oVtWvSytdNyBC6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "8.17.1", + "ajv-formats": "3.0.1", + "jsonc-parser": "3.3.1", + "picomatch": "4.0.2", + "rxjs": "7.8.1", + "source-map": "0.7.4" + }, + "engines": { + "node": "^18.19.1 || ^20.11.1 || >=22.0.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + }, + "peerDependencies": { + "chokidar": "^4.0.0" + }, + "peerDependenciesMeta": { + "chokidar": { + "optional": true + } + } + }, + "node_modules/@angular-devkit/architect/node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, "node_modules/@angular-devkit/build-angular": { - "version": "18.2.12", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.12.tgz", - "integrity": "sha512-quVUi7eqTq9OHumQFNl9Y8t2opm8miu4rlYnuF6rbujmmBDvdUvR6trFChueRczl2p5HWqTOr6NPoDGQm8AyNw==", + "version": "19.2.12", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-19.2.12.tgz", + "integrity": "sha512-gPx3Vi7QFzHkSV388en6VqSqasojitJKuKmgTMPOV5keLtpOylPv3rjnr8oO9rYbYmLsT/WTUsP7bYiZhrr19Q==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1802.12", - "@angular-devkit/build-webpack": "0.1802.12", - "@angular-devkit/core": "18.2.12", - "@angular/build": "18.2.12", - "@babel/core": "7.25.2", - "@babel/generator": "7.25.0", - "@babel/helper-annotate-as-pure": "7.24.7", + "@angular-devkit/architect": "0.1902.12", + "@angular-devkit/build-webpack": "0.1902.12", + "@angular-devkit/core": "19.2.12", + "@angular/build": "19.2.12", + "@babel/core": "7.26.10", + "@babel/generator": "7.26.10", + "@babel/helper-annotate-as-pure": "7.25.9", "@babel/helper-split-export-declaration": "7.24.7", - "@babel/plugin-transform-async-generator-functions": "7.25.0", - "@babel/plugin-transform-async-to-generator": "7.24.7", - "@babel/plugin-transform-runtime": "7.24.7", - "@babel/preset-env": "7.25.3", - "@babel/runtime": "7.25.0", - "@discoveryjs/json-ext": "0.6.1", - "@ngtools/webpack": "18.2.12", - "@vitejs/plugin-basic-ssl": "1.1.0", + "@babel/plugin-transform-async-generator-functions": "7.26.8", + "@babel/plugin-transform-async-to-generator": "7.25.9", + "@babel/plugin-transform-runtime": "7.26.10", + "@babel/preset-env": "7.26.9", + "@babel/runtime": "7.26.10", + "@discoveryjs/json-ext": "0.6.3", + "@ngtools/webpack": "19.2.12", + "@vitejs/plugin-basic-ssl": "1.2.0", "ansi-colors": "4.1.3", "autoprefixer": "10.4.20", - "babel-loader": "9.1.3", + "babel-loader": "9.2.1", "browserslist": "^4.21.5", "copy-webpack-plugin": "12.0.2", - "critters": "0.0.24", "css-loader": "7.1.2", - "esbuild-wasm": "0.23.0", - "fast-glob": "3.3.2", - "http-proxy-middleware": "3.0.3", - "https-proxy-agent": "7.0.5", + "esbuild-wasm": "0.25.4", + "fast-glob": "3.3.3", + "http-proxy-middleware": "3.0.5", "istanbul-lib-instrument": "6.0.3", "jsonc-parser": "3.3.1", "karma-source-map-support": "1.4.0", - "less": "4.2.0", + "less": "4.2.2", "less-loader": "12.2.0", "license-webpack-plugin": "4.0.2", "loader-utils": "3.3.1", - "magic-string": "0.30.11", - "mini-css-extract-plugin": "2.9.0", - "mrmime": "2.0.0", + "mini-css-extract-plugin": "2.9.2", "open": "10.1.0", "ora": "5.4.1", - "parse5-html-rewriting-stream": "7.0.0", "picomatch": "4.0.2", - "piscina": "4.6.1", - "postcss": "8.4.41", + "piscina": "4.8.0", + "postcss": "8.5.2", "postcss-loader": "8.1.1", "resolve-url-loader": "5.0.0", "rxjs": "7.8.1", - "sass": "1.77.6", - "sass-loader": "16.0.0", - "semver": "7.6.3", + "sass": "1.85.0", + "sass-loader": "16.0.5", + "semver": "7.7.1", "source-map-loader": "5.0.0", "source-map-support": "0.5.21", - "terser": "5.31.6", + "terser": "5.39.0", "tree-kill": "1.2.2", - "tslib": "2.6.3", - "vite": "5.4.6", - "watchpack": "2.4.1", - "webpack": "5.94.0", + "tslib": "2.8.1", + "webpack": "5.98.0", "webpack-dev-middleware": "7.4.2", - "webpack-dev-server": "5.0.4", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1", "webpack-subresource-integrity": "5.1.0" }, @@ -221,22 +246,23 @@ "yarn": ">= 1.13.0" }, "optionalDependencies": { - "esbuild": "0.23.0" + "esbuild": "0.25.4" }, "peerDependencies": { - "@angular/compiler-cli": "^18.0.0", - "@angular/localize": "^18.0.0", - "@angular/platform-server": "^18.0.0", - "@angular/service-worker": "^18.0.0", - "@web/test-runner": "^0.18.0", + "@angular/compiler-cli": "^19.0.0 || ^19.2.0-next.0", + "@angular/localize": "^19.0.0 || ^19.2.0-next.0", + "@angular/platform-server": "^19.0.0 || ^19.2.0-next.0", + "@angular/service-worker": "^19.0.0 || ^19.2.0-next.0", + "@angular/ssr": "^19.2.12", + "@web/test-runner": "^0.20.0", "browser-sync": "^3.0.2", "jest": "^29.5.0", "jest-environment-jsdom": "^29.5.0", "karma": "^6.3.0", - "ng-packagr": "^18.0.0", + "ng-packagr": "^19.0.0 || ^19.2.0-next.0", "protractor": "^7.0.0", - "tailwindcss": "^2.0.0 || ^3.0.0", - "typescript": ">=5.4 <5.6" + "tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0", + "typescript": ">=5.5 <5.9" }, "peerDependenciesMeta": { "@angular/localize": { @@ -248,6 +274,9 @@ "@angular/service-worker": { "optional": true }, + "@angular/ssr": { + "optional": true + }, "@web/test-runner": { "optional": true }, @@ -274,105 +303,10 @@ } } }, - "node_modules/@angular-devkit/build-angular/node_modules/define-lazy-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", - "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/is-wsl": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz", - "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-inside-container": "^1.0.0" - }, - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/jsonc-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", - "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@angular-devkit/build-angular/node_modules/open": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz", - "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==", - "dev": true, - "license": "MIT", - "dependencies": { - "default-browser": "^5.2.1", - "define-lazy-prop": "^3.0.0", - "is-inside-container": "^1.0.0", - "is-wsl": "^3.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/picomatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", - "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", - "dev": true, - "license": "0BSD" - }, - "node_modules/@angular-devkit/build-webpack": { - "version": "0.1802.12", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.12.tgz", - "integrity": "sha512-0Z3fdbZVRnjYWE2/VYyfy+uieY+6YZyEp4ylzklVkc+fmLNsnz4Zw6cK1LzzcBqAwKIyh1IdW20Cg7o8b0sONA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@angular-devkit/architect": "0.1802.12", - "rxjs": "7.8.1" - }, - "engines": { - "node": "^18.19.1 || ^20.11.1 || >=22.0.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "webpack": "^5.30.0", - "webpack-dev-server": "^5.0.2" - } - }, - "node_modules/@angular-devkit/core": { - "version": "18.2.12", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.12.tgz", - "integrity": "sha512-NtB6ypsaDyPE6/fqWOdfTmACs+yK5RqfH5tStEzWFeeDsIEDYKsJ06ypuRep7qTjYus5Rmttk0Ds+cFgz8JdUQ==", + "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": { + "version": "19.2.12", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.12.tgz", + "integrity": "sha512-v5pdfZHZ8MTZozfpkhKoPFBpXQW+2GFbTfdyis8FBtevJWCbIsCR3xhodgI4jwzkSEAraN4oVtWvSytdNyBC6A==", "dev": true, "license": "MIT", "dependencies": { @@ -389,7 +323,7 @@ "yarn": ">= 1.13.0" }, "peerDependencies": { - "chokidar": "^3.5.2" + "chokidar": "^4.0.0" }, "peerDependenciesMeta": { "chokidar": { @@ -397,36 +331,142 @@ } } }, - "node_modules/@angular-devkit/core/node_modules/jsonc-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", - "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@angular-devkit/core/node_modules/picomatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", - "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/@angular-devkit/schematics": { - "version": "18.2.12", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.12.tgz", - "integrity": "sha512-mMea9txHbnCX5lXLHlo0RAgfhFHDio45/jMsREM2PA8UtVf2S8ltXz7ZwUrUyMQRv8vaSfn4ijDstF4hDMnRgQ==", + "node_modules/@angular-devkit/build-angular/node_modules/@babel/core": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", + "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.12", + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.10", + "@babel/helper-compilation-targets": "^7.26.5", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/traverse": "^7.26.10", + "@babel/types": "^7.26.10", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@angular-devkit/build-angular/node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@angular-devkit/build-webpack": { + "version": "0.1902.12", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1902.12.tgz", + "integrity": "sha512-JNwvzaN2RVbG1IClFPXhNpysVwf55nWmVsNN5iQHRXkD3kpqnaOfhUBtlhBBjLf/i6cwKEne2TI8zciaEYr+iw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-devkit/architect": "0.1902.12", + "rxjs": "7.8.1" + }, + "engines": { + "node": "^18.19.1 || ^20.11.1 || >=22.0.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + }, + "peerDependencies": { + "webpack": "^5.30.0", + "webpack-dev-server": "^5.0.2" + } + }, + "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@angular-devkit/core": { + "version": "19.1.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.1.6.tgz", + "integrity": "sha512-4s1RpYFGb/yP6OZ1dnYmU7maFYdhZS9pnUHKKiL9rSDhUHkX+VZlf9WFFrHv2RMWg+evrrwPtiFOTMBLShUi8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "8.17.1", + "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", - "magic-string": "0.30.11", + "picomatch": "4.0.2", + "rxjs": "7.8.1", + "source-map": "0.7.4" + }, + "engines": { + "node": "^18.19.1 || ^20.11.1 || >=22.0.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + }, + "peerDependencies": { + "chokidar": "^4.0.0" + }, + "peerDependenciesMeta": { + "chokidar": { + "optional": true + } + } + }, + "node_modules/@angular-devkit/core/node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@angular-devkit/schematics": { + "version": "19.1.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.1.6.tgz", + "integrity": "sha512-6ljZSVTFqnk0utnXLLd82wM6nj68984n5gfrpT1PlOff6MHHNH2YCfwNSlwg6Q5UfDxhEDIT9/MTLnXd6znIRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-devkit/core": "19.1.6", + "jsonc-parser": "3.3.1", + "magic-string": "0.30.17", "ora": "5.4.1", "rxjs": "7.8.1" }, @@ -437,15 +477,15 @@ } }, "node_modules/@angular-devkit/schematics-cli": { - "version": "18.2.12", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-18.2.12.tgz", - "integrity": "sha512-EJSwWUq3n5aM7D0lyWc+0iiFK7f9nYgY4a+K1kGra7w/FK7y0gtU6HFwr5wYVsw5HGHxX74CHySd83xt0lcvfw==", + "version": "19.1.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-19.1.6.tgz", + "integrity": "sha512-sb6qvHZANAk8xR/Xgwcjiql5HUkIIbsIVEvcLlWJdcg8YogrpBaYf3vLk2eq4FuvrzHzNyD6TMrVaWhYbUw5IQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.12", - "@angular-devkit/schematics": "18.2.12", - "@inquirer/prompts": "5.3.8", + "@angular-devkit/core": "19.1.6", + "@angular-devkit/schematics": "19.1.6", + "@inquirer/prompts": "7.2.1", "ansi-colors": "4.1.3", "symbol-observable": "4.0.0", "yargs-parser": "21.1.1" @@ -459,22 +499,25 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@angular-devkit/schematics/node_modules/jsonc-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", - "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", + "node_modules/@angular-devkit/schematics/node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, - "license": "MIT" + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } }, "node_modules/@angular-eslint/builder": { - "version": "18.4.3", - "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.4.3.tgz", - "integrity": "sha512-NzmrXlr7GFE+cjwipY/CxBscZXNqnuK0us1mO6Z2T6MeH6m+rRcdlY/rZyKoRniyNNvuzl6vpEsfMIMmnfebrA==", + "version": "19.4.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-19.4.0.tgz", + "integrity": "sha512-+mI/YwXiT+IPRNuTNrQqOm97iqbPM5Zc4fxR3p9N1xj1dxLyXJrtGXbbWJPK6i74ON7KdpkY3WLhMKnhWM4RzQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": ">= 0.1800.0 < 0.1900.0", - "@angular-devkit/core": ">= 18.0.0 < 19.0.0" + "@angular-devkit/architect": ">= 0.1900.0 < 0.2000.0", + "@angular-devkit/core": ">= 19.0.0 < 20.0.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", @@ -482,20 +525,21 @@ } }, "node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "18.4.3", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.4.3.tgz", - "integrity": "sha512-zdrA8mR98X+U4YgHzUKmivRU+PxzwOL/j8G7eTOvBuq8GPzsP+hvak+tyxlgeGm9HsvpFj9ERHLtJ0xDUPs8fg==", + "version": "19.4.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-19.4.0.tgz", + "integrity": "sha512-Djq+je34czagDxvkBbbe1dLlhUGYK2MbHjEgPTQ00tVkacLQGAW4UmT1A0JGZzfzl/lDVvli64/lYQsJTSSM6A==", + "dev": true, "license": "MIT" }, "node_modules/@angular-eslint/eslint-plugin": { - "version": "18.4.3", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.4.3.tgz", - "integrity": "sha512-AyJbupiwTBR81P6T59v+aULEnPpZBCBxL2S5QFWfAhNCwWhcof4GihvdK2Z87yhvzDGeAzUFSWl/beJfeFa+PA==", + "version": "19.4.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-19.4.0.tgz", + "integrity": "sha512-jXhyYYIdo5ItCFfmw7W5EqDRQx8rYtiYbpezI84CemKPHB/VPiP/zqLIvdTVBdJdXlqS31ueXn2YlWU0w6AAgg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.3", - "@angular-eslint/utils": "18.4.3" + "@angular-eslint/bundled-angular-compiler": "19.4.0", + "@angular-eslint/utils": "19.4.0" }, "peerDependencies": { "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", @@ -504,14 +548,14 @@ } }, "node_modules/@angular-eslint/eslint-plugin-template": { - "version": "18.4.3", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.4.3.tgz", - "integrity": "sha512-ijGlX2N01ayMXTpeQivOA31AszO8OEbu9ZQUCxnu9AyMMhxyi2q50bujRChAvN9YXQfdQtbxuajxV6+aiWb5BQ==", + "version": "19.4.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-19.4.0.tgz", + "integrity": "sha512-6WAGnHf5SKi7k8/AOOLwGCoN3iQUE8caKsg0OucL4CWPUyzsYpQjx7ALKyxx9lqoAngn3CTlQ2tcwDv6aYtfmg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.3", - "@angular-eslint/utils": "18.4.3", + "@angular-eslint/bundled-angular-compiler": "19.4.0", + "@angular-eslint/utils": "19.4.0", "aria-query": "5.3.2", "axobject-query": "4.1.0" }, @@ -523,39 +567,29 @@ } }, "node_modules/@angular-eslint/schematics": { - "version": "18.4.3", - "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.4.3.tgz", - "integrity": "sha512-D5maKn5e6n58+8n7jLFLD4g+RGPOPeDSsvPc1sqial5tEKLxAJQJS9WZ28oef3bhkob6C60D+1H0mMmEEVvyVA==", + "version": "19.4.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-19.4.0.tgz", + "integrity": "sha512-gW6RkLC5/CHiD1CXjve6LO0iit0EbHyhV6Jnb7FeRhTaFHhktbuI0zQ8wnSI/D0Pm8ZvV1PoNyhB2k2AWZT9sQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": ">= 18.0.0 < 19.0.0", - "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0", - "@angular-eslint/eslint-plugin": "18.4.3", - "@angular-eslint/eslint-plugin-template": "18.4.3", - "ignore": "6.0.2", - "semver": "7.6.3", + "@angular-devkit/core": ">= 19.0.0 < 20.0.0", + "@angular-devkit/schematics": ">= 19.0.0 < 20.0.0", + "@angular-eslint/eslint-plugin": "19.4.0", + "@angular-eslint/eslint-plugin-template": "19.4.0", + "ignore": "7.0.4", + "semver": "7.7.1", "strip-json-comments": "3.1.1" } }, - "node_modules/@angular-eslint/schematics/node_modules/ignore": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz", - "integrity": "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "node_modules/@angular-eslint/template-parser": { - "version": "18.4.3", - "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.4.3.tgz", - "integrity": "sha512-JZMPtEB8yNip3kg4WDEWQyObSo2Hwf+opq2ElYuwe85GQkGhfJSJ2CQYo4FSwd+c5MUQAqESNRg9QqGYauDsiw==", + "version": "19.4.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-19.4.0.tgz", + "integrity": "sha512-f4t7Z6zo8owOTUqAtZ3G/cMA5hfT3RE2OKR0dLn7YI6LxUJkrlcHq75n60UHiapl5sais6heo70hvjQgJ3fDxQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.3", + "@angular-eslint/bundled-angular-compiler": "19.4.0", "eslint-scope": "^8.0.2" }, "peerDependencies": { @@ -564,13 +598,13 @@ } }, "node_modules/@angular-eslint/utils": { - "version": "18.4.3", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.4.3.tgz", - "integrity": "sha512-w0bJ9+ELAEiPBSTPPm9bvDngfu1d8JbzUhvs2vU+z7sIz/HMwUZT5S4naypj2kNN0gZYGYrW0lt+HIbW87zTAQ==", + "version": "19.4.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-19.4.0.tgz", + "integrity": "sha512-2hZ7rf/0YBkn1Rk0i7AlYGlfxQ7+DqEXUsgp1M56mf0cy7/GCFiWZE0lcXFY4kzb4yQK3G2g+kIF092MwelT7Q==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.3" + "@angular-eslint/bundled-angular-compiler": "19.4.0" }, "peerDependencies": { "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", @@ -579,9 +613,9 @@ } }, "node_modules/@angular/animations": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.13.tgz", - "integrity": "sha512-rG5J5Ek5Hg+Tz2NjkNOaG6PupiNK/lPfophXpsR1t/nWujqnMWX2krahD/i6kgD+jNWNKCJCYSOVvCx/BHOtKA==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-19.1.5.tgz", + "integrity": "sha512-jRZgLdSjr94EpBFIyCUZM7YKBi5TO2+J8PKmz7IdNrYNuUaGfy8k816/57Vgmsb18dnpA2Kf7R2AlOpNcDcsOA==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -590,56 +624,64 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.13" + "@angular/core": "19.1.5" } }, "node_modules/@angular/build": { - "version": "18.2.12", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.12.tgz", - "integrity": "sha512-4Ohz+OSILoL+cCAQ4UTiCT5v6pctu3fXNoNpTEUK46OmxELk9jDITO5rNyNS7TxBn9wY69kjX5VcDf7MenquFQ==", + "version": "19.2.12", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-19.2.12.tgz", + "integrity": "sha512-G28ux1T5QDlWporwupWbcodBN3rcyHfK2Dh5M3UC5hj0GstpfEHcpBHxawZzIxhqPKy//tdVLlzORUgvAwnqbA==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1802.12", - "@babel/core": "7.25.2", - "@babel/helper-annotate-as-pure": "7.24.7", + "@angular-devkit/architect": "0.1902.12", + "@babel/core": "7.26.10", + "@babel/helper-annotate-as-pure": "7.25.9", "@babel/helper-split-export-declaration": "7.24.7", - "@babel/plugin-syntax-import-attributes": "7.24.7", - "@inquirer/confirm": "3.1.22", - "@vitejs/plugin-basic-ssl": "1.1.0", + "@babel/plugin-syntax-import-attributes": "7.26.0", + "@inquirer/confirm": "5.1.6", + "@vitejs/plugin-basic-ssl": "1.2.0", + "beasties": "0.3.2", "browserslist": "^4.23.0", - "critters": "0.0.24", - "esbuild": "0.23.0", - "fast-glob": "3.3.2", - "https-proxy-agent": "7.0.5", - "listr2": "8.2.4", - "lmdb": "3.0.13", - "magic-string": "0.30.11", - "mrmime": "2.0.0", + "esbuild": "0.25.4", + "fast-glob": "3.3.3", + "https-proxy-agent": "7.0.6", + "istanbul-lib-instrument": "6.0.3", + "listr2": "8.2.5", + "magic-string": "0.30.17", + "mrmime": "2.0.1", "parse5-html-rewriting-stream": "7.0.0", "picomatch": "4.0.2", - "piscina": "4.6.1", - "rollup": "4.22.4", - "sass": "1.77.6", - "semver": "7.6.3", - "vite": "5.4.6", - "watchpack": "2.4.1" + "piscina": "4.8.0", + "rollup": "4.34.8", + "sass": "1.85.0", + "semver": "7.7.1", + "source-map-support": "0.5.21", + "vite": "6.2.7", + "watchpack": "2.4.2" }, "engines": { "node": "^18.19.1 || ^20.11.1 || >=22.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, + "optionalDependencies": { + "lmdb": "3.2.6" + }, "peerDependencies": { - "@angular/compiler-cli": "^18.0.0", - "@angular/localize": "^18.0.0", - "@angular/platform-server": "^18.0.0", - "@angular/service-worker": "^18.0.0", + "@angular/compiler": "^19.0.0 || ^19.2.0-next.0", + "@angular/compiler-cli": "^19.0.0 || ^19.2.0-next.0", + "@angular/localize": "^19.0.0 || ^19.2.0-next.0", + "@angular/platform-server": "^19.0.0 || ^19.2.0-next.0", + "@angular/service-worker": "^19.0.0 || ^19.2.0-next.0", + "@angular/ssr": "^19.2.12", + "karma": "^6.4.0", "less": "^4.2.0", + "ng-packagr": "^19.0.0 || ^19.2.0-next.0", "postcss": "^8.4.0", - "tailwindcss": "^2.0.0 || ^3.0.0", - "typescript": ">=5.4 <5.6" + "tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0", + "typescript": ">=5.5 <5.9" }, "peerDependenciesMeta": { "@angular/localize": { @@ -651,9 +693,18 @@ "@angular/service-worker": { "optional": true }, + "@angular/ssr": { + "optional": true + }, + "karma": { + "optional": true + }, "less": { "optional": true }, + "ng-packagr": { + "optional": true + }, "postcss": { "optional": true }, @@ -662,23 +713,58 @@ } } }, - "node_modules/@angular/build/node_modules/picomatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", - "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "node_modules/@angular/build/node_modules/@babel/core": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", + "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", "dev": true, "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.10", + "@babel/helper-compilation-targets": "^7.26.5", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/traverse": "^7.26.10", + "@babel/types": "^7.26.10", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, "engines": { - "node": ">=12" + "node": ">=6.9.0" }, "funding": { - "url": "https://github.com/sponsors/jonschlinkert" + "type": "opencollective", + "url": "https://opencollective.com/babel" } }, + "node_modules/@angular/build/node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@angular/build/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, "node_modules/@angular/cdk": { - "version": "18.2.14", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.14.tgz", - "integrity": "sha512-vDyOh1lwjfVk9OqoroZAP8pf3xxKUvyl+TVR8nJxL4c5fOfUFkD7l94HaanqKSRwJcI2xiztuu92IVoHn8T33Q==", + "version": "19.1.3", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-19.1.3.tgz", + "integrity": "sha512-A8d1V4AU2ZcNnEEwAUp4W1uYdT7EKHZM0PGicVhLyeetwYrpHiLoPioD7sw89TlPuJcd6mS7xV6AnXQ8peOoXg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -687,32 +773,32 @@ "parse5": "^7.1.2" }, "peerDependencies": { - "@angular/common": "^18.0.0 || ^19.0.0", - "@angular/core": "^18.0.0 || ^19.0.0", + "@angular/common": "^19.0.0 || ^20.0.0", + "@angular/core": "^19.0.0 || ^20.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/cli": { - "version": "18.2.12", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.12.tgz", - "integrity": "sha512-xhuZ/b7IhqNw1MgXf+arWf4x+GfUSt/IwbdWU4+CO8A7h0Y46zQywouP/KUK3cMQZfVdHdciTBvlpF3vFacA6Q==", + "version": "19.1.6", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-19.1.6.tgz", + "integrity": "sha512-5H9Ri+YNPBnac/h1wTPQ+9mLSXfT1n99FwCtMVy6YnG+akRqOKFmPWB29hkFQAgfXi/MYIj+rQKv+d/9yWJibQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.1802.12", - "@angular-devkit/core": "18.2.12", - "@angular-devkit/schematics": "18.2.12", - "@inquirer/prompts": "5.3.8", - "@listr2/prompt-adapter-inquirer": "2.0.15", - "@schematics/angular": "18.2.12", + "@angular-devkit/architect": "0.1901.6", + "@angular-devkit/core": "19.1.6", + "@angular-devkit/schematics": "19.1.6", + "@inquirer/prompts": "7.2.1", + "@listr2/prompt-adapter-inquirer": "2.0.18", + "@schematics/angular": "19.1.6", "@yarnpkg/lockfile": "1.1.0", - "ini": "4.1.3", + "ini": "5.0.0", "jsonc-parser": "3.3.1", - "listr2": "8.2.4", - "npm-package-arg": "11.0.3", - "npm-pick-manifest": "9.1.0", - "pacote": "18.0.6", - "resolve": "1.22.8", + "listr2": "8.2.5", + "npm-package-arg": "12.0.1", + "npm-pick-manifest": "10.0.0", + "pacote": "20.0.0", + "resolve": "1.22.10", "semver": "7.6.3", "symbol-observable": "4.0.0", "yargs": "17.7.2" @@ -726,17 +812,65 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@angular/cli/node_modules/jsonc-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", - "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", + "node_modules/@angular/cli/node_modules/@angular-devkit/architect": { + "version": "0.1901.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1901.6.tgz", + "integrity": "sha512-JiMrs3T1A7RyF5bh0PLGKDjTR8sa/kh8w63+dW0azcNok30tKjLjwJRPTpePokWefjmRgfKaf/iZ8yfFBnpGpA==", "dev": true, - "license": "MIT" + "license": "MIT", + "dependencies": { + "@angular-devkit/core": "19.1.6", + "rxjs": "7.8.1" + }, + "engines": { + "node": "^18.19.1 || ^20.11.1 || >=22.0.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + } + }, + "node_modules/@angular/cli/node_modules/npm-package-arg": { + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-12.0.1.tgz", + "integrity": "sha512-aDxjFfPV3Liw0WOBWlyZLMBqtbgbg03rmGvHDJa2Ttv7tIz+1oB5qWec4psCDFZcZi9b5XdGkPdQiJxOPzvQRQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "hosted-git-info": "^8.0.0", + "proc-log": "^5.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^6.0.0" + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, + "node_modules/@angular/cli/node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@angular/cli/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } }, "node_modules/@angular/common": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.13.tgz", - "integrity": "sha512-4ZqrNp1PoZo7VNvW+sbSc2CB2axP1sCH2wXl8B0wdjsj8JY1hF1OhuugwhpAHtGxqewed2kCXayE+ZJqSTV4jw==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.1.5.tgz", + "integrity": "sha512-8jR3c5IBMlfiiHvrO8Y2z8y9n4Moy4mI7bS0eu3hmI3m5Vvrgd2Z4GCaQ/Dt4wCtFxcgSsVXiF+/H0QbVdwulA==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -745,14 +879,14 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.13", + "@angular/core": "19.1.5", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.13.tgz", - "integrity": "sha512-TzWcrkopyjFF+WeDr2cRe8CcHjU72KfYV3Sm2TkBkcXrkYX5sDjGWrBGrG3hRB4e4okqchrOCvm1MiTdy2vKMA==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-19.1.5.tgz", + "integrity": "sha512-8dhticSq98qZanbPBqLACykR08eHbh9WyXG4VJB7Ru9465DjOd6sRM3gmGDNvNlohh30S4xJzPhVrzYXmIyqiA==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -761,7 +895,7 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.13" + "@angular/core": "19.1.5" }, "peerDependenciesMeta": { "@angular/core": { @@ -770,13 +904,13 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.13.tgz", - "integrity": "sha512-DBSh4AQwkiJDSiVvJATRmjxf6wyUs9pwQLgaFdSlfuTRO+sdb0J2z1r3BYm8t0IqdoyXzdZq2YCH43EmyvD71g==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-19.1.5.tgz", + "integrity": "sha512-7IHfGklqiTsDYjk2SgOi5sG63gZ60LguT7dhMGtUdy+fUyK0KGofE1w74LwPHQ3huCdu3rBp7HZvC0/IsmiYtA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/core": "7.25.2", + "@babel/core": "7.26.0", "@jridgewell/sourcemap-codec": "^1.4.14", "chokidar": "^4.0.0", "convert-source-map": "^1.5.1", @@ -794,49 +928,14 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/compiler": "18.2.13", - "typescript": ">=5.4 <5.6" - } - }, - "node_modules/@angular/compiler-cli/node_modules/chokidar": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz", - "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==", - "dev": true, - "dependencies": { - "readdirp": "^4.0.1" - }, - "engines": { - "node": ">= 14.16.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@angular/compiler-cli/node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true, - "license": "MIT" - }, - "node_modules/@angular/compiler-cli/node_modules/readdirp": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", - "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==", - "dev": true, - "engines": { - "node": ">= 14.16.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" + "@angular/compiler": "19.1.5", + "typescript": ">=5.5 <5.8" } }, "node_modules/@angular/core": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.13.tgz", - "integrity": "sha512-8mbWHMgO95OuFV1Ejy4oKmbe9NOJ3WazQf/f7wks8Bck7pcihd0IKhlPBNjFllbF5o+04EYSwFhEtvEgjMDClA==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-19.1.5.tgz", + "integrity": "sha512-N4Uh/jRV2Ksj1iBnhIHkB5hzeiF7J9rhUTiztDPaRT7YpFVt2MKiBXrn52HDcKXPaPFrsZBotbZ6oOMdP4rd5g==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -846,13 +945,13 @@ }, "peerDependencies": { "rxjs": "^6.5.3 || ^7.4.0", - "zone.js": "~0.14.10" + "zone.js": "~0.15.0" } }, "node_modules/@angular/forms": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.13.tgz", - "integrity": "sha512-A67D867fu3DSBhdLWWZl/F5pr7v2+dRM2u3U7ZJ0ewh4a+sv+0yqWdJW+a8xIoiHxS+btGEJL2qAKJiH+MCFfg==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-19.1.5.tgz", + "integrity": "sha512-MUebiFrIhwB1m9rp8v/tgftsCmcI5OjUjnbsiuDsPp/291qxbsJ3P/wmvmCHYEJOoFxVLEgOjJvFcmYN/VbxLw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -861,16 +960,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.13", - "@angular/core": "18.2.13", - "@angular/platform-browser": "18.2.13", + "@angular/common": "19.1.5", + "@angular/core": "19.1.5", + "@angular/platform-browser": "19.1.5", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/language-service": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.13.tgz", - "integrity": "sha512-4E4VJDrbOAxS69F9C1twQPbR9AjY47Qlz8+lwg5lJOyUJ4GoEThLbXKfadt/vIeYBwMJ7fIsYWXD0Dlmxh4k+w==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-19.1.5.tgz", + "integrity": "sha512-0ypHzWNkmvSxjp9SDOej4GEHuAGZiqNUeTsmYv3Jmh1Aw3ZUiRHVw7kR0zZ4Fb5hzqrROOVczGaHKaQcQEdj8Q==", "dev": true, "license": "MIT", "engines": { @@ -878,27 +977,27 @@ } }, "node_modules/@angular/material": { - "version": "18.2.14", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.14.tgz", - "integrity": "sha512-28pxzJP49Mymt664WnCtPkKeg7kXUsQKTKGf/Kl95rNTEdTJLbnlcc8wV0rT0yQNR7kXgpfBnG7h0ETLv/iu5Q==", + "version": "19.1.3", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-19.1.3.tgz", + "integrity": "sha512-ii19ow7V8fLsgTvnghDBObte8G0I2orgsG+jwR8fdO1Hp+9d+IEeITLvn2sc7qVofkv/DzG4rCTFaLQdOXRWmg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/animations": "^18.0.0 || ^19.0.0", - "@angular/cdk": "18.2.14", - "@angular/common": "^18.0.0 || ^19.0.0", - "@angular/core": "^18.0.0 || ^19.0.0", - "@angular/forms": "^18.0.0 || ^19.0.0", - "@angular/platform-browser": "^18.0.0 || ^19.0.0", + "@angular/animations": "^19.0.0 || ^20.0.0", + "@angular/cdk": "19.1.3", + "@angular/common": "^19.0.0 || ^20.0.0", + "@angular/core": "^19.0.0 || ^20.0.0", + "@angular/forms": "^19.0.0 || ^20.0.0", + "@angular/platform-browser": "^19.0.0 || ^20.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/platform-browser": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.13.tgz", - "integrity": "sha512-tu7ZzY6qD3ATdWFzcTcsAKe7M6cJeWbT/4/bF9unyGO3XBPcNYDKoiz10+7ap2PUd0fmPwvuvTvSNJiFEBnB8Q==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-19.1.5.tgz", + "integrity": "sha512-wqM4OlGncXNmROTS0mpUpnzzG5DsIZi1U0gzQp5bDOknaFFmg2C2ExCi29CwFZfaOeDw135AyXtu4qItfDOW9A==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -907,9 +1006,9 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/animations": "18.2.13", - "@angular/common": "18.2.13", - "@angular/core": "18.2.13" + "@angular/animations": "19.1.5", + "@angular/common": "19.1.5", + "@angular/core": "19.1.5" }, "peerDependenciesMeta": { "@angular/animations": { @@ -918,9 +1017,9 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.13.tgz", - "integrity": "sha512-kbQCf9+8EpuJC7buBxhSiwBtXvjAwAKh6MznD6zd2pyCYqfY6gfRCZQRtK59IfgVtKmEONWI9grEyNIRoTmqJg==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-19.1.5.tgz", + "integrity": "sha512-mW9Ru5C0/Jg+b2/pWfzfkWmFZ6Exn2J2k+6Unv1Vprh6whF4ch7v5AdBaCuLiK5kUPpQQMHhRz7VY+3mb/dgqQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -929,16 +1028,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.13", - "@angular/compiler": "18.2.13", - "@angular/core": "18.2.13", - "@angular/platform-browser": "18.2.13" + "@angular/common": "19.1.5", + "@angular/compiler": "19.1.5", + "@angular/core": "19.1.5", + "@angular/platform-browser": "19.1.5" } }, "node_modules/@angular/platform-server": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-18.2.13.tgz", - "integrity": "sha512-eYYhFQkjg3rIBY0kG0XLZ3v6ObvDq9SMsGVtsddhlmdhkdO0Sdu9d8hjP7LmioO+60vUG2jNW02ROVMhSNBR5A==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-19.1.5.tgz", + "integrity": "sha512-cG09kFDjHr6p1g7Szf6NfXtb7bM5Vb8XK8qsReACegeugZ+zYZUdDWhDNKYgAmqf0q3rUuJ2UQFx2H25m+W/hQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0", @@ -948,17 +1047,17 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/animations": "18.2.13", - "@angular/common": "18.2.13", - "@angular/compiler": "18.2.13", - "@angular/core": "18.2.13", - "@angular/platform-browser": "18.2.13" + "@angular/animations": "19.1.5", + "@angular/common": "19.1.5", + "@angular/compiler": "19.1.5", + "@angular/core": "19.1.5", + "@angular/platform-browser": "19.1.5" } }, "node_modules/@angular/router": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.13.tgz", - "integrity": "sha512-VKmfgi/r/CkyBq9nChQ/ptmfu0JT/8ONnLVJ5H+SkFLRYJcIRyHLKjRihMCyVm6xM5yktOdCaW73NTQrFz7+bg==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-19.1.5.tgz", + "integrity": "sha512-g5JLymyi+/PTIqKcImSUB9ac1g7szMG/jGax3nTXqwMOzWmxZJJIEKlXWmHJYjUyYEhKBdqLPUMa4JbkD+/jnA==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -967,16 +1066,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.13", - "@angular/core": "18.2.13", - "@angular/platform-browser": "18.2.13", + "@angular/common": "19.1.5", + "@angular/core": "19.1.5", + "@angular/platform-browser": "19.1.5", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/service-worker": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-18.2.13.tgz", - "integrity": "sha512-fVC943qEqGNUy923NMmSSzfoIqNw2k2UbG/3Y4QEmel/nZFWHA3PhiYr+lE7J3RhRHFMmnNP1bmXDJgy+R+pzA==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-19.1.5.tgz", + "integrity": "sha512-luehWWljoNosHD24Ko/iMNrAs/jwGgvVM02TJBDksuOSMQiwpH0x9J+Mx0bDnCMZ3ieBVtROEXQhXAif2AVZEg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -988,22 +1087,22 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.13", - "@angular/core": "18.2.13" + "@angular/core": "19.1.5", + "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/youtube-player": { - "version": "18.2.14", - "resolved": "https://registry.npmjs.org/@angular/youtube-player/-/youtube-player-18.2.14.tgz", - "integrity": "sha512-EDIrJ85JAiBLLZzUtZ7min9XdQD1Ej/5QpIVmrHOlVX05ZBWWfBw1bj96dfPBzRQTLcaFCEVT5HPBvu55cA+/A==", + "version": "19.1.3", + "resolved": "https://registry.npmjs.org/@angular/youtube-player/-/youtube-player-19.1.3.tgz", + "integrity": "sha512-ufCnEGIBGZw0lDdjJtD1BMO9xp2M5HmZt5MnHKG3xRZ2aNaxV6jpKp6D2TggDiBEsyV3tQGmCsOArYg9z3x7+A==", "license": "MIT", "dependencies": { - "@types/youtube": "^0.0.50", + "@types/youtube": "^0.1.0", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^18.0.0 || ^19.0.0", - "@angular/core": "^18.0.0 || ^19.0.0", + "@angular/common": "^19.0.0 || ^20.0.0", + "@angular/core": "^19.0.0 || ^20.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -1210,727 +1309,664 @@ } }, "node_modules/@aws-sdk/client-s3": { - "version": "3.705.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.705.0.tgz", - "integrity": "sha512-Fm0Cbc4zr0yG0DnNycz7ywlL5tQFdLSb7xCIPfzrxJb3YQiTXWxH5eu61SSsP/Z6RBNRolmRPvst/iNgX0fWvA==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.810.0.tgz", + "integrity": "sha512-wM8M0BrqRkbZ9fGaLmAl24CUgVmmLjiKuNTqGOHsdCIc7RV+IGv5CnGK7ciOltAttrFBxvDlhy2lg5F8gNw8Bg==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha1-browser": "5.2.0", "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.699.0", - "@aws-sdk/client-sts": "3.699.0", - "@aws-sdk/core": "3.696.0", - "@aws-sdk/credential-provider-node": "3.699.0", - "@aws-sdk/middleware-bucket-endpoint": "3.696.0", - "@aws-sdk/middleware-expect-continue": "3.696.0", - "@aws-sdk/middleware-flexible-checksums": "3.701.0", - "@aws-sdk/middleware-host-header": "3.696.0", - "@aws-sdk/middleware-location-constraint": "3.696.0", - "@aws-sdk/middleware-logger": "3.696.0", - "@aws-sdk/middleware-recursion-detection": "3.696.0", - "@aws-sdk/middleware-sdk-s3": "3.696.0", - "@aws-sdk/middleware-ssec": "3.696.0", - "@aws-sdk/middleware-user-agent": "3.696.0", - "@aws-sdk/region-config-resolver": "3.696.0", - "@aws-sdk/signature-v4-multi-region": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@aws-sdk/util-endpoints": "3.696.0", - "@aws-sdk/util-user-agent-browser": "3.696.0", - "@aws-sdk/util-user-agent-node": "3.696.0", - "@aws-sdk/xml-builder": "3.696.0", - "@smithy/config-resolver": "^3.0.12", - "@smithy/core": "^2.5.3", - "@smithy/eventstream-serde-browser": "^3.0.13", - "@smithy/eventstream-serde-config-resolver": "^3.0.10", - "@smithy/eventstream-serde-node": "^3.0.12", - "@smithy/fetch-http-handler": "^4.1.1", - "@smithy/hash-blob-browser": "^3.1.9", - "@smithy/hash-node": "^3.0.10", - "@smithy/hash-stream-node": "^3.1.9", - "@smithy/invalid-dependency": "^3.0.10", - "@smithy/md5-js": "^3.0.10", - "@smithy/middleware-content-length": "^3.0.12", - "@smithy/middleware-endpoint": "^3.2.3", - "@smithy/middleware-retry": "^3.0.27", - "@smithy/middleware-serde": "^3.0.10", - "@smithy/middleware-stack": "^3.0.10", - "@smithy/node-config-provider": "^3.1.11", - "@smithy/node-http-handler": "^3.3.1", - "@smithy/protocol-http": "^4.1.7", - "@smithy/smithy-client": "^3.4.4", - "@smithy/types": "^3.7.1", - "@smithy/url-parser": "^3.0.10", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.27", - "@smithy/util-defaults-mode-node": "^3.0.27", - "@smithy/util-endpoints": "^2.1.6", - "@smithy/util-middleware": "^3.0.10", - "@smithy/util-retry": "^3.0.10", - "@smithy/util-stream": "^3.3.1", - "@smithy/util-utf8": "^3.0.0", - "@smithy/util-waiter": "^3.1.9", + "@aws-sdk/core": "3.810.0", + "@aws-sdk/credential-provider-node": "3.810.0", + "@aws-sdk/middleware-bucket-endpoint": "3.808.0", + "@aws-sdk/middleware-expect-continue": "3.804.0", + "@aws-sdk/middleware-flexible-checksums": "3.810.0", + "@aws-sdk/middleware-host-header": "3.804.0", + "@aws-sdk/middleware-location-constraint": "3.804.0", + "@aws-sdk/middleware-logger": "3.804.0", + "@aws-sdk/middleware-recursion-detection": "3.804.0", + "@aws-sdk/middleware-sdk-s3": "3.810.0", + "@aws-sdk/middleware-ssec": "3.804.0", + "@aws-sdk/middleware-user-agent": "3.810.0", + "@aws-sdk/region-config-resolver": "3.808.0", + "@aws-sdk/signature-v4-multi-region": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@aws-sdk/util-endpoints": "3.808.0", + "@aws-sdk/util-user-agent-browser": "3.804.0", + "@aws-sdk/util-user-agent-node": "3.810.0", + "@aws-sdk/xml-builder": "3.804.0", + "@smithy/config-resolver": "^4.1.2", + "@smithy/core": "^3.3.3", + "@smithy/eventstream-serde-browser": "^4.0.2", + "@smithy/eventstream-serde-config-resolver": "^4.1.0", + "@smithy/eventstream-serde-node": "^4.0.2", + "@smithy/fetch-http-handler": "^5.0.2", + "@smithy/hash-blob-browser": "^4.0.2", + "@smithy/hash-node": "^4.0.2", + "@smithy/hash-stream-node": "^4.0.2", + "@smithy/invalid-dependency": "^4.0.2", + "@smithy/md5-js": "^4.0.2", + "@smithy/middleware-content-length": "^4.0.2", + "@smithy/middleware-endpoint": "^4.1.6", + "@smithy/middleware-retry": "^4.1.7", + "@smithy/middleware-serde": "^4.0.5", + "@smithy/middleware-stack": "^4.0.2", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/node-http-handler": "^4.0.4", + "@smithy/protocol-http": "^5.1.0", + "@smithy/smithy-client": "^4.2.6", + "@smithy/types": "^4.2.0", + "@smithy/url-parser": "^4.0.2", + "@smithy/util-base64": "^4.0.0", + "@smithy/util-body-length-browser": "^4.0.0", + "@smithy/util-body-length-node": "^4.0.0", + "@smithy/util-defaults-mode-browser": "^4.0.14", + "@smithy/util-defaults-mode-node": "^4.0.14", + "@smithy/util-endpoints": "^3.0.4", + "@smithy/util-middleware": "^4.0.2", + "@smithy/util-retry": "^4.0.3", + "@smithy/util-stream": "^4.2.0", + "@smithy/util-utf8": "^4.0.0", + "@smithy/util-waiter": "^4.0.3", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.696.0.tgz", - "integrity": "sha512-q5TTkd08JS0DOkHfUL853tuArf7NrPeqoS5UOvqJho8ibV9Ak/a/HO4kNvy9Nj3cib/toHYHsQIEtecUPSUUrQ==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.810.0.tgz", + "integrity": "sha512-Txp/3jHqkfA4BTklQEOGiZ1yTUxg+hITislfaWEzJ904vlDt4DvAljTlhfaz7pceCLA2+LhRlYZYSv7t5b0Ltw==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.696.0", - "@aws-sdk/middleware-host-header": "3.696.0", - "@aws-sdk/middleware-logger": "3.696.0", - "@aws-sdk/middleware-recursion-detection": "3.696.0", - "@aws-sdk/middleware-user-agent": "3.696.0", - "@aws-sdk/region-config-resolver": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@aws-sdk/util-endpoints": "3.696.0", - "@aws-sdk/util-user-agent-browser": "3.696.0", - "@aws-sdk/util-user-agent-node": "3.696.0", - "@smithy/config-resolver": "^3.0.12", - "@smithy/core": "^2.5.3", - "@smithy/fetch-http-handler": "^4.1.1", - "@smithy/hash-node": "^3.0.10", - "@smithy/invalid-dependency": "^3.0.10", - "@smithy/middleware-content-length": "^3.0.12", - "@smithy/middleware-endpoint": "^3.2.3", - "@smithy/middleware-retry": "^3.0.27", - "@smithy/middleware-serde": "^3.0.10", - "@smithy/middleware-stack": "^3.0.10", - "@smithy/node-config-provider": "^3.1.11", - "@smithy/node-http-handler": "^3.3.1", - "@smithy/protocol-http": "^4.1.7", - "@smithy/smithy-client": "^3.4.4", - "@smithy/types": "^3.7.1", - "@smithy/url-parser": "^3.0.10", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.27", - "@smithy/util-defaults-mode-node": "^3.0.27", - "@smithy/util-endpoints": "^2.1.6", - "@smithy/util-middleware": "^3.0.10", - "@smithy/util-retry": "^3.0.10", - "@smithy/util-utf8": "^3.0.0", + "@aws-sdk/core": "3.810.0", + "@aws-sdk/middleware-host-header": "3.804.0", + "@aws-sdk/middleware-logger": "3.804.0", + "@aws-sdk/middleware-recursion-detection": "3.804.0", + "@aws-sdk/middleware-user-agent": "3.810.0", + "@aws-sdk/region-config-resolver": "3.808.0", + "@aws-sdk/types": "3.804.0", + "@aws-sdk/util-endpoints": "3.808.0", + "@aws-sdk/util-user-agent-browser": "3.804.0", + "@aws-sdk/util-user-agent-node": "3.810.0", + "@smithy/config-resolver": "^4.1.2", + "@smithy/core": "^3.3.3", + "@smithy/fetch-http-handler": "^5.0.2", + "@smithy/hash-node": "^4.0.2", + "@smithy/invalid-dependency": "^4.0.2", + "@smithy/middleware-content-length": "^4.0.2", + "@smithy/middleware-endpoint": "^4.1.6", + "@smithy/middleware-retry": "^4.1.7", + "@smithy/middleware-serde": "^4.0.5", + "@smithy/middleware-stack": "^4.0.2", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/node-http-handler": "^4.0.4", + "@smithy/protocol-http": "^5.1.0", + "@smithy/smithy-client": "^4.2.6", + "@smithy/types": "^4.2.0", + "@smithy/url-parser": "^4.0.2", + "@smithy/util-base64": "^4.0.0", + "@smithy/util-body-length-browser": "^4.0.0", + "@smithy/util-body-length-node": "^4.0.0", + "@smithy/util-defaults-mode-browser": "^4.0.14", + "@smithy/util-defaults-mode-node": "^4.0.14", + "@smithy/util-endpoints": "^3.0.4", + "@smithy/util-middleware": "^4.0.2", + "@smithy/util-retry": "^4.0.3", + "@smithy/util-utf8": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.699.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.699.0.tgz", - "integrity": "sha512-u8a1GorY5D1l+4FQAf4XBUC1T10/t7neuwT21r0ymrtMFSK2a9QqVHKMoLkvavAwyhJnARSBM9/UQC797PFOFw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.696.0", - "@aws-sdk/credential-provider-node": "3.699.0", - "@aws-sdk/middleware-host-header": "3.696.0", - "@aws-sdk/middleware-logger": "3.696.0", - "@aws-sdk/middleware-recursion-detection": "3.696.0", - "@aws-sdk/middleware-user-agent": "3.696.0", - "@aws-sdk/region-config-resolver": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@aws-sdk/util-endpoints": "3.696.0", - "@aws-sdk/util-user-agent-browser": "3.696.0", - "@aws-sdk/util-user-agent-node": "3.696.0", - "@smithy/config-resolver": "^3.0.12", - "@smithy/core": "^2.5.3", - "@smithy/fetch-http-handler": "^4.1.1", - "@smithy/hash-node": "^3.0.10", - "@smithy/invalid-dependency": "^3.0.10", - "@smithy/middleware-content-length": "^3.0.12", - "@smithy/middleware-endpoint": "^3.2.3", - "@smithy/middleware-retry": "^3.0.27", - "@smithy/middleware-serde": "^3.0.10", - "@smithy/middleware-stack": "^3.0.10", - "@smithy/node-config-provider": "^3.1.11", - "@smithy/node-http-handler": "^3.3.1", - "@smithy/protocol-http": "^4.1.7", - "@smithy/smithy-client": "^3.4.4", - "@smithy/types": "^3.7.1", - "@smithy/url-parser": "^3.0.10", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.27", - "@smithy/util-defaults-mode-node": "^3.0.27", - "@smithy/util-endpoints": "^2.1.6", - "@smithy/util-middleware": "^3.0.10", - "@smithy/util-retry": "^3.0.10", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.699.0" - } - }, - "node_modules/@aws-sdk/client-sts": { - "version": "3.699.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.699.0.tgz", - "integrity": "sha512-++lsn4x2YXsZPIzFVwv3fSUVM55ZT0WRFmPeNilYIhZClxHLmVAWKH4I55cY9ry60/aTKYjzOXkWwyBKGsGvQg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.699.0", - "@aws-sdk/core": "3.696.0", - "@aws-sdk/credential-provider-node": "3.699.0", - "@aws-sdk/middleware-host-header": "3.696.0", - "@aws-sdk/middleware-logger": "3.696.0", - "@aws-sdk/middleware-recursion-detection": "3.696.0", - "@aws-sdk/middleware-user-agent": "3.696.0", - "@aws-sdk/region-config-resolver": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@aws-sdk/util-endpoints": "3.696.0", - "@aws-sdk/util-user-agent-browser": "3.696.0", - "@aws-sdk/util-user-agent-node": "3.696.0", - "@smithy/config-resolver": "^3.0.12", - "@smithy/core": "^2.5.3", - "@smithy/fetch-http-handler": "^4.1.1", - "@smithy/hash-node": "^3.0.10", - "@smithy/invalid-dependency": "^3.0.10", - "@smithy/middleware-content-length": "^3.0.12", - "@smithy/middleware-endpoint": "^3.2.3", - "@smithy/middleware-retry": "^3.0.27", - "@smithy/middleware-serde": "^3.0.10", - "@smithy/middleware-stack": "^3.0.10", - "@smithy/node-config-provider": "^3.1.11", - "@smithy/node-http-handler": "^3.3.1", - "@smithy/protocol-http": "^4.1.7", - "@smithy/smithy-client": "^3.4.4", - "@smithy/types": "^3.7.1", - "@smithy/url-parser": "^3.0.10", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.27", - "@smithy/util-defaults-mode-node": "^3.0.27", - "@smithy/util-endpoints": "^2.1.6", - "@smithy/util-middleware": "^3.0.10", - "@smithy/util-retry": "^3.0.10", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/core": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.696.0.tgz", - "integrity": "sha512-3c9III1k03DgvRZWg8vhVmfIXPG6hAciN9MzQTzqGngzWAELZF/WONRTRQuDFixVtarQatmLHYVw/atGeA2Byw==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.810.0.tgz", + "integrity": "sha512-s2IJk+qa/15YZcv3pbdQNATDR+YdYnHf94MrAeVAWubtRLnzD8JciC+gh4LSPp7JzrWSvVOg2Ut1S+0y89xqCg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@smithy/core": "^2.5.3", - "@smithy/node-config-provider": "^3.1.11", - "@smithy/property-provider": "^3.1.9", - "@smithy/protocol-http": "^4.1.7", - "@smithy/signature-v4": "^4.2.2", - "@smithy/smithy-client": "^3.4.4", - "@smithy/types": "^3.7.1", - "@smithy/util-middleware": "^3.0.10", + "@aws-sdk/types": "3.804.0", + "@smithy/core": "^3.3.3", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/property-provider": "^4.0.2", + "@smithy/protocol-http": "^5.1.0", + "@smithy/signature-v4": "^5.1.0", + "@smithy/smithy-client": "^4.2.6", + "@smithy/types": "^4.2.0", + "@smithy/util-middleware": "^4.0.2", "fast-xml-parser": "4.4.1", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.696.0.tgz", - "integrity": "sha512-T9iMFnJL7YTlESLpVFT3fg1Lkb1lD+oiaIC8KMpepb01gDUBIpj9+Y+pA/cgRWW0yRxmkDXNazAE2qQTVFGJzA==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.810.0.tgz", + "integrity": "sha512-iwHqF+KryKONfbdFk3iKhhPk4fHxh5QP5fXXR//jhYwmszaLOwc7CLCE9AxhgiMzAs+kV8nBFQZvdjFpPzVGOA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@smithy/property-provider": "^3.1.9", - "@smithy/types": "^3.7.1", + "@aws-sdk/core": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@smithy/property-provider": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.696.0.tgz", - "integrity": "sha512-GV6EbvPi2eq1+WgY/o2RFA3P7HGmnkIzCNmhwtALFlqMroLYWKE7PSeHw66Uh1dFQeVESn0/+hiUNhu1mB0emA==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.810.0.tgz", + "integrity": "sha512-SKzjLd+8ugif7yy9sOAAdnPE1vCBHQe6jKgs2AadMpCmWm34DiHz/KuulHdvURUGMIi7CvmaC8aH77twDPYbtg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@smithy/fetch-http-handler": "^4.1.1", - "@smithy/node-http-handler": "^3.3.1", - "@smithy/property-provider": "^3.1.9", - "@smithy/protocol-http": "^4.1.7", - "@smithy/smithy-client": "^3.4.4", - "@smithy/types": "^3.7.1", - "@smithy/util-stream": "^3.3.1", + "@aws-sdk/core": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@smithy/fetch-http-handler": "^5.0.2", + "@smithy/node-http-handler": "^4.0.4", + "@smithy/property-provider": "^4.0.2", + "@smithy/protocol-http": "^5.1.0", + "@smithy/smithy-client": "^4.2.6", + "@smithy/types": "^4.2.0", + "@smithy/util-stream": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.699.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.699.0.tgz", - "integrity": "sha512-dXmCqjJnKmG37Q+nLjPVu22mNkrGHY8hYoOt3Jo9R2zr5MYV7s/NHsCHr+7E+BZ+tfZYLRPeB1wkpTeHiEcdRw==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.810.0.tgz", + "integrity": "sha512-H2QCSnxWJ/mj8HTcyHmCmyQ5bO/+imRi4mlBIpUyKjiYKro52WD3gXlGgPIDo2q3UFIHq37kmYvS00i+qIY9tw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.696.0", - "@aws-sdk/credential-provider-env": "3.696.0", - "@aws-sdk/credential-provider-http": "3.696.0", - "@aws-sdk/credential-provider-process": "3.696.0", - "@aws-sdk/credential-provider-sso": "3.699.0", - "@aws-sdk/credential-provider-web-identity": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@smithy/credential-provider-imds": "^3.2.6", - "@smithy/property-provider": "^3.1.9", - "@smithy/shared-ini-file-loader": "^3.1.10", - "@smithy/types": "^3.7.1", + "@aws-sdk/core": "3.810.0", + "@aws-sdk/credential-provider-env": "3.810.0", + "@aws-sdk/credential-provider-http": "3.810.0", + "@aws-sdk/credential-provider-process": "3.810.0", + "@aws-sdk/credential-provider-sso": "3.810.0", + "@aws-sdk/credential-provider-web-identity": "3.810.0", + "@aws-sdk/nested-clients": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@smithy/credential-provider-imds": "^4.0.4", + "@smithy/property-provider": "^4.0.2", + "@smithy/shared-ini-file-loader": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.699.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.699.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.699.0.tgz", - "integrity": "sha512-MmEmNDo1bBtTgRmdNfdQksXu4uXe66s0p1hi1YPrn1h59Q605eq/xiWbGL6/3KdkViH6eGUuABeV2ODld86ylg==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.810.0.tgz", + "integrity": "sha512-9E3Chv3x+RBM3N1bwLCyvXxoiPAckCI74wG7ePN4F3b/7ieIkbEl/3Hd67j1fnt62Xa1cjUHRu2tz5pdEv5G1Q==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/credential-provider-env": "3.696.0", - "@aws-sdk/credential-provider-http": "3.696.0", - "@aws-sdk/credential-provider-ini": "3.699.0", - "@aws-sdk/credential-provider-process": "3.696.0", - "@aws-sdk/credential-provider-sso": "3.699.0", - "@aws-sdk/credential-provider-web-identity": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@smithy/credential-provider-imds": "^3.2.6", - "@smithy/property-provider": "^3.1.9", - "@smithy/shared-ini-file-loader": "^3.1.10", - "@smithy/types": "^3.7.1", + "@aws-sdk/credential-provider-env": "3.810.0", + "@aws-sdk/credential-provider-http": "3.810.0", + "@aws-sdk/credential-provider-ini": "3.810.0", + "@aws-sdk/credential-provider-process": "3.810.0", + "@aws-sdk/credential-provider-sso": "3.810.0", + "@aws-sdk/credential-provider-web-identity": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@smithy/credential-provider-imds": "^4.0.4", + "@smithy/property-provider": "^4.0.2", + "@smithy/shared-ini-file-loader": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.696.0.tgz", - "integrity": "sha512-mL1RcFDe9sfmyU5K1nuFkO8UiJXXxLX4JO1gVaDIOvPqwStpUAwi3A1BoeZhWZZNQsiKI810RnYGo0E0WB/hUA==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.810.0.tgz", + "integrity": "sha512-42kE6MLdsmMGp1id3Gisal4MbMiF7PIc0tAznTeIuE8r7cIF8yeQWw/PBOIvjyI57DxbyKzLUAMEJuigUpApCw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@smithy/property-provider": "^3.1.9", - "@smithy/shared-ini-file-loader": "^3.1.10", - "@smithy/types": "^3.7.1", + "@aws-sdk/core": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@smithy/property-provider": "^4.0.2", + "@smithy/shared-ini-file-loader": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.699.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.699.0.tgz", - "integrity": "sha512-Ekp2cZG4pl9D8+uKWm4qO1xcm8/MeiI8f+dnlZm8aQzizeC+aXYy9GyoclSf6daK8KfRPiRfM7ZHBBL5dAfdMA==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.810.0.tgz", + "integrity": "sha512-8WjX6tz+FCvM93Y33gsr13p/HiiTJmVn5AK1O8PTkvHBclQDzmtAW5FdPqTpAJGswLW2FB0xRqdsSMN2dQEjNw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-sso": "3.696.0", - "@aws-sdk/core": "3.696.0", - "@aws-sdk/token-providers": "3.699.0", - "@aws-sdk/types": "3.696.0", - "@smithy/property-provider": "^3.1.9", - "@smithy/shared-ini-file-loader": "^3.1.10", - "@smithy/types": "^3.7.1", + "@aws-sdk/client-sso": "3.810.0", + "@aws-sdk/core": "3.810.0", + "@aws-sdk/token-providers": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@smithy/property-provider": "^4.0.2", + "@smithy/shared-ini-file-loader": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.696.0.tgz", - "integrity": "sha512-XJ/CVlWChM0VCoc259vWguFUjJDn/QwDqHwbx+K9cg3v6yrqXfK5ai+p/6lx0nQpnk4JzPVeYYxWRpaTsGC9rg==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.810.0.tgz", + "integrity": "sha512-uKQJY0AcPyrvMmfGLo36semgjqJ4vmLTqOSW9u40qQDspRnG73/P09lAO2ntqKlhwvMBt3XfcNnOpyyhKRcOfA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@smithy/property-provider": "^3.1.9", - "@smithy/types": "^3.7.1", + "@aws-sdk/core": "3.810.0", + "@aws-sdk/nested-clients": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@smithy/property-provider": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.696.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/middleware-bucket-endpoint": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.696.0.tgz", - "integrity": "sha512-V07jishKHUS5heRNGFpCWCSTjRJyQLynS/ncUeE8ZYtG66StOOQWftTwDfFOSoXlIqrXgb4oT9atryzXq7Z4LQ==", + "version": "3.808.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.808.0.tgz", + "integrity": "sha512-wEPlNcs8dir9lXbuviEGtSzYSxG/NRKQrJk5ybOc7OpPGHovsN+QhDOdY3lcjOFdwMTiMIG9foUkPz3zBpLB1A==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@aws-sdk/util-arn-parser": "3.693.0", - "@smithy/node-config-provider": "^3.1.11", - "@smithy/protocol-http": "^4.1.7", - "@smithy/types": "^3.7.1", - "@smithy/util-config-provider": "^3.0.0", + "@aws-sdk/types": "3.804.0", + "@aws-sdk/util-arn-parser": "3.804.0", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/protocol-http": "^5.1.0", + "@smithy/types": "^4.2.0", + "@smithy/util-config-provider": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/middleware-expect-continue": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.696.0.tgz", - "integrity": "sha512-vpVukqY3U2pb+ULeX0shs6L0aadNep6kKzjme/MyulPjtUDJpD3AekHsXRrCCGLmOqSKqRgQn5zhV9pQhHsb6Q==", + "version": "3.804.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.804.0.tgz", + "integrity": "sha512-YW1hySBolALMII6C8y7Z0CRG2UX1dGJjLEBNFeefhO/xP7ZuE1dvnmfJGaEuBMnvc3wkRS63VZ3aqX6sevM1CA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@smithy/protocol-http": "^4.1.7", - "@smithy/types": "^3.7.1", + "@aws-sdk/types": "3.804.0", + "@smithy/protocol-http": "^5.1.0", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/middleware-flexible-checksums": { - "version": "3.701.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.701.0.tgz", - "integrity": "sha512-adNaPCyTT+CiVM0ufDiO1Fe7nlRmJdI9Hcgj0M9S6zR7Dw70Ra5z8Lslkd7syAccYvZaqxLklGjPQH/7GNxwTA==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.810.0.tgz", + "integrity": "sha512-lF5fse+26hluElOtDZMsi5EH50G13OEqglFgpSc6xWnqNhbDc+CnPQRMwTVlOJBDR1/YVbJ15LOKf4pkat46Eg==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/crc32": "5.2.0", "@aws-crypto/crc32c": "5.2.0", "@aws-crypto/util": "5.2.0", - "@aws-sdk/core": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@smithy/is-array-buffer": "^3.0.0", - "@smithy/node-config-provider": "^3.1.11", - "@smithy/protocol-http": "^4.1.7", - "@smithy/types": "^3.7.1", - "@smithy/util-middleware": "^3.0.10", - "@smithy/util-stream": "^3.3.1", - "@smithy/util-utf8": "^3.0.0", + "@aws-sdk/core": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@smithy/is-array-buffer": "^4.0.0", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/protocol-http": "^5.1.0", + "@smithy/types": "^4.2.0", + "@smithy/util-middleware": "^4.0.2", + "@smithy/util-stream": "^4.2.0", + "@smithy/util-utf8": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.696.0.tgz", - "integrity": "sha512-zELJp9Ta2zkX7ELggMN9qMCgekqZhFC5V2rOr4hJDEb/Tte7gpfKSObAnw/3AYiVqt36sjHKfdkoTsuwGdEoDg==", + "version": "3.804.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.804.0.tgz", + "integrity": "sha512-bum1hLVBrn2lJCi423Z2fMUYtsbkGI2s4N+2RI2WSjvbaVyMSv/WcejIrjkqiiMR+2Y7m5exgoKeg4/TODLDPQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@smithy/protocol-http": "^4.1.7", - "@smithy/types": "^3.7.1", + "@aws-sdk/types": "3.804.0", + "@smithy/protocol-http": "^5.1.0", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/middleware-location-constraint": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.696.0.tgz", - "integrity": "sha512-FgH12OB0q+DtTrP2aiDBddDKwL4BPOrm7w3VV9BJrSdkqQCNBPz8S1lb0y5eVH4tBG+2j7gKPlOv1wde4jF/iw==", + "version": "3.804.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.804.0.tgz", + "integrity": "sha512-AMtKnllIWKgoo7hiJfphLYotEwTERfjVMO2+cKAncz9w1g+bnYhHxiVhJJoR94y047c06X4PU5MsTxvdQ73Znw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@smithy/types": "^3.7.1", + "@aws-sdk/types": "3.804.0", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.696.0.tgz", - "integrity": "sha512-KhkHt+8AjCxcR/5Zp3++YPJPpFQzxpr+jmONiT/Jw2yqnSngZ0Yspm5wGoRx2hS1HJbyZNuaOWEGuJoxLeBKfA==", + "version": "3.804.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.804.0.tgz", + "integrity": "sha512-w/qLwL3iq0KOPQNat0Kb7sKndl9BtceigINwBU7SpkYWX9L/Lem6f8NPEKrC9Tl4wDBht3Yztub4oRTy/horJA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@smithy/types": "^3.7.1", + "@aws-sdk/types": "3.804.0", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.696.0.tgz", - "integrity": "sha512-si/maV3Z0hH7qa99f9ru2xpS5HlfSVcasRlNUXKSDm611i7jFMWwGNLUOXFAOLhXotPX5G3Z6BLwL34oDeBMug==", + "version": "3.804.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.804.0.tgz", + "integrity": "sha512-zqHOrvLRdsUdN/ehYfZ9Tf8svhbiLLz5VaWUz22YndFv6m9qaAcijkpAOlKexsv3nLBMJdSdJ6GUTAeIy3BZzw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@smithy/protocol-http": "^4.1.7", - "@smithy/types": "^3.7.1", + "@aws-sdk/types": "3.804.0", + "@smithy/protocol-http": "^5.1.0", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/middleware-sdk-s3": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.696.0.tgz", - "integrity": "sha512-M7fEiAiN7DBMHflzOFzh1I2MNSlLpbiH2ubs87bdRc2wZsDPSbs4l3v6h3WLhxoQK0bq6vcfroudrLBgvCuX3Q==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.810.0.tgz", + "integrity": "sha512-CmQHPVopJYDiGQOmqn5AcmhksQ9qNETF0VgU251Q4tsP9s3R9nBR1r2bZwLt5+dCtf9UCa7cBw4jXKHtH38JTg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@aws-sdk/util-arn-parser": "3.693.0", - "@smithy/core": "^2.5.3", - "@smithy/node-config-provider": "^3.1.11", - "@smithy/protocol-http": "^4.1.7", - "@smithy/signature-v4": "^4.2.2", - "@smithy/smithy-client": "^3.4.4", - "@smithy/types": "^3.7.1", - "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.10", - "@smithy/util-stream": "^3.3.1", - "@smithy/util-utf8": "^3.0.0", + "@aws-sdk/core": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@aws-sdk/util-arn-parser": "3.804.0", + "@smithy/core": "^3.3.3", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/protocol-http": "^5.1.0", + "@smithy/signature-v4": "^5.1.0", + "@smithy/smithy-client": "^4.2.6", + "@smithy/types": "^4.2.0", + "@smithy/util-config-provider": "^4.0.0", + "@smithy/util-middleware": "^4.0.2", + "@smithy/util-stream": "^4.2.0", + "@smithy/util-utf8": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/middleware-ssec": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.696.0.tgz", - "integrity": "sha512-w/d6O7AOZ7Pg3w2d3BxnX5RmGNWb5X4RNxF19rJqcgu/xqxxE/QwZTNd5a7eTsqLXAUIfbbR8hh0czVfC1pJLA==", + "version": "3.804.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.804.0.tgz", + "integrity": "sha512-Tk8jK0gOIUBvEPTz/wwSlP1V70zVQ3QYqsLPAjQRMO6zfOK9ax31dln3MgKvFDJxBydS2tS3wsn53v+brxDxTA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@smithy/types": "^3.7.1", + "@aws-sdk/types": "3.804.0", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.696.0.tgz", - "integrity": "sha512-Lvyj8CTyxrHI6GHd2YVZKIRI5Fmnugt3cpJo0VrKKEgK5zMySwEZ1n4dqPK6czYRWKd5+WnYHYAuU+Wdk6Jsjw==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.810.0.tgz", + "integrity": "sha512-gLMJcqgIq7k9skX8u0Yyi+jil4elbsmLf3TuDuqNdlqiZ44/AKdDFfU3mU5tRUtMfP42a3gvb2U3elP0BIeybQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@aws-sdk/util-endpoints": "3.696.0", - "@smithy/core": "^2.5.3", - "@smithy/protocol-http": "^4.1.7", - "@smithy/types": "^3.7.1", + "@aws-sdk/core": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@aws-sdk/util-endpoints": "3.808.0", + "@smithy/core": "^3.3.3", + "@smithy/protocol-http": "^5.1.0", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/nested-clients": { + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.810.0.tgz", + "integrity": "sha512-w+tGXFSQjzvJ3j2sQ4GJRdD+YXLTgwLd9eG/A+7pjrv2yLLV70M4HqRrFqH06JBjqT5rsOxonc/QSjROyxk+IA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.810.0", + "@aws-sdk/middleware-host-header": "3.804.0", + "@aws-sdk/middleware-logger": "3.804.0", + "@aws-sdk/middleware-recursion-detection": "3.804.0", + "@aws-sdk/middleware-user-agent": "3.810.0", + "@aws-sdk/region-config-resolver": "3.808.0", + "@aws-sdk/types": "3.804.0", + "@aws-sdk/util-endpoints": "3.808.0", + "@aws-sdk/util-user-agent-browser": "3.804.0", + "@aws-sdk/util-user-agent-node": "3.810.0", + "@smithy/config-resolver": "^4.1.2", + "@smithy/core": "^3.3.3", + "@smithy/fetch-http-handler": "^5.0.2", + "@smithy/hash-node": "^4.0.2", + "@smithy/invalid-dependency": "^4.0.2", + "@smithy/middleware-content-length": "^4.0.2", + "@smithy/middleware-endpoint": "^4.1.6", + "@smithy/middleware-retry": "^4.1.7", + "@smithy/middleware-serde": "^4.0.5", + "@smithy/middleware-stack": "^4.0.2", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/node-http-handler": "^4.0.4", + "@smithy/protocol-http": "^5.1.0", + "@smithy/smithy-client": "^4.2.6", + "@smithy/types": "^4.2.0", + "@smithy/url-parser": "^4.0.2", + "@smithy/util-base64": "^4.0.0", + "@smithy/util-body-length-browser": "^4.0.0", + "@smithy/util-body-length-node": "^4.0.0", + "@smithy/util-defaults-mode-browser": "^4.0.14", + "@smithy/util-defaults-mode-node": "^4.0.14", + "@smithy/util-endpoints": "^3.0.4", + "@smithy/util-middleware": "^4.0.2", + "@smithy/util-retry": "^4.0.3", + "@smithy/util-utf8": "^4.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.696.0.tgz", - "integrity": "sha512-7EuH142lBXjI8yH6dVS/CZeiK/WZsmb/8zP6bQbVYpMrppSTgB3MzZZdxVZGzL5r8zPQOU10wLC4kIMy0qdBVQ==", + "version": "3.808.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.808.0.tgz", + "integrity": "sha512-9x2QWfphkARZY5OGkl9dJxZlSlYM2l5inFeo2bKntGuwg4A4YUe5h7d5yJ6sZbam9h43eBrkOdumx03DAkQF9A==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@smithy/node-config-provider": "^3.1.11", - "@smithy/types": "^3.7.1", - "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.10", + "@aws-sdk/types": "3.804.0", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/types": "^4.2.0", + "@smithy/util-config-provider": "^4.0.0", + "@smithy/util-middleware": "^4.0.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/s3-request-presigner": { - "version": "3.705.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.705.0.tgz", - "integrity": "sha512-dAQiXv/TqjEUCoEeiKqQGI8LJ3g8Xv+XJL4W9CwsB6ZHHDq0Q05ulpDSkhhCf52ySXf5dJ33e1o/VeUDY3q0pw==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.810.0.tgz", + "integrity": "sha512-/6TISQT3HUOoY3Gli1EvQVISNGp8XawGKD4igJqwyF3l35VvajzaAfhwk+Tm5TKTCkFh8EFnqWeT+mId5AaUbA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/signature-v4-multi-region": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@aws-sdk/util-format-url": "3.696.0", - "@smithy/middleware-endpoint": "^3.2.3", - "@smithy/protocol-http": "^4.1.7", - "@smithy/smithy-client": "^3.4.4", - "@smithy/types": "^3.7.1", + "@aws-sdk/signature-v4-multi-region": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@aws-sdk/util-format-url": "3.804.0", + "@smithy/middleware-endpoint": "^4.1.6", + "@smithy/protocol-http": "^5.1.0", + "@smithy/smithy-client": "^4.2.6", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/signature-v4-multi-region": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.696.0.tgz", - "integrity": "sha512-ijPkoLjXuPtgxAYlDoYls8UaG/VKigROn9ebbvPL/orEY5umedd3iZTcS9T+uAf4Ur3GELLxMQiERZpfDKaz3g==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.810.0.tgz", + "integrity": "sha512-6F6evHRrA0OG/H67YuZBcI7EH4A0O5dIhczo2N0AK9z495uSIv+0xUrSrDhFTZxZjo6gkADIXroRjP1kwqK6ew==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/middleware-sdk-s3": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@smithy/protocol-http": "^4.1.7", - "@smithy/signature-v4": "^4.2.2", - "@smithy/types": "^3.7.1", + "@aws-sdk/middleware-sdk-s3": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@smithy/protocol-http": "^5.1.0", + "@smithy/signature-v4": "^5.1.0", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.699.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.699.0.tgz", - "integrity": "sha512-kuiEW9DWs7fNos/SM+y58HCPhcIzm1nEZLhe2/7/6+TvAYLuEWURYsbK48gzsxXlaJ2k/jGY3nIsA7RptbMOwA==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.810.0.tgz", + "integrity": "sha512-fdgHRCDpnzsD+0km7zuRbHRysJECfS8o9T9/pZ6XAr1z2FNV/UveHtnUYq0j6XpDMrIm0/suvXbshIjQU+a+sw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@smithy/property-provider": "^3.1.9", - "@smithy/shared-ini-file-loader": "^3.1.10", - "@smithy/types": "^3.7.1", + "@aws-sdk/nested-clients": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@smithy/property-provider": "^4.0.2", + "@smithy/shared-ini-file-loader": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sso-oidc": "^3.699.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/types": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.696.0.tgz", - "integrity": "sha512-9rTvUJIAj5d3//U5FDPWGJ1nFJLuWb30vugGOrWk7aNZ6y9tuA3PI7Cc9dP8WEXKVyK1vuuk8rSFP2iqXnlgrw==", + "version": "3.804.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.804.0.tgz", + "integrity": "sha512-A9qnsy9zQ8G89vrPPlNG9d1d8QcKRGqJKqwyGgS0dclJpwy6d1EWgQLIolKPl6vcFpLoe6avLOLxr+h8ur5wpg==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.1", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/util-arn-parser": { - "version": "3.693.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.693.0.tgz", - "integrity": "sha512-WC8x6ca+NRrtpAH64rWu+ryDZI3HuLwlEr8EU6/dbC/pt+r/zC0PBoC15VEygUaBA+isppCikQpGyEDu0Yj7gQ==", + "version": "3.804.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.804.0.tgz", + "integrity": "sha512-wmBJqn1DRXnZu3b4EkE6CWnoWMo1ZMvlfkqU5zPz67xx1GMaXlDCchFvKAXMjk4jn/L1O3tKnoFDNsoLV1kgNQ==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.696.0.tgz", - "integrity": "sha512-T5s0IlBVX+gkb9g/I6CLt4yAZVzMSiGnbUqWihWsHvQR1WOoIcndQy/Oz/IJXT9T2ipoy7a80gzV6a5mglrioA==", + "version": "3.808.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.808.0.tgz", + "integrity": "sha512-N6Lic98uc4ADB7fLWlzx+1uVnq04VgVjngZvwHoujcRg9YDhIg9dUDiTzD5VZv13g1BrPYmvYP1HhsildpGV6w==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@smithy/types": "^3.7.1", - "@smithy/util-endpoints": "^2.1.6", + "@aws-sdk/types": "3.804.0", + "@smithy/types": "^4.2.0", + "@smithy/util-endpoints": "^3.0.4", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/util-format-url": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.696.0.tgz", - "integrity": "sha512-R6yK1LozUD1GdAZRPhNsIow6VNFJUTyyoIar1OCWaknlucBMcq7musF3DN3TlORBwfFMj5buHc2ET9OtMtzvuA==", + "version": "3.804.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.804.0.tgz", + "integrity": "sha512-1nOwSg7B0bj5LFGor0udF/HSdvDuSCxP+NC0IuSOJ5RgJ2AphFo03pLtK2UwArHY5WWZaejAEz5VBND6xxOEhA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@smithy/querystring-builder": "^3.0.10", - "@smithy/types": "^3.7.1", + "@aws-sdk/types": "3.804.0", + "@smithy/querystring-builder": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/util-locate-window": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz", - "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig==", + "version": "3.804.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.804.0.tgz", + "integrity": "sha512-zVoRfpmBVPodYlnMjgVjfGoEZagyRF5IPn3Uo6ZvOZp24chnW/FRstH7ESDHDDRga4z3V+ElUQHKpFDXWyBW5A==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.696.0.tgz", - "integrity": "sha512-Z5rVNDdmPOe6ELoM5AhF/ja5tSjbe6ctSctDPb0JdDf4dT0v2MfwhJKzXju2RzX8Es/77Glh7MlaXLE0kCB9+Q==", + "version": "3.804.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.804.0.tgz", + "integrity": "sha512-KfW6T6nQHHM/vZBBdGn6fMyG/MgX5lq82TDdX4HRQRRuHKLgBWGpKXqqvBwqIaCdXwWHgDrg2VQups6GqOWW2A==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.696.0", - "@smithy/types": "^3.7.1", + "@aws-sdk/types": "3.804.0", + "@smithy/types": "^4.2.0", "bowser": "^2.11.0", "tslib": "^2.6.2" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.696.0.tgz", - "integrity": "sha512-KhKqcfyXIB0SCCt+qsu4eJjsfiOrNzK5dCV7RAW2YIpp+msxGUUX0NdRE9rkzjiv+3EMktgJm3eEIS+yxtlVdQ==", + "version": "3.810.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.810.0.tgz", + "integrity": "sha512-T56/ANEGNuvhqVoWZdr+0ZY2hjV93cH2OfGHIlVTVSAMACWG54XehDPESEso1CJNhJGYZPsE+FE42HGCk/XDMg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/middleware-user-agent": "3.696.0", - "@aws-sdk/types": "3.696.0", - "@smithy/node-config-provider": "^3.1.11", - "@smithy/types": "^3.7.1", + "@aws-sdk/middleware-user-agent": "3.810.0", + "@aws-sdk/types": "3.804.0", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { "aws-crt": ">=1.0.0" @@ -1942,36 +1978,37 @@ } }, "node_modules/@aws-sdk/xml-builder": { - "version": "3.696.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.696.0.tgz", - "integrity": "sha512-dn1mX+EeqivoLYnY7p2qLrir0waPnCgS/0YdRCAVU2x14FgfUYCH6Im3w3oi2dMwhxfKY5lYVB5NKvZu7uI9lQ==", + "version": "3.804.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.804.0.tgz", + "integrity": "sha512-JbGWp36IG9dgxtvC6+YXwt5WDZYfuamWFtVfK6fQpnmL96dx+GUPOXPKRWdw67WLKf2comHY28iX2d3z35I53Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.1", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", + "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/highlight": "^7.24.7", - "picocolors": "^1.0.0" + "@babel/helper-validator-identifier": "^7.27.1", + "js-tokens": "^4.0.0", + "picocolors": "^1.1.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/compat-data": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.2.tgz", - "integrity": "sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==", + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.2.tgz", + "integrity": "sha512-TUtMJYRPyUb/9aU8f3K0mjmjf6M9N5Woshn2CS6nqJSeJtTtQcpLUXjGt9vbF8ZGff0El99sWkLgzwW3VXnxZQ==", "dev": true, "license": "MIT", "engines": { @@ -1979,22 +2016,22 @@ } }, "node_modules/@babel/core": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", - "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", + "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.0", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-module-transforms": "^7.25.2", - "@babel/helpers": "^7.25.0", - "@babel/parser": "^7.25.0", - "@babel/template": "^7.25.0", - "@babel/traverse": "^7.25.2", - "@babel/types": "^7.25.2", + "@babel/code-frame": "^7.26.0", + "@babel/generator": "^7.26.0", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.0", + "@babel/parser": "^7.26.0", + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.26.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -2009,6 +2046,13 @@ "url": "https://opencollective.com/babel" } }, + "node_modules/@babel/core/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, "node_modules/@babel/core/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -2020,58 +2064,45 @@ } }, "node_modules/@babel/generator": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz", - "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.10.tgz", + "integrity": "sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.25.0", + "@babel/parser": "^7.26.10", + "@babel/types": "^7.26.10", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" + "jsesc": "^3.0.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz", - "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", + "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz", - "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", - "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz", + "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.25.2", - "@babel/helper-validator-option": "^7.24.8", - "browserslist": "^4.23.1", + "@babel/compat-data": "^7.27.2", + "@babel/helper-validator-option": "^7.27.1", + "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -2079,16 +2110,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^3.0.2" - } - }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -2099,26 +2120,19 @@ "semver": "bin/semver.js" } }, - "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true, - "license": "ISC" - }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz", - "integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz", + "integrity": "sha512-QwGAmuvM17btKU5VqXfb+Giw4JcN0hjuufz3DYnpeVDvZLAObloM77bhMXiqry3Iio+Ai4phVRDwl6WU10+r5A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-member-expression-to-functions": "^7.24.8", - "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/helper-replace-supers": "^7.25.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/traverse": "^7.25.4", + "@babel/helper-annotate-as-pure": "^7.27.1", + "@babel/helper-member-expression-to-functions": "^7.27.1", + "@babel/helper-optimise-call-expression": "^7.27.1", + "@babel/helper-replace-supers": "^7.27.1", + "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1", + "@babel/traverse": "^7.27.1", "semver": "^6.3.1" }, "engines": { @@ -2128,6 +2142,19 @@ "@babel/core": "^7.0.0" } }, + "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz", + "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -2139,14 +2166,14 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz", - "integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.1.tgz", + "integrity": "sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "regexpu-core": "^5.3.1", + "@babel/helper-annotate-as-pure": "^7.27.1", + "regexpu-core": "^6.2.0", "semver": "^6.3.1" }, "engines": { @@ -2156,6 +2183,19 @@ "@babel/core": "^7.0.0" } }, + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz", + "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -2167,9 +2207,9 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz", - "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.4.tgz", + "integrity": "sha512-jljfR1rGnXXNWnmQg2K3+bvhkxB51Rl32QRaOTuwwjviGrHzIbSc8+x9CpraDtbT7mfyjXObULP4w/adunNwAw==", "dev": true, "license": "MIT", "dependencies": { @@ -2184,44 +2224,43 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz", - "integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz", + "integrity": "sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.24.8", - "@babel/types": "^7.24.8" + "@babel/traverse": "^7.27.1", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", - "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz", + "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.27.1", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", - "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.1.tgz", + "integrity": "sha512-9yHn519/8KvTU5BjTVEEeIM3w9/2yXNKoD82JifINImhpKkARMJKPP59kLo+BafpdN5zgNeIcS4jsGDmd3l58g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-simple-access": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.2" + "@babel/helper-module-imports": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1", + "@babel/traverse": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2231,22 +2270,22 @@ } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz", - "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz", + "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.24.7" + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz", - "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz", + "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==", "dev": true, "license": "MIT", "engines": { @@ -2254,15 +2293,15 @@ } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz", - "integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz", + "integrity": "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-wrap-function": "^7.25.0", - "@babel/traverse": "^7.25.0" + "@babel/helper-annotate-as-pure": "^7.27.1", + "@babel/helper-wrap-function": "^7.27.1", + "@babel/traverse": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2271,16 +2310,29 @@ "@babel/core": "^7.0.0" } }, + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz", + "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-replace-supers": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz", - "integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz", + "integrity": "sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.24.8", - "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/helper-member-expression-to-functions": "^7.27.1", + "@babel/helper-optimise-call-expression": "^7.27.1", + "@babel/traverse": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2289,29 +2341,15 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/helper-simple-access": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", - "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz", - "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz", + "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/traverse": "^7.27.1", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2331,9 +2369,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", - "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", + "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", "dev": true, "license": "MIT", "engines": { @@ -2341,9 +2379,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", + "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", "dev": true, "license": "MIT", "engines": { @@ -2351,9 +2389,9 @@ } }, "node_modules/@babel/helper-validator-option": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", - "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", + "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", "dev": true, "license": "MIT", "engines": { @@ -2361,126 +2399,42 @@ } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz", - "integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.27.1.tgz", + "integrity": "sha512-NFJK2sHUvrjo8wAU/nQTWU890/zB2jj0qBcCbZbbf+005cAsv6tMjXz31fBign6M5ov1o0Bllu+9nbqkfsjjJQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.25.0", - "@babel/traverse": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/template": "^7.27.1", + "@babel/traverse": "^7.27.1", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", - "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.1.tgz", + "integrity": "sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6" + "@babel/template": "^7.27.1", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/highlight": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.24.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/parser": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", - "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz", + "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.25.6" + "@babel/types": "^7.27.1" }, "bin": { "parser": "bin/babel-parser.js" @@ -2490,14 +2444,14 @@ } }, "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": { - "version": "7.25.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz", - "integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz", + "integrity": "sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.3" + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/traverse": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2507,13 +2461,13 @@ } }, "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz", - "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz", + "integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2523,13 +2477,13 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz", - "integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz", + "integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2539,15 +2493,15 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz", - "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz", + "integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-transform-optional-chaining": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1", + "@babel/plugin-transform-optional-chaining": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2557,14 +2511,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz", - "integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.27.1.tgz", + "integrity": "sha512-6BpaYGDavZqkI6yT+KSPdpZFfpnd68UKXbcjI9pJ13pvHhPrCKWOOLp+ysvMeA+DxnhuPpgIaRpxRxo5A9t5jw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.0" + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/traverse": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2586,82 +2540,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-export-namespace-from": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.3" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz", - "integrity": "sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.27.1.tgz", + "integrity": "sha512-UT/Jrhw57xg4ILHLFnzFpPDlMbcdEicaAtjPQpbj9wa8T4r5KVWCimHcL/460g8Ht0DMxDyjsLgiWSkVjnwPFg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2671,149 +2557,13 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz", - "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", + "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2840,13 +2590,13 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz", - "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz", + "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2856,16 +2606,15 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz", - "integrity": "sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz", + "integrity": "sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-remap-async-to-generator": "^7.25.0", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/traverse": "^7.25.0" + "@babel/helper-plugin-utils": "^7.26.5", + "@babel/helper-remap-async-to-generator": "^7.25.9", + "@babel/traverse": "^7.26.8" }, "engines": { "node": ">=6.9.0" @@ -2875,15 +2624,15 @@ } }, "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz", - "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz", + "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-remap-async-to-generator": "^7.24.7" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-remap-async-to-generator": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2893,13 +2642,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz", - "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz", + "integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2909,13 +2658,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz", - "integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.27.1.tgz", + "integrity": "sha512-QEcFlMl9nGTgh1rn2nIeU5bkfb9BAjaQcWbiP4LvKxUot52ABcTkpcyJ7f2Q2U2RuQ84BNLgts3jRme2dTx6Fw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2925,14 +2674,14 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz", - "integrity": "sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.27.1.tgz", + "integrity": "sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.4", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-class-features-plugin": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2942,15 +2691,14 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz", - "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz", + "integrity": "sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-class-static-block": "^7.14.5" + "@babel/helper-create-class-features-plugin": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2960,17 +2708,17 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz", - "integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.27.1.tgz", + "integrity": "sha512-7iLhfFAubmpeJe/Wo2TVuDrykh/zlWXLzPNdL0Jqn/Xu8R3QQ8h9ff8FQoISZOsw74/HFqFI7NX63HN7QFIHKA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-replace-supers": "^7.25.0", - "@babel/traverse": "^7.25.4", + "@babel/helper-annotate-as-pure": "^7.27.1", + "@babel/helper-compilation-targets": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-replace-supers": "^7.27.1", + "@babel/traverse": "^7.27.1", "globals": "^11.1.0" }, "engines": { @@ -2980,15 +2728,28 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz", - "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==", + "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz", + "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/template": "^7.24.7" + "@babel/types": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/plugin-transform-computed-properties": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.27.1.tgz", + "integrity": "sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/template": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -2998,13 +2759,13 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz", - "integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.27.1.tgz", + "integrity": "sha512-ttDCqhfvpE9emVkXbPD8vyxxh4TWYACVybGkDj+oReOGwnp066ITEivDlLwe0b1R0+evJ13IXQuLNB5w1fhC5Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3014,14 +2775,14 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz", - "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.27.1.tgz", + "integrity": "sha512-gEbkDVGRvjj7+T1ivxrfgygpT7GUd4vmODtYpbs0gZATdkX8/iSnOtZSxiZnsgm1YjTgjI6VKBGSJJevkrclzw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3031,13 +2792,13 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz", - "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz", + "integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3047,14 +2808,14 @@ } }, "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz", - "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.27.1.tgz", + "integrity": "sha512-hkGcueTEzuhB30B3eJCbCYeCaaEQOmQR0AdvzpD4LoN0GXMWzzGSuRrxR2xTnCrvNbVwK9N6/jQ92GSLfiZWoQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-regexp-features-plugin": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3064,14 +2825,13 @@ } }, "node_modules/@babel/plugin-transform-dynamic-import": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz", - "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz", + "integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3081,14 +2841,13 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz", - "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz", + "integrity": "sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3098,14 +2857,13 @@ } }, "node_modules/@babel/plugin-transform-export-namespace-from": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz", - "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz", + "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3115,14 +2873,14 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz", - "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz", + "integrity": "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3132,15 +2890,15 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.25.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz", - "integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz", + "integrity": "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.24.8", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/traverse": "^7.25.1" + "@babel/helper-compilation-targets": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/traverse": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3150,14 +2908,13 @@ } }, "node_modules/@babel/plugin-transform-json-strings": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz", - "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.27.1.tgz", + "integrity": "sha512-6WVLVJiTjqcQauBhn1LkICsR2H+zm62I3h9faTDKt1qP4jn2o72tSvqMwtGFKGTpojce0gJs+76eZ2uCHRZh0Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-json-strings": "^7.8.3" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3167,13 +2924,13 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz", - "integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz", + "integrity": "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3183,14 +2940,13 @@ } }, "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz", - "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz", + "integrity": "sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3200,13 +2956,13 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz", - "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz", + "integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3216,14 +2972,14 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz", - "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz", + "integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-module-transforms": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3233,15 +2989,14 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz", - "integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz", + "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.24.8", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-simple-access": "^7.24.7" + "@babel/helper-module-transforms": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3251,16 +3006,16 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz", - "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz", + "integrity": "sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.25.0", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/helper-module-transforms": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1", + "@babel/traverse": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3270,14 +3025,14 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz", - "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz", + "integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-module-transforms": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3287,14 +3042,14 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz", - "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.27.1.tgz", + "integrity": "sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3304,13 +3059,13 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz", - "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz", + "integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3320,14 +3075,13 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz", - "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.27.1.tgz", + "integrity": "sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3337,14 +3091,13 @@ } }, "node_modules/@babel/plugin-transform-numeric-separator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz", - "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.27.1.tgz", + "integrity": "sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3354,16 +3107,16 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz", - "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==", + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.27.2.tgz", + "integrity": "sha512-AIUHD7xJ1mCrj3uPozvtngY3s0xpv7Nu7DoUSnzNY6Xam1Cy4rUznR//pvMHOhQ4AvbCexhbqXCtpxGHOGOO6g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.24.7" + "@babel/helper-compilation-targets": "^7.27.2", + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/plugin-transform-destructuring": "^7.27.1", + "@babel/plugin-transform-parameters": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3373,14 +3126,14 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz", - "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz", + "integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-replace-supers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-replace-supers": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3390,14 +3143,13 @@ } }, "node_modules/@babel/plugin-transform-optional-catch-binding": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz", - "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.27.1.tgz", + "integrity": "sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3407,15 +3159,14 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz", - "integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz", + "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3425,13 +3176,13 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", - "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.1.tgz", + "integrity": "sha512-018KRk76HWKeZ5l4oTj2zPpSh+NbGdt0st5S6x0pga6HgrjBOJb24mMDHorFopOOd6YHkLgOZ+zaCjZGPO4aKg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3441,14 +3192,14 @@ } }, "node_modules/@babel/plugin-transform-private-methods": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz", - "integrity": "sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.27.1.tgz", + "integrity": "sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.4", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-class-features-plugin": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3458,16 +3209,15 @@ } }, "node_modules/@babel/plugin-transform-private-property-in-object": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz", - "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.27.1.tgz", + "integrity": "sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-create-class-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + "@babel/helper-annotate-as-pure": "^7.27.1", + "@babel/helper-create-class-features-plugin": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3476,14 +3226,27 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz", - "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==", + "node_modules/@babel/plugin-transform-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz", + "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/types": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/plugin-transform-property-literals": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz", + "integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3493,14 +3256,13 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz", - "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.27.1.tgz", + "integrity": "sha512-B19lbbL7PMrKr52BNPjCqg1IyNUIjTcxKj8uX9zHO+PmWN93s19NDr/f69mIkEp2x9nmDJ08a7lgHaTTzvW7mw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "regenerator-transform": "^0.15.2" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3509,14 +3271,31 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz", - "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==", + "node_modules/@babel/plugin-transform-regexp-modifiers": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.27.1.tgz", + "integrity": "sha512-TtEciroaiODtXvLZv4rmfMhkCv8jx3wgKpL68PuiPh2M4fvz5jhsA7697N1gMvkvr/JTF13DrFYyEbY9U7cVPA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/plugin-transform-reserved-words": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz", + "integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3526,16 +3305,16 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz", - "integrity": "sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.26.10.tgz", + "integrity": "sha512-NWaL2qG6HRpONTnj4JvDU6th4jYeZOJgu3QhmFTCihib0ermtOJqktA5BduGm3suhhVe9EMP9c9+mfJ/I9slqw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-plugin-utils": "^7.26.5", "babel-plugin-polyfill-corejs2": "^0.4.10", - "babel-plugin-polyfill-corejs3": "^0.10.1", + "babel-plugin-polyfill-corejs3": "^0.11.0", "babel-plugin-polyfill-regenerator": "^0.6.1", "semver": "^6.3.1" }, @@ -3557,13 +3336,13 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz", - "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz", + "integrity": "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3573,14 +3352,14 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz", - "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.27.1.tgz", + "integrity": "sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3590,13 +3369,13 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz", - "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz", + "integrity": "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3606,13 +3385,13 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz", - "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz", + "integrity": "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3622,13 +3401,13 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz", - "integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz", + "integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3638,13 +3417,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz", - "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz", + "integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3654,14 +3433,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-property-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz", - "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.27.1.tgz", + "integrity": "sha512-uW20S39PnaTImxp39O5qFlHLS9LJEmANjMG7SxIhap8rCHqu0Ik+tLEPX5DKmHn6CsWQ7j3lix2tFOa5YtL12Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3671,14 +3450,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz", - "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz", + "integrity": "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-create-regexp-features-plugin": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3688,14 +3467,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-sets-regex": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz", - "integrity": "sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.27.1.tgz", + "integrity": "sha512-EtkOujbc4cgvb0mlpQefi4NTPBzhSIevblFevACNLUspmrALgmEBdL/XfnyyITfd8fKBZrZys92zOWcik7j9Tw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8" + "@babel/helper-create-regexp-features-plugin": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3705,94 +3484,80 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.25.3", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.3.tgz", - "integrity": "sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.9.tgz", + "integrity": "sha512-vX3qPGE8sEKEAZCWk05k3cpTAE3/nOYca++JA+Rd0z2NCNzabmYvEiSShKzm10zdquOIAVXsy2Ei/DTW34KlKQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.25.2", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-validator-option": "^7.24.8", - "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3", - "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0", + "@babel/compat-data": "^7.26.8", + "@babel/helper-compilation-targets": "^7.26.5", + "@babel/helper-plugin-utils": "^7.26.5", + "@babel/helper-validator-option": "^7.25.9", + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9", + "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.24.7", - "@babel/plugin-syntax-import-attributes": "^7.24.7", - "@babel/plugin-syntax-import-meta": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-syntax-import-assertions": "^7.26.0", + "@babel/plugin-syntax-import-attributes": "^7.26.0", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.24.7", - "@babel/plugin-transform-async-generator-functions": "^7.25.0", - "@babel/plugin-transform-async-to-generator": "^7.24.7", - "@babel/plugin-transform-block-scoped-functions": "^7.24.7", - "@babel/plugin-transform-block-scoping": "^7.25.0", - "@babel/plugin-transform-class-properties": "^7.24.7", - "@babel/plugin-transform-class-static-block": "^7.24.7", - "@babel/plugin-transform-classes": "^7.25.0", - "@babel/plugin-transform-computed-properties": "^7.24.7", - "@babel/plugin-transform-destructuring": "^7.24.8", - "@babel/plugin-transform-dotall-regex": "^7.24.7", - "@babel/plugin-transform-duplicate-keys": "^7.24.7", - "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0", - "@babel/plugin-transform-dynamic-import": "^7.24.7", - "@babel/plugin-transform-exponentiation-operator": "^7.24.7", - "@babel/plugin-transform-export-namespace-from": "^7.24.7", - "@babel/plugin-transform-for-of": "^7.24.7", - "@babel/plugin-transform-function-name": "^7.25.1", - "@babel/plugin-transform-json-strings": "^7.24.7", - "@babel/plugin-transform-literals": "^7.25.2", - "@babel/plugin-transform-logical-assignment-operators": "^7.24.7", - "@babel/plugin-transform-member-expression-literals": "^7.24.7", - "@babel/plugin-transform-modules-amd": "^7.24.7", - "@babel/plugin-transform-modules-commonjs": "^7.24.8", - "@babel/plugin-transform-modules-systemjs": "^7.25.0", - "@babel/plugin-transform-modules-umd": "^7.24.7", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7", - "@babel/plugin-transform-new-target": "^7.24.7", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7", - "@babel/plugin-transform-numeric-separator": "^7.24.7", - "@babel/plugin-transform-object-rest-spread": "^7.24.7", - "@babel/plugin-transform-object-super": "^7.24.7", - "@babel/plugin-transform-optional-catch-binding": "^7.24.7", - "@babel/plugin-transform-optional-chaining": "^7.24.8", - "@babel/plugin-transform-parameters": "^7.24.7", - "@babel/plugin-transform-private-methods": "^7.24.7", - "@babel/plugin-transform-private-property-in-object": "^7.24.7", - "@babel/plugin-transform-property-literals": "^7.24.7", - "@babel/plugin-transform-regenerator": "^7.24.7", - "@babel/plugin-transform-reserved-words": "^7.24.7", - "@babel/plugin-transform-shorthand-properties": "^7.24.7", - "@babel/plugin-transform-spread": "^7.24.7", - "@babel/plugin-transform-sticky-regex": "^7.24.7", - "@babel/plugin-transform-template-literals": "^7.24.7", - "@babel/plugin-transform-typeof-symbol": "^7.24.8", - "@babel/plugin-transform-unicode-escapes": "^7.24.7", - "@babel/plugin-transform-unicode-property-regex": "^7.24.7", - "@babel/plugin-transform-unicode-regex": "^7.24.7", - "@babel/plugin-transform-unicode-sets-regex": "^7.24.7", + "@babel/plugin-transform-arrow-functions": "^7.25.9", + "@babel/plugin-transform-async-generator-functions": "^7.26.8", + "@babel/plugin-transform-async-to-generator": "^7.25.9", + "@babel/plugin-transform-block-scoped-functions": "^7.26.5", + "@babel/plugin-transform-block-scoping": "^7.25.9", + "@babel/plugin-transform-class-properties": "^7.25.9", + "@babel/plugin-transform-class-static-block": "^7.26.0", + "@babel/plugin-transform-classes": "^7.25.9", + "@babel/plugin-transform-computed-properties": "^7.25.9", + "@babel/plugin-transform-destructuring": "^7.25.9", + "@babel/plugin-transform-dotall-regex": "^7.25.9", + "@babel/plugin-transform-duplicate-keys": "^7.25.9", + "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9", + "@babel/plugin-transform-dynamic-import": "^7.25.9", + "@babel/plugin-transform-exponentiation-operator": "^7.26.3", + "@babel/plugin-transform-export-namespace-from": "^7.25.9", + "@babel/plugin-transform-for-of": "^7.26.9", + "@babel/plugin-transform-function-name": "^7.25.9", + "@babel/plugin-transform-json-strings": "^7.25.9", + "@babel/plugin-transform-literals": "^7.25.9", + "@babel/plugin-transform-logical-assignment-operators": "^7.25.9", + "@babel/plugin-transform-member-expression-literals": "^7.25.9", + "@babel/plugin-transform-modules-amd": "^7.25.9", + "@babel/plugin-transform-modules-commonjs": "^7.26.3", + "@babel/plugin-transform-modules-systemjs": "^7.25.9", + "@babel/plugin-transform-modules-umd": "^7.25.9", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9", + "@babel/plugin-transform-new-target": "^7.25.9", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.26.6", + "@babel/plugin-transform-numeric-separator": "^7.25.9", + "@babel/plugin-transform-object-rest-spread": "^7.25.9", + "@babel/plugin-transform-object-super": "^7.25.9", + "@babel/plugin-transform-optional-catch-binding": "^7.25.9", + "@babel/plugin-transform-optional-chaining": "^7.25.9", + "@babel/plugin-transform-parameters": "^7.25.9", + "@babel/plugin-transform-private-methods": "^7.25.9", + "@babel/plugin-transform-private-property-in-object": "^7.25.9", + "@babel/plugin-transform-property-literals": "^7.25.9", + "@babel/plugin-transform-regenerator": "^7.25.9", + "@babel/plugin-transform-regexp-modifiers": "^7.26.0", + "@babel/plugin-transform-reserved-words": "^7.25.9", + "@babel/plugin-transform-shorthand-properties": "^7.25.9", + "@babel/plugin-transform-spread": "^7.25.9", + "@babel/plugin-transform-sticky-regex": "^7.25.9", + "@babel/plugin-transform-template-literals": "^7.26.8", + "@babel/plugin-transform-typeof-symbol": "^7.26.7", + "@babel/plugin-transform-unicode-escapes": "^7.25.9", + "@babel/plugin-transform-unicode-property-regex": "^7.25.9", + "@babel/plugin-transform-unicode-regex": "^7.25.9", + "@babel/plugin-transform-unicode-sets-regex": "^7.25.9", "@babel/preset-modules": "0.1.6-no-external-plugins", "babel-plugin-polyfill-corejs2": "^0.4.10", - "babel-plugin-polyfill-corejs3": "^0.10.4", + "babel-plugin-polyfill-corejs3": "^0.11.0", "babel-plugin-polyfill-regenerator": "^0.6.1", - "core-js-compat": "^3.37.1", + "core-js-compat": "^3.40.0", "semver": "^6.3.1" }, "engines": { @@ -3827,17 +3592,10 @@ "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/@babel/regjsgen": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", - "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/runtime": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz", - "integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz", + "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==", "dev": true, "license": "MIT", "dependencies": { @@ -3848,32 +3606,32 @@ } }, "node_modules/@babel/template": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", - "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", + "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/parser": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/code-frame": "^7.27.1", + "@babel/parser": "^7.27.2", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", - "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.1.tgz", + "integrity": "sha512-ZCYtZciz1IWJB4U61UPu4KEaqyfj+r5T1Q5mqPo+IBpcG9kHv30Z0aD8LXPgC1trYa6rK0orRyAhqUgk4MjmEg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.6", - "@babel/parser": "^7.25.6", - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6", + "@babel/code-frame": "^7.27.1", + "@babel/generator": "^7.27.1", + "@babel/parser": "^7.27.1", + "@babel/template": "^7.27.1", + "@babel/types": "^7.27.1", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -3882,31 +3640,31 @@ } }, "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", - "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.1.tgz", + "integrity": "sha512-UnJfnIpc/+JO0/+KRVQNGU+y5taA5vCbwN8+azkX6beii/ZF+enZJSOKo11ZSzGJjlNfJHfQtmQT8H+9TXPG2w==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.25.6", + "@babel/parser": "^7.27.1", + "@babel/types": "^7.27.1", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" + "jsesc": "^3.0.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/types": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", - "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz", + "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3916,6 +3674,7 @@ "version": "9.0.0", "resolved": "https://registry.npmjs.org/@ctrl/ngx-github-buttons/-/ngx-github-buttons-9.0.0.tgz", "integrity": "sha512-GNcDw5DCUW8r2ctCS82yLgUgOJ3NEN8DKk2MCZbvdfQLiOEb2FLTqLojdrC2oc7Tppm0/uztrN8EP5qRLMW0wA==", + "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, @@ -3928,63 +3687,43 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-4.1.0.tgz", "integrity": "sha512-WyOx8cJQ+FQus4Mm4uPIZA64gbk3Wxh0so5Lcii0aJifqwoVOlfFtorjLE0Hen4OYyHZMXDWqMmaQemBhgxFRQ==", + "license": "MIT", "engines": { "node": ">=14" } }, "node_modules/@discoveryjs/json-ext": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.1.tgz", - "integrity": "sha512-boghen8F0Q8D+0/Q1/1r6DUEieUJ8w2a1gIknExMSHBsJFOr2+0KUfHiVYBvucPwl3+RU5PFBK833FjFCh3BhA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz", + "integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==", "dev": true, "license": "MIT", "engines": { "node": ">=14.17.0" } }, - "node_modules/@emnapi/core": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.1.tgz", - "integrity": "sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==", - "dependencies": { - "@emnapi/wasi-threads": "1.0.1", - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/runtime": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.1.tgz", - "integrity": "sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==", - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/wasi-threads": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz", - "integrity": "sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==", - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@es-joy/jsdoccomment": { - "version": "0.49.0", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.49.0.tgz", - "integrity": "sha512-xjZTSFgECpb9Ohuk5yMX5RhUEbfeQcuOp8IF60e+wyzWEF0M5xeSgqsfLtvPEX8BIyOX9saZqzuGPmZ8oWc+5Q==", + "version": "0.50.1", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.50.1.tgz", + "integrity": "sha512-fas3qe1hw38JJgU/0m5sDpcrbZGysBeZcMwW5Ws9brYxY64MJyWLXRZCj18keTycT1LFTrFXdSNMS+GRVaU6Hw==", "dev": true, + "license": "MIT", "dependencies": { + "@types/eslint": "^9.6.1", + "@types/estree": "^1.0.6", + "@typescript-eslint/types": "^8.11.0", "comment-parser": "1.4.1", "esquery": "^1.6.0", "jsdoc-type-pratt-parser": "~4.1.0" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz", - "integrity": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz", + "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==", "cpu": [ "ppc64" ], @@ -3999,9 +3738,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.0.tgz", - "integrity": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz", + "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==", "cpu": [ "arm" ], @@ -4016,9 +3755,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz", - "integrity": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz", + "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==", "cpu": [ "arm64" ], @@ -4033,9 +3772,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.0.tgz", - "integrity": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz", + "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==", "cpu": [ "x64" ], @@ -4050,9 +3789,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz", - "integrity": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz", + "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==", "cpu": [ "arm64" ], @@ -4067,9 +3806,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz", - "integrity": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz", + "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==", "cpu": [ "x64" ], @@ -4084,9 +3823,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz", - "integrity": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz", + "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==", "cpu": [ "arm64" ], @@ -4101,9 +3840,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz", - "integrity": "sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz", + "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==", "cpu": [ "x64" ], @@ -4118,9 +3857,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz", - "integrity": "sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz", + "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==", "cpu": [ "arm" ], @@ -4135,9 +3874,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz", - "integrity": "sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz", + "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==", "cpu": [ "arm64" ], @@ -4152,9 +3891,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz", - "integrity": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz", + "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==", "cpu": [ "ia32" ], @@ -4169,9 +3908,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz", - "integrity": "sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz", + "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==", "cpu": [ "loong64" ], @@ -4186,9 +3925,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz", - "integrity": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz", + "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==", "cpu": [ "mips64el" ], @@ -4203,9 +3942,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz", - "integrity": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz", + "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==", "cpu": [ "ppc64" ], @@ -4220,9 +3959,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz", - "integrity": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz", + "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==", "cpu": [ "riscv64" ], @@ -4237,9 +3976,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz", - "integrity": "sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz", + "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==", "cpu": [ "s390x" ], @@ -4254,9 +3993,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz", - "integrity": "sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz", + "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==", "cpu": [ "x64" ], @@ -4270,10 +4009,27 @@ "node": ">=18" } }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.4.tgz", + "integrity": "sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz", - "integrity": "sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz", + "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==", "cpu": [ "x64" ], @@ -4288,9 +4044,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz", - "integrity": "sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz", + "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==", "cpu": [ "arm64" ], @@ -4305,9 +4061,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz", - "integrity": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz", + "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==", "cpu": [ "x64" ], @@ -4322,9 +4078,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz", - "integrity": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz", + "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==", "cpu": [ "x64" ], @@ -4339,9 +4095,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz", - "integrity": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz", + "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==", "cpu": [ "arm64" ], @@ -4356,9 +4112,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz", - "integrity": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz", + "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==", "cpu": [ "ia32" ], @@ -4373,9 +4129,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz", - "integrity": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz", + "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==", "cpu": [ "x64" ], @@ -4390,16 +4146,20 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", + "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", "dev": true, + "license": "MIT", "dependencies": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, + "funding": { + "url": "https://opencollective.com/eslint" + }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } @@ -4409,18 +4169,19 @@ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "dev": true, + "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/config-array": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.1.tgz", - "integrity": "sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz", + "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^2.1.5", + "@eslint/object-schema": "^2.1.6", "debug": "^4.3.1", "minimatch": "^3.1.2" }, @@ -4428,10 +4189,44 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/config-array/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/config-helpers": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz", + "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/core": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.1.tgz", - "integrity": "sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", + "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -4442,9 +4237,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", - "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", + "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4482,6 +4277,17 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/@eslint/eslintrc/node_modules/globals": { "version": "14.0.0", "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", @@ -4495,17 +4301,14 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@eslint/eslintrc/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "node_modules/@eslint/eslintrc/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" + "engines": { + "node": ">= 4" } }, "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { @@ -4515,10 +4318,23 @@ "dev": true, "license": "MIT" }, + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/@eslint/js": { - "version": "9.16.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.16.0.tgz", - "integrity": "sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg==", + "version": "9.26.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.26.0.tgz", + "integrity": "sha512-I9XlJawFdSMvWjDt6wksMCrgns5ggLNfFwFvnShsleWruvXM514Qxk8V246efTw+eo9JABvVz+u3q2RiAowKxQ==", "dev": true, "license": "MIT", "engines": { @@ -4526,9 +4342,9 @@ } }, "node_modules/@eslint/object-schema": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.5.tgz", - "integrity": "sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", + "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -4536,12 +4352,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz", - "integrity": "sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==", + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz", + "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==", "dev": true, "license": "Apache-2.0", "dependencies": { + "@eslint/core": "^0.13.0", "levn": "^0.4.1" }, "engines": { @@ -4553,6 +4370,7 @@ "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=18.18.0" } @@ -4562,6 +4380,7 @@ "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.3.0" @@ -4575,6 +4394,7 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=18.18" }, @@ -4588,6 +4408,7 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=12.22" }, @@ -4597,10 +4418,11 @@ } }, "node_modules/@humanwhocodes/retry": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", - "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=18.18" }, @@ -4610,136 +4432,130 @@ } }, "node_modules/@inquirer/checkbox": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.5.0.tgz", - "integrity": "sha512-sMgdETOfi2dUHT8r7TT1BTKOwNvdDGFDXYWtQ2J69SvlYNntk9I/gJe7r5yvMwwsuKnYbuRs3pNhx4tgNck5aA==", + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.1.6.tgz", + "integrity": "sha512-62u896rWCtKKE43soodq5e/QcRsA22I+7/4Ov7LESWnKRO6BVo2A1DFLDmXL9e28TB0CfHc3YtkbPm7iwajqkg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.11", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.6", "ansi-escapes": "^4.3.2", "yoctocolors-cjs": "^2.1.2" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/confirm": { - "version": "3.1.22", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.22.tgz", - "integrity": "sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.6.tgz", + "integrity": "sha512-6ZXYK3M1XmaVBZX6FCfChgtponnL0R6I7k8Nu+kaoNkT828FVZTcca1MqmWQipaW2oNREQl5AaPCUOOCVNdRMw==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2" + "@inquirer/core": "^10.1.7", + "@inquirer/type": "^3.0.4" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/core": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.1.0.tgz", - "integrity": "sha512-RZVfH//2ytTjmaBIzeKT1zefcQZzuruwkpTwwbe/i2jTl4o9M+iML5ChULzz6iw1Ok8iUBBsRCjY2IEbD8Ft4w==", + "version": "10.1.11", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.11.tgz", + "integrity": "sha512-BXwI/MCqdtAhzNQlBEFE7CEflhPkl/BqvAuV/aK6lW3DClIfYVDWPP/kXuXHtBWC7/EEbNqd/1BGq2BGBBnuxw==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.3", - "@types/mute-stream": "^0.0.4", - "@types/node": "^22.5.2", - "@types/wrap-ansi": "^3.0.0", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.6", "ansi-escapes": "^4.3.2", - "cli-spinners": "^2.9.2", "cli-width": "^4.1.0", - "mute-stream": "^1.0.0", + "mute-stream": "^2.0.0", "signal-exit": "^4.1.0", - "strip-ansi": "^6.0.1", "wrap-ansi": "^6.2.0", "yoctocolors-cjs": "^2.1.2" }, "engines": { "node": ">=18" - } - }, - "node_modules/@inquirer/core/node_modules/cli-spinners": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", - "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@inquirer/core/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" + "peerDependencies": { + "@types/node": ">=18" }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@inquirer/core/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/editor": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.2.0.tgz", - "integrity": "sha512-9KHOpJ+dIL5SZli8lJ6xdaYLPPzB8xB9GZItg39MBybzhxA16vxmszmQFrRwbOA918WA2rvu8xhDEg/p6LXKbw==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.11.tgz", + "integrity": "sha512-YoZr0lBnnLFPpfPSNsQ8IZyKxU47zPyVi9NLjCWtna52//M/xuL0PGPAxHxxYhdOhnvY2oBafoM+BI5w/JK7jw==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.11", + "@inquirer/type": "^3.0.6", "external-editor": "^3.1.0" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/expand": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.2.0.tgz", - "integrity": "sha512-PD0z1dTRTIlpcnXRMRvdVPfBe10jBf4i7YLBU8tNWDkf3HxqmdymVvqnT8XG+hxQSvqfpJCe13Jv2Iv1eB3bIg==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.13.tgz", + "integrity": "sha512-HgYNWuZLHX6q5y4hqKhwyytqAghmx35xikOGY3TcgNiElqXGPas24+UzNPOwGUZa5Dn32y25xJqVeUcGlTv+QQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.11", + "@inquirer/type": "^3.0.6", "yoctocolors-cjs": "^2.1.2" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/figures": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.5.tgz", - "integrity": "sha512-79hP/VWdZ2UVc9bFGJnoQ/lQMpL74mGgzSYX1xUqCVk7/v73vJCMw1VuyWN1jGkZ9B3z7THAbySqGbCNefcjfA==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.11.tgz", + "integrity": "sha512-eOg92lvrn/aRUqbxRyvpEWnrvRuTYRifixHkYVpJiygTgVSBIHDqLh0SrMQXkafvULg3ck11V7xvR+zcgvpHFw==", "dev": true, "license": "MIT", "engines": { @@ -4747,129 +4563,185 @@ } }, "node_modules/@inquirer/input": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.3.0.tgz", - "integrity": "sha512-XfnpCStx2xgh1LIRqPXrTNEEByqQWoxsWYzNRSEUxJ5c6EQlhMogJ3vHKu8aXuTacebtaZzMAHwEL0kAflKOBw==", + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.1.10.tgz", + "integrity": "sha512-kV3BVne3wJ+j6reYQUZi/UN9NZGZLxgc/tfyjeK3mrx1QI7RXPxGp21IUTv+iVHcbP4ytZALF8vCHoxyNSC6qg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3" + "@inquirer/core": "^10.1.11", + "@inquirer/type": "^3.0.6" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/number": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.1.0.tgz", - "integrity": "sha512-ilUnia/GZUtfSZy3YEErXLJ2Sljo/mf9fiKc08n18DdwdmDbOzRcTv65H1jjDvlsAuvdFXf4Sa/aL7iw/NanVA==", + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.13.tgz", + "integrity": "sha512-IrLezcg/GWKS8zpKDvnJ/YTflNJdG0qSFlUM/zNFsdi4UKW/CO+gaJpbMgQ20Q58vNKDJbEzC6IebdkprwL6ew==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3" + "@inquirer/core": "^10.1.11", + "@inquirer/type": "^3.0.6" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/password": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.2.0.tgz", - "integrity": "sha512-5otqIpgsPYIshqhgtEwSspBQE40etouR8VIxzpJkv9i0dVHIpyhiivbkH9/dGiMLdyamT54YRdGJLfl8TFnLHg==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.13.tgz", + "integrity": "sha512-NN0S/SmdhakqOTJhDwOpeBEEr8VdcYsjmZHDb0rblSh2FcbXQOr+2IApP7JG4WE3sxIdKytDn4ed3XYwtHxmJQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.11", + "@inquirer/type": "^3.0.6", "ansi-escapes": "^4.3.2" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/prompts": { - "version": "5.3.8", - "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.3.8.tgz", - "integrity": "sha512-b2BudQY/Si4Y2a0PdZZL6BeJtl8llgeZa7U2j47aaJSCeAl1e4UI7y8a9bSkO3o/ZbZrgT5muy/34JbsjfIWxA==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.2.1.tgz", + "integrity": "sha512-v2JSGri6/HXSfoGIwuKEn8sNCQK6nsB2BNpy2lSX6QH9bsECrMv93QHnj5+f+1ZWpF/VNioIV2B/PDox8EvGuQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/checkbox": "^2.4.7", - "@inquirer/confirm": "^3.1.22", - "@inquirer/editor": "^2.1.22", - "@inquirer/expand": "^2.1.22", - "@inquirer/input": "^2.2.9", - "@inquirer/number": "^1.0.10", - "@inquirer/password": "^2.1.22", - "@inquirer/rawlist": "^2.2.4", - "@inquirer/search": "^1.0.7", - "@inquirer/select": "^2.4.7" + "@inquirer/checkbox": "^4.0.4", + "@inquirer/confirm": "^5.1.1", + "@inquirer/editor": "^4.2.1", + "@inquirer/expand": "^4.0.4", + "@inquirer/input": "^4.1.1", + "@inquirer/number": "^3.0.4", + "@inquirer/password": "^4.0.4", + "@inquirer/rawlist": "^4.0.4", + "@inquirer/search": "^3.0.4", + "@inquirer/select": "^4.0.4" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" } }, "node_modules/@inquirer/rawlist": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.3.0.tgz", - "integrity": "sha512-zzfNuINhFF7OLAtGHfhwOW2TlYJyli7lOUoJUXw/uyklcwalV6WRXBXtFIicN8rTRK1XTiPWB4UY+YuW8dsnLQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.1.1.tgz", + "integrity": "sha512-VBUC0jPN2oaOq8+krwpo/mf3n/UryDUkKog3zi+oIi8/e5hykvdntgHUB9nhDM78RubiyR1ldIOfm5ue+2DeaQ==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.11", + "@inquirer/type": "^3.0.6", "yoctocolors-cjs": "^2.1.2" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/search": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.1.0.tgz", - "integrity": "sha512-h+/5LSj51dx7hp5xOn4QFnUaKeARwUCLs6mIhtkJ0JYPBLmEYjdHSYh7I6GrLg9LwpJ3xeX0FZgAG1q0QdCpVQ==", + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.13.tgz", + "integrity": "sha512-9g89d2c5Izok/Gw/U7KPC3f9kfe5rA1AJ24xxNZG0st+vWekSk7tB9oE+dJv5JXd0ZSijomvW0KPMoBd8qbN4g==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.11", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.6", "yoctocolors-cjs": "^2.1.2" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/select": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.5.0.tgz", - "integrity": "sha512-YmDobTItPP3WcEI86GvPo+T2sRHkxxOq/kXmsBjHS5BVXUgvgZ5AfJjkvQvZr03T81NnI3KrrRuMzeuYUQRFOA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.2.1.tgz", + "integrity": "sha512-gt1Kd5XZm+/ddemcT3m23IP8aD8rC9drRckWoP/1f7OL46Yy2FGi8DSmNjEjQKtPl6SV96Kmjbl6p713KXJ/Jg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.11", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.6", "ansi-escapes": "^4.3.2", "yoctocolors-cjs": "^2.1.2" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/type": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.3.tgz", - "integrity": "sha512-xUQ14WQGR/HK5ei+2CvgcwoH9fQ4PgPGmVFSN0pc1+fVyDL3MREhyAY7nxEErSu6CkllBM3D7e3e+kOvtu+eIg==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.6.tgz", + "integrity": "sha512-/mKVCtVpyBu3IDarv0G+59KC4stsD5mDsGpYh+GKs1NZT88Jh52+cuoA1AtLk2Q0r/quNl+1cSUyLRHBFeD0XA==", "dev": true, "license": "MIT", - "dependencies": { - "mute-stream": "^1.0.0" - }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@isaacs/cliui": { @@ -4928,22 +4800,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", @@ -4962,6 +4818,19 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/@isaacs/fs-minipass": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", + "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.4" + }, + "engines": { + "node": ">=18.0.0" + } + }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", @@ -4972,21 +4841,10 @@ "node": ">=8" } }, - "node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", + "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", "dev": true, "license": "MIT", "dependencies": { @@ -5065,9 +4923,9 @@ } }, "node_modules/@jsonjoy.com/json-pack": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.0.4.tgz", - "integrity": "sha512-aOcSN4MeAtFROysrbqG137b7gaDDSmVrl5mpo6sT/w+kcXpWnzhMjmY/Fh/sDx26NBxyIE7MB1seqLeCAzy9Sg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.2.0.tgz", + "integrity": "sha512-io1zEbbYcElht3tdlqEOFxZ0dMTYrHz9iMf0gqn1pPjZFTCgM5R4R5IMA20Chb2UPYYsxjzs8CgZ7Nb5n2K2rA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -5088,9 +4946,9 @@ } }, "node_modules/@jsonjoy.com/util": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.3.0.tgz", - "integrity": "sha512-Cebt4Vk7k1xHy87kHY7KSPLT77A7Ev7IfOblyLZhtYEhrdQ6fX4EoLq3xOQ3O/DRMEh2ok5nyC180E+ABS8Wmw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.6.0.tgz", + "integrity": "sha512-sw/RMbehRhN68WRtcKCpQOPfnH6lLP4GJfqzi3iYej8tnzpZUDr6UkZYJjcjjC0FWEJOJbyM3PTIwxucUmDG2A==", "dev": true, "license": "Apache-2.0", "engines": { @@ -5105,9 +4963,10 @@ } }, "node_modules/@kurkle/color": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz", - "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==" + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.4.tgz", + "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==", + "license": "MIT" }, "node_modules/@leichtgewicht/ip-codec": { "version": "2.0.5", @@ -5117,25 +4976,48 @@ "license": "MIT" }, "node_modules/@listr2/prompt-adapter-inquirer": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.15.tgz", - "integrity": "sha512-MZrGem/Ujjd4cPTLYDfCZK2iKKeiO/8OX13S6jqxldLs0Prf2aGqVlJ77nMBqMv7fzqgXEgjrNHLXcKR8l9lOg==", + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.18.tgz", + "integrity": "sha512-0hz44rAcrphyXcA8IS7EJ2SCoaBZD2u5goE8S/e+q/DL+dOGpqpcLidVOFeLG3VgML62SXmfRLAhWt0zL1oW4Q==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/type": "^1.5.1" + "@inquirer/type": "^1.5.5" }, "engines": { "node": ">=18.0.0" }, "peerDependencies": { - "@inquirer/prompts": ">= 3 < 6" + "@inquirer/prompts": ">= 3 < 8" + } + }, + "node_modules/@listr2/prompt-adapter-inquirer/node_modules/@inquirer/type": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz", + "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==", + "dev": true, + "license": "MIT", + "dependencies": { + "mute-stream": "^1.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@listr2/prompt-adapter-inquirer/node_modules/mute-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", + "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/@lmdb/lmdb-darwin-arm64": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.0.13.tgz", - "integrity": "sha512-uiKPB0Fv6WEEOZjruu9a6wnW/8jrjzlZbxXscMB8kuCJ1k6kHpcBnuvaAWcqhbI7rqX5GKziwWEdD+wi2gNLfA==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.2.6.tgz", + "integrity": "sha512-yF/ih9EJJZc72psFQbwnn8mExIWfTnzWJg+N02hnpXtDPETYLmQswIMBn7+V88lfCaFrMozJsUvcEQIkEPU0Gg==", "cpu": [ "arm64" ], @@ -5147,9 +5029,9 @@ ] }, "node_modules/@lmdb/lmdb-darwin-x64": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.0.13.tgz", - "integrity": "sha512-bEVIIfK5mSQoG1R19qA+fJOvCB+0wVGGnXHT3smchBVahYBdlPn2OsZZKzlHWfb1E+PhLBmYfqB5zQXFP7hJig==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.2.6.tgz", + "integrity": "sha512-5BbCumsFLbCi586Bb1lTWQFkekdQUw8/t8cy++Uq251cl3hbDIGEwD9HAwh8H6IS2F6QA9KdKmO136LmipRNkg==", "cpu": [ "x64" ], @@ -5161,9 +5043,9 @@ ] }, "node_modules/@lmdb/lmdb-linux-arm": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.0.13.tgz", - "integrity": "sha512-Yml1KlMzOnXj/tnW7yX8U78iAzTk39aILYvCPbqeewAq1kSzl+w59k/fiVkTBfvDi/oW/5YRxL+Fq+Y1Fr1r2Q==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.2.6.tgz", + "integrity": "sha512-+6XgLpMb7HBoWxXj+bLbiiB4s0mRRcDPElnRS3LpWRzdYSe+gFk5MT/4RrVNqd2MESUDmb53NUXw1+BP69bjiQ==", "cpu": [ "arm" ], @@ -5175,9 +5057,9 @@ ] }, "node_modules/@lmdb/lmdb-linux-arm64": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.0.13.tgz", - "integrity": "sha512-afbVrsMgZ9dUTNUchFpj5VkmJRxvht/u335jUJ7o23YTbNbnpmXif3VKQGCtnjSh+CZaqm6N3CPG8KO3zwyZ1Q==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.2.6.tgz", + "integrity": "sha512-l5VmJamJ3nyMmeD1ANBQCQqy7do1ESaJQfKPSm2IG9/ADZryptTyCj8N6QaYgIWewqNUrcbdMkJajRQAt5Qjfg==", "cpu": [ "arm64" ], @@ -5189,9 +5071,9 @@ ] }, "node_modules/@lmdb/lmdb-linux-x64": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.0.13.tgz", - "integrity": "sha512-vOtxu0xC0SLdQ2WRXg8Qgd8T32ak4SPqk5zjItRszrJk2BdeXqfGxBJbP7o4aOvSPSmSSv46Lr1EP4HXU8v7Kg==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.2.6.tgz", + "integrity": "sha512-nDYT8qN9si5+onHYYaI4DiauDMx24OAiuZAUsEqrDy+ja/3EbpXPX/VAkMV8AEaQhy3xc4dRC+KcYIvOFefJ4Q==", "cpu": [ "x64" ], @@ -5203,9 +5085,9 @@ ] }, "node_modules/@lmdb/lmdb-win32-x64": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.0.13.tgz", - "integrity": "sha512-UCrMJQY/gJnOl3XgbWRZZUvGGBuKy6i0YNSptgMzHBjs+QYDYR1Mt/RLTOPy4fzzves65O1EDmlL//OzEqoLlA==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.2.6.tgz", + "integrity": "sha512-XlqVtILonQnG+9fH2N3Aytria7P/1fwDgDhl29rde96uH2sLB8CHORIf2PfuLVzFQJ7Uqp8py9AYwr3ZUCFfWg==", "cpu": [ "x64" ], @@ -5216,6 +5098,28 @@ "win32" ] }, + "node_modules/@modelcontextprotocol/sdk": { + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.2.tgz", + "integrity": "sha512-H9vwztj5OAqHg9GockCQC06k1natgcxWQSRpQcPJf6i5+MWBzfKkRtxGbjQf0X2ihii0ffLZCRGbYV2f2bjNCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "content-type": "^1.0.5", + "cors": "^2.8.5", + "cross-spawn": "^7.0.3", + "eventsource": "^3.0.2", + "express": "^5.0.1", + "express-rate-limit": "^7.5.0", + "pkce-challenge": "^5.0.0", + "raw-body": "^3.0.0", + "zod": "^3.23.8", + "zod-to-json-schema": "^3.24.1" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz", @@ -5300,20 +5204,316 @@ "win32" ] }, - "node_modules/@napi-rs/wasm-runtime": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz", - "integrity": "sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==", - "dependencies": { - "@emnapi/core": "^1.1.0", - "@emnapi/runtime": "^1.1.0", - "@tybys/wasm-util": "^0.9.0" + "node_modules/@napi-rs/nice": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice/-/nice-1.0.1.tgz", + "integrity": "sha512-zM0mVWSXE0a0h9aKACLwKmD6nHcRiKrPpCfvaKqG1CqDEyjEawId0ocXxVzPMCAm6kkWr2P025msfxXEnt8UGQ==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + }, + "optionalDependencies": { + "@napi-rs/nice-android-arm-eabi": "1.0.1", + "@napi-rs/nice-android-arm64": "1.0.1", + "@napi-rs/nice-darwin-arm64": "1.0.1", + "@napi-rs/nice-darwin-x64": "1.0.1", + "@napi-rs/nice-freebsd-x64": "1.0.1", + "@napi-rs/nice-linux-arm-gnueabihf": "1.0.1", + "@napi-rs/nice-linux-arm64-gnu": "1.0.1", + "@napi-rs/nice-linux-arm64-musl": "1.0.1", + "@napi-rs/nice-linux-ppc64-gnu": "1.0.1", + "@napi-rs/nice-linux-riscv64-gnu": "1.0.1", + "@napi-rs/nice-linux-s390x-gnu": "1.0.1", + "@napi-rs/nice-linux-x64-gnu": "1.0.1", + "@napi-rs/nice-linux-x64-musl": "1.0.1", + "@napi-rs/nice-win32-arm64-msvc": "1.0.1", + "@napi-rs/nice-win32-ia32-msvc": "1.0.1", + "@napi-rs/nice-win32-x64-msvc": "1.0.1" + } + }, + "node_modules/@napi-rs/nice-android-arm-eabi": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm-eabi/-/nice-android-arm-eabi-1.0.1.tgz", + "integrity": "sha512-5qpvOu5IGwDo7MEKVqqyAxF90I6aLj4n07OzpARdgDRfz8UbBztTByBp0RC59r3J1Ij8uzYi6jI7r5Lws7nn6w==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-android-arm64": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm64/-/nice-android-arm64-1.0.1.tgz", + "integrity": "sha512-GqvXL0P8fZ+mQqG1g0o4AO9hJjQaeYG84FRfZaYjyJtZZZcMjXW5TwkL8Y8UApheJgyE13TQ4YNUssQaTgTyvA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-darwin-arm64": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-arm64/-/nice-darwin-arm64-1.0.1.tgz", + "integrity": "sha512-91k3HEqUl2fsrz/sKkuEkscj6EAj3/eZNCLqzD2AA0TtVbkQi8nqxZCZDMkfklULmxLkMxuUdKe7RvG/T6s2AA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-darwin-x64": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-x64/-/nice-darwin-x64-1.0.1.tgz", + "integrity": "sha512-jXnMleYSIR/+TAN/p5u+NkCA7yidgswx5ftqzXdD5wgy/hNR92oerTXHc0jrlBisbd7DpzoaGY4cFD7Sm5GlgQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-freebsd-x64": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-freebsd-x64/-/nice-freebsd-x64-1.0.1.tgz", + "integrity": "sha512-j+iJ/ezONXRQsVIB/FJfwjeQXX7A2tf3gEXs4WUGFrJjpe/z2KB7sOv6zpkm08PofF36C9S7wTNuzHZ/Iiccfw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-arm-gnueabihf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm-gnueabihf/-/nice-linux-arm-gnueabihf-1.0.1.tgz", + "integrity": "sha512-G8RgJ8FYXYkkSGQwywAUh84m946UTn6l03/vmEXBYNJxQJcD+I3B3k5jmjFG/OPiU8DfvxutOP8bi+F89MCV7Q==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-arm64-gnu": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-gnu/-/nice-linux-arm64-gnu-1.0.1.tgz", + "integrity": "sha512-IMDak59/W5JSab1oZvmNbrms3mHqcreaCeClUjwlwDr0m3BoR09ZiN8cKFBzuSlXgRdZ4PNqCYNeGQv7YMTjuA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-arm64-musl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-musl/-/nice-linux-arm64-musl-1.0.1.tgz", + "integrity": "sha512-wG8fa2VKuWM4CfjOjjRX9YLIbysSVV1S3Kgm2Fnc67ap/soHBeYZa6AGMeR5BJAylYRjnoVOzV19Cmkco3QEPw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-ppc64-gnu": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-ppc64-gnu/-/nice-linux-ppc64-gnu-1.0.1.tgz", + "integrity": "sha512-lxQ9WrBf0IlNTCA9oS2jg/iAjQyTI6JHzABV664LLrLA/SIdD+I1i3Mjf7TsnoUbgopBcCuDztVLfJ0q9ubf6Q==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-riscv64-gnu": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-riscv64-gnu/-/nice-linux-riscv64-gnu-1.0.1.tgz", + "integrity": "sha512-3xs69dO8WSWBb13KBVex+yvxmUeEsdWexxibqskzoKaWx9AIqkMbWmE2npkazJoopPKX2ULKd8Fm9veEn0g4Ig==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-s390x-gnu": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-s390x-gnu/-/nice-linux-s390x-gnu-1.0.1.tgz", + "integrity": "sha512-lMFI3i9rlW7hgToyAzTaEybQYGbQHDrpRkg+1gJWEpH0PLAQoZ8jiY0IzakLfNWnVda1eTYYlxxFYzW8Rqczkg==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-x64-gnu": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-gnu/-/nice-linux-x64-gnu-1.0.1.tgz", + "integrity": "sha512-XQAJs7DRN2GpLN6Fb+ZdGFeYZDdGl2Fn3TmFlqEL5JorgWKrQGRUrpGKbgZ25UeZPILuTKJ+OowG2avN8mThBA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-x64-musl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-musl/-/nice-linux-x64-musl-1.0.1.tgz", + "integrity": "sha512-/rodHpRSgiI9o1faq9SZOp/o2QkKQg7T+DK0R5AkbnI/YxvAIEHf2cngjYzLMQSQgUhxym+LFr+UGZx4vK4QdQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-win32-arm64-msvc": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-arm64-msvc/-/nice-win32-arm64-msvc-1.0.1.tgz", + "integrity": "sha512-rEcz9vZymaCB3OqEXoHnp9YViLct8ugF+6uO5McifTedjq4QMQs3DHz35xBEGhH3gJWEsXMUbzazkz5KNM5YUg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-win32-ia32-msvc": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-ia32-msvc/-/nice-win32-ia32-msvc-1.0.1.tgz", + "integrity": "sha512-t7eBAyPUrWL8su3gDxw9xxxqNwZzAqKo0Szv3IjVQd1GpXXVkb6vBBQUuxfIYaXMzZLwlxRQ7uzM2vdUE9ULGw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-win32-x64-msvc": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-x64-msvc/-/nice-win32-x64-msvc-1.0.1.tgz", + "integrity": "sha512-JlF+uDcatt3St2ntBG8H02F1mM45i5SF9W+bIKiReVE6wiy3o16oBP/yxt+RZ+N6LbCImJXJ6bXNO2kn9AXicg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" } }, "node_modules/@ngneat/dag": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@ngneat/dag/-/dag-2.0.0.tgz", "integrity": "sha512-jsqL8lGr9MQcqybQF/ygTyXjPfvxH70GEqUlm9apoIENJeqTnU8h4wpnkOOdgXxE6VGbvzQA1al42Cm5qTivbg==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, @@ -5325,63 +5525,69 @@ } }, "node_modules/@ngrx/component": { - "version": "18.1.1", - "resolved": "https://registry.npmjs.org/@ngrx/component/-/component-18.1.1.tgz", - "integrity": "sha512-7Yyw9ocRLNdra4FisyFMFin79PRyosc0r/yC3CrbpmOFxbp4kaTlGM46zlJozy7Yazl4EbxE/HVg7dkv5zsmmg==", + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@ngrx/component/-/component-19.1.0.tgz", + "integrity": "sha512-D/gRvpIorf7O2vueuP3bRIPECwXhECSnTfW8jvYBxQOp+g4UakCQkzwAOnz+uBI471xjOjdu8L7rwXiFGX9iIA==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/common": "^18.0.0", - "@angular/core": "^18.0.0", + "@angular/common": "^19.0.0", + "@angular/core": "^19.0.0", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngrx/effects": { - "version": "18.1.1", - "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-18.1.1.tgz", - "integrity": "sha512-XXob8kYEvYMaZwgHtrrTW0XZargbu5PloEpNHLnzB8jPk0yWEw6keryxaF09Ylws1779MWvMmF/YP2rPl04nHQ==", + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-19.1.0.tgz", + "integrity": "sha512-rGRN0ZnzAPmQdUPvmoqZsK7Da/AoCfQcfody+h6PfHTwXNm+M2MRc8tXO6C+fznMRww8ZgNror2dfFmoOSOvNg==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^18.0.0", - "@ngrx/store": "18.1.1", + "@angular/core": "^19.0.0", + "@ngrx/store": "19.1.0", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngrx/entity": { - "version": "18.1.1", - "resolved": "https://registry.npmjs.org/@ngrx/entity/-/entity-18.1.1.tgz", - "integrity": "sha512-oRt/wG+szR4lMvMut16uWfbMD2CnOMscnQIbU+lcOs5+UDOzr4aHGBVpErzcoVWSTp/sl7x02j+2dto5NQZWoA==", + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@ngrx/entity/-/entity-19.1.0.tgz", + "integrity": "sha512-Cy+uT5Lzs0fSaqcAtsK6ECac2ETma7UFnSnqLXSKPQmiBMNMMvP2On1c+zxaPgySG2R5kxgA0yDuHGsRiLAprA==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^18.0.0", - "@ngrx/store": "18.1.1", + "@angular/core": "^19.0.0", + "@ngrx/store": "19.1.0", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngrx/eslint-plugin": { - "version": "18.1.1", - "resolved": "https://registry.npmjs.org/@ngrx/eslint-plugin/-/eslint-plugin-18.1.1.tgz", - "integrity": "sha512-+fFKzczOabD0F2DPkIrQolxkVJgw/YV7iIvlzHqo54JKOf4vm14/wZbNiZQdAC0ScE9+c6EAkTCWTGrg1fx5/g==", + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@ngrx/eslint-plugin/-/eslint-plugin-19.1.0.tgz", + "integrity": "sha512-nRuNrlihAm/fu0JAJqCtuxo5mAPHMSjdE2L2I4R7q2RvriM6XQdjylE+aFPs0dO6AG+ZUtMRUyrj0VkO3cXrXg==", "dev": true, + "license": "MIT", "dependencies": { "semver": "^7.3.5", "strip-json-comments": "3.1.1" }, "peerDependencies": { - "@typescript-eslint/utils": "^7.11.0 || ^8.0.0-alpha.20", + "@typescript-eslint/utils": "^8.0.0", "eslint": "^8.57.0 || ^9.0.0", - "typescript": "*" + "typescript": "*", + "typescript-eslint": "^8.0.0" } }, "node_modules/@ngrx/operators": { - "version": "18.1.1", - "resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-18.1.1.tgz", - "integrity": "sha512-RB156PouKI/E79jxvJLaDFYMHz9JVFR8f4ogfAeT7sh2dDGoK4A+B0n1Cl0iYW9fpcJCdfB/mu7TkH6auFv1aQ==", + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-19.1.0.tgz", + "integrity": "sha512-gpo69FnoAF69X68pk9eWFHB630xqerBYkF68wOFMciLOV2im3b/fAf+0sRvnQJmVtG/8jO0IPVdvLqa1TbWmPA==", + "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, @@ -5390,56 +5596,78 @@ } }, "node_modules/@ngrx/router-store": { - "version": "18.1.1", - "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-18.1.1.tgz", - "integrity": "sha512-S1/09T8EJHso1keOZ2Q3hb1oAsdJ/FSEWkn24yWJXftbXOKJq1jnrYhNaVm5gPnxGzdQ1mqRtLuMKaDClyxP5A==", + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-19.1.0.tgz", + "integrity": "sha512-eMS6WtZfx29Zmlm3imgEm1WcNTRY3UGdNL7fWJyPWUPUMLArkmyDQsP+NBveLIEj1yJs8U4S8V9gzqPSiGYLHA==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/common": "^18.0.0", - "@angular/core": "^18.0.0", - "@angular/router": "^18.0.0", - "@ngrx/store": "18.1.1", + "@angular/common": "^19.0.0", + "@angular/core": "^19.0.0", + "@angular/router": "^19.0.0", + "@ngrx/store": "19.1.0", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngrx/schematics": { - "version": "18.1.1", - "resolved": "https://registry.npmjs.org/@ngrx/schematics/-/schematics-18.1.1.tgz", - "integrity": "sha512-6EexKNoTNzwHf8AIXcioOm11l6rTZ8WUpGYiPTSW2I/Pn5CsjCBDwbBDEHJZ1RqGoCXpunZn6adH63A2V8V4Sg==", - "dev": true + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@ngrx/schematics/-/schematics-19.1.0.tgz", + "integrity": "sha512-n4t0BkVOXL9RMu6i6ef14+021v6nnIrMTLH/kK0HLtW12r8lti+n3qmo+A7K3mWQmS+9eTcZcjEAF3YvfvT64g==", + "dev": true, + "license": "MIT" + }, + "node_modules/@ngrx/signals": { + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@ngrx/signals/-/signals-19.1.0.tgz", + "integrity": "sha512-v8sbb+Iox9kdIaKbFgt4Z1W+NxzIU4+g+6qQU6/c27UmtQXv0s1zUKKofPRK0qwkaZzNWkxNToxyoE285ukqcQ==", + "license": "MIT", + "dependencies": { + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/core": "^19.0.0", + "rxjs": "^6.5.3 || ^7.4.0" + }, + "peerDependenciesMeta": { + "rxjs": { + "optional": true + } + } }, "node_modules/@ngrx/store": { - "version": "18.1.1", - "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-18.1.1.tgz", - "integrity": "sha512-K0v1akJ2sEnIeb1AUA064+ksgRgbMgVG9HbSsLBxENbFjK2ZvKRxo1bpOw6WHW9+hyDTlhZGl7+gUtjmo3497g==", + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-19.1.0.tgz", + "integrity": "sha512-8kKCSFahTpRTx3f/wwcDjItdFnk2IMoorWRjTI2U/MGWuEi4flqLNWcX99s759e7TI6PctiGsaS8jnJXIUS8Jg==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^18.0.0", + "@angular/core": "^19.0.0", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngrx/store-devtools": { - "version": "18.1.1", - "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-18.1.1.tgz", - "integrity": "sha512-tfn9Ms1q2bl7VDWwHyj7dUbwmGiiVzIpOKZs39rsms8tG8hbvsxoczyQAp2w5erVtoJb8ltIh1/birKkS7HmuQ==", + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-19.1.0.tgz", + "integrity": "sha512-c8sV5FQofqm7lF6HTJ4Bb7L/69TaIYHAwEFMbgqbsNoWDx+pilw/It6X9J3LnU8bXjQK4xg6qsgJ7fJIH5X2NA==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^18.0.0", - "@ngrx/store": "18.1.1", + "@angular/core": "^19.0.0", + "@ngrx/store": "19.1.0", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngtools/webpack": { - "version": "18.2.12", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.12.tgz", - "integrity": "sha512-FFJAwtWbtpncMOVNuULPBwFJB7GSjiUwO93eGTzRp8O4EPQ8lCQeFbezQm/NP34+T0+GBLGzPSuQT+muob8YKw==", + "version": "19.2.12", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-19.2.12.tgz", + "integrity": "sha512-MTxkM+jZPQP55q0BWx/1w2kaN9mSFC14V9+p4sfNm/OXk7fibtxz5lXH/2sDGFWJi36s4gppKqfHBhp9OTdHCQ==", "dev": true, "license": "MIT", "engines": { @@ -5448,8 +5676,8 @@ "yarn": ">= 1.13.0" }, "peerDependencies": { - "@angular/compiler-cli": "^18.0.0", - "typescript": ">=5.4 <5.6", + "@angular/compiler-cli": "^19.0.0 || ^19.2.0-next.0", + "typescript": ">=5.5 <5.9", "webpack": "^5.54.0" } }, @@ -5457,6 +5685,8 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -5469,6 +5699,8 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } @@ -5477,6 +5709,8 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -5486,9 +5720,9 @@ } }, "node_modules/@npmcli/agent": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", - "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-3.0.0.tgz", + "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==", "dev": true, "license": "ISC", "dependencies": { @@ -5499,41 +5733,47 @@ "socks-proxy-agent": "^8.0.3" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, + "node_modules/@npmcli/agent/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC" + }, "node_modules/@npmcli/fs": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", - "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz", + "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==", "dev": true, "license": "ISC", "dependencies": { "semver": "^7.3.5" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/git": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz", - "integrity": "sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-6.0.3.tgz", + "integrity": "sha512-GUYESQlxZRAdhs3UhbB6pVRNUELQOHXwK9ruDkwmCv2aZ5y0SApQzUJCg02p3A7Ue2J5hxvlk1YI53c00NmRyQ==", "dev": true, "license": "ISC", "dependencies": { - "@npmcli/promise-spawn": "^7.0.0", - "ini": "^4.1.3", + "@npmcli/promise-spawn": "^8.0.0", + "ini": "^5.0.0", "lru-cache": "^10.0.1", - "npm-pick-manifest": "^9.0.0", - "proc-log": "^4.0.0", - "promise-inflight": "^1.0.1", + "npm-pick-manifest": "^10.0.0", + "proc-log": "^5.0.0", "promise-retry": "^2.0.1", "semver": "^7.3.5", - "which": "^4.0.0" + "which": "^5.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/git/node_modules/isexe": { @@ -5546,10 +5786,17 @@ "node": ">=16" } }, + "node_modules/@npmcli/git/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC" + }, "node_modules/@npmcli/git/node_modules/which": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", + "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==", "dev": true, "license": "ISC", "dependencies": { @@ -5559,66 +5806,66 @@ "node-which": "bin/which.js" }, "engines": { - "node": "^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/installed-package-contents": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz", - "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-3.0.0.tgz", + "integrity": "sha512-fkxoPuFGvxyrH+OQzyTkX2LUEamrF4jZSmxjAtPPHHGO0dqsQ8tTKjnIS8SAnPHdk2I03BDtSMR5K/4loKg79Q==", "dev": true, "license": "ISC", "dependencies": { - "npm-bundled": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" + "npm-bundled": "^4.0.0", + "npm-normalize-package-bin": "^4.0.0" }, "bin": { "installed-package-contents": "bin/index.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/node-gyp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", - "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz", + "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==", "dev": true, "license": "ISC", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/package-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.0.tgz", - "integrity": "sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-6.1.1.tgz", + "integrity": "sha512-d5qimadRAUCO4A/Txw71VM7UrRZzV+NPclxz/dc+M6B2oYwjWTjqh8HA/sGQgs9VZuJ6I/P7XIAlJvgrl27ZOw==", "dev": true, "license": "ISC", "dependencies": { - "@npmcli/git": "^5.0.0", + "@npmcli/git": "^6.0.0", "glob": "^10.2.2", - "hosted-git-info": "^7.0.0", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^6.0.0", - "proc-log": "^4.0.0", - "semver": "^7.5.3" + "hosted-git-info": "^8.0.0", + "json-parse-even-better-errors": "^4.0.0", + "proc-log": "^5.0.0", + "semver": "^7.5.3", + "validate-npm-package-license": "^3.0.4" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/promise-spawn": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz", - "integrity": "sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.2.tgz", + "integrity": "sha512-/bNJhjc+o6qL+Dwz/bqfTQClkEO5nTQ1ZEcdCkAQjhkZMHIh22LPG7fNh1enJP1NKWDqYiiABnjFCY7E0zHYtQ==", "dev": true, "license": "ISC", "dependencies": { - "which": "^4.0.0" + "which": "^5.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/promise-spawn/node_modules/isexe": { @@ -5632,9 +5879,9 @@ } }, "node_modules/@npmcli/promise-spawn/node_modules/which": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", + "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==", "dev": true, "license": "ISC", "dependencies": { @@ -5644,35 +5891,35 @@ "node-which": "bin/which.js" }, "engines": { - "node": "^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/redact": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz", - "integrity": "sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-3.2.2.tgz", + "integrity": "sha512-7VmYAmk4csGv08QzrDKScdzn11jHPFGyqJW39FyPgPuAp3zIaUmuCo1yxw9aGs+NEJuTGQ9Gwqpt93vtJubucg==", "dev": true, "license": "ISC", "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/run-script": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-8.1.0.tgz", - "integrity": "sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-9.1.0.tgz", + "integrity": "sha512-aoNSbxtkePXUlbZB+anS1LqsJdctG5n3UVhfU47+CDdwMi6uNTBMF9gPcQRnqghQd2FGzcwwIFBruFMxjhBewg==", "dev": true, "license": "ISC", "dependencies": { - "@npmcli/node-gyp": "^3.0.0", - "@npmcli/package-json": "^5.0.0", - "@npmcli/promise-spawn": "^7.0.0", - "node-gyp": "^10.0.0", - "proc-log": "^4.0.0", - "which": "^4.0.0" + "@npmcli/node-gyp": "^4.0.0", + "@npmcli/package-json": "^6.0.0", + "@npmcli/promise-spawn": "^8.0.0", + "node-gyp": "^11.0.0", + "proc-log": "^5.0.0", + "which": "^5.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/run-script/node_modules/isexe": { @@ -5686,9 +5933,9 @@ } }, "node_modules/@npmcli/run-script/node_modules/which": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", + "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==", "dev": true, "license": "ISC", "dependencies": { @@ -5698,199 +5945,341 @@ "node-which": "bin/which.js" }, "engines": { - "node": "^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, - "node_modules/@nx/devkit": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-20.0.12.tgz", - "integrity": "sha512-HsaDoAmzLPE2vHal2eNYvH7x6NCfHjUblm8WDD12Q/uCdTBvDTZqd7P+bukEH+2FhY89Dn/1fy59vKkA+rcB/g==", + "node_modules/@parcel/watcher": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz", + "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, "dependencies": { - "ejs": "^3.1.7", - "enquirer": "~2.3.6", - "ignore": "^5.0.4", - "minimatch": "9.0.3", - "semver": "^7.5.3", - "tmp": "~0.2.1", - "tslib": "^2.3.0", - "yargs-parser": "21.1.1" - }, - "peerDependencies": { - "nx": ">= 19 <= 21" - } - }, - "node_modules/@nx/devkit/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@nx/devkit/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dependencies": { - "brace-expansion": "^2.0.1" + "detect-libc": "^1.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": ">= 10.0.0" }, "funding": { - "url": "https://github.com/sponsors/isaacs" + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.5.1", + "@parcel/watcher-darwin-arm64": "2.5.1", + "@parcel/watcher-darwin-x64": "2.5.1", + "@parcel/watcher-freebsd-x64": "2.5.1", + "@parcel/watcher-linux-arm-glibc": "2.5.1", + "@parcel/watcher-linux-arm-musl": "2.5.1", + "@parcel/watcher-linux-arm64-glibc": "2.5.1", + "@parcel/watcher-linux-arm64-musl": "2.5.1", + "@parcel/watcher-linux-x64-glibc": "2.5.1", + "@parcel/watcher-linux-x64-musl": "2.5.1", + "@parcel/watcher-win32-arm64": "2.5.1", + "@parcel/watcher-win32-ia32": "2.5.1", + "@parcel/watcher-win32-x64": "2.5.1" } }, - "node_modules/@nx/nx-darwin-arm64": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.0.12.tgz", - "integrity": "sha512-iwEDUTKx0n2S6Nz9gc9ShrfBw0MG87U0YIu2x/09tKOSkcsw90QKy54qN/6WNoFIE41Kt3U+dYtWi+NdLRE9kw==", + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz", + "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==", "cpu": [ "arm64" ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz", + "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-darwin-x64": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.0.12.tgz", - "integrity": "sha512-JYFNf0yPReejaooQAAIMsjWDGENT777wDXj45e7JQUMM4t6NOMpGBj4qUFyc6a/jXT+/bCGEj4N7VDZDZiogGA==", + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz", + "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==", "cpu": [ "x64" ], + "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-freebsd-x64": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.0.12.tgz", - "integrity": "sha512-892n8o7vxdmE7pol3ggV78YHlP25p6Y/Z2x69nnC3BBTpWmesyd6lbEmamANofD5KcKCmT1HquC3m6rCT7akHw==", + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz", + "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==", "cpu": [ "x64" ], + "dev": true, + "license": "MIT", "optional": true, "os": [ "freebsd" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.0.12.tgz", - "integrity": "sha512-ZPcdYIVAc5JMtmvroJOloI9CJgtwBOGr7E7mO1eT44zs5av0j/QMIj6GSDdvJ7fx+I7TmT4mDiu3s6rLO+/JjA==", + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz", + "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==", "cpu": [ "arm" ], + "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.0.12.tgz", - "integrity": "sha512-TadGwwUKS5WQg2YOMb2WuuVG1k14miSdB9qJOcAX5MGdOiQ1fpV00ph+kMWZSsCCo6N7sKxmvXXXdsUUFSDGjg==", + "node_modules/@parcel/watcher-linux-arm-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz", + "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz", + "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==", "cpu": [ "arm64" ], + "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-linux-arm64-musl": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.0.12.tgz", - "integrity": "sha512-EE2HQjgY87/s9+PQ27vbYyDEXFZ4Qot+O8ThVDVuMI/2dosmWs6C4+YEm3VYG+CT31MVwe/vHKXbDlZgkROMuA==", + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz", + "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==", "cpu": [ "arm64" ], + "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-linux-x64-gnu": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.0.12.tgz", - "integrity": "sha512-gITJ2g6dH2qvGrI2CHHRyd3soVrJyQQGkqtJnWq04ge+YDy/KniXR2ThQ93LI/QLAxKrKOe3qmIIaNdcdDYnjA==", + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz", + "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==", "cpu": [ "x64" ], + "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-linux-x64-musl": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.0.12.tgz", - "integrity": "sha512-vOoCrjL44nFZ5N8a4UAIYELnf/tq1dRaLEhSV+P0hKTEtwONj4k8crfU/2HifG1iU7p3AWJLEyaddMoINhB/2g==", + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz", + "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==", "cpu": [ "x64" ], + "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.0.12.tgz", - "integrity": "sha512-gKdaul23bdRnh493iAd6pSLPSW54VBuEv2zPL86cgprLOcEZiGM5BLJWQguKHCib6dYKaIP4CUIs7i7vhEID+A==", + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz", + "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==", "cpu": [ "arm64" ], + "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nx/nx-win32-x64-msvc": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.0.12.tgz", - "integrity": "sha512-R1pz4kAG0Ok0EDxXhHwKM3ZZcK2nLycuR9SDrq2Ldp2knvbFf4quSjWyAQaiofJXo179+noa7o5tZDZbNjBYMw==", + "node_modules/@parcel/watcher-win32-ia32": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz", + "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==", "cpu": [ - "x64" + "ia32" ], + "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" ], "engines": { - "node": ">= 10" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, + "node_modules/@parcel/watcher-win32-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz", + "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher/node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/@parcel/watcher/node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "dev": true, + "license": "MIT", + "optional": true + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -5902,23 +6291,40 @@ "node": ">=14" } }, - "node_modules/@pkgr/core": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz", - "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==", - "dev": true, + "node_modules/@primeng/themes": { + "version": "19.1.2", + "resolved": "https://registry.npmjs.org/@primeng/themes/-/themes-19.1.2.tgz", + "integrity": "sha512-6q6jYks+S9+oqJUtsBKSAt9PdO2eUIkYyg4qGZAF2Dsp7YZ5nt4W/S5JUjxEDEjrtwUe+uDLeQr7PxNJErN4Gg==", + "license": "SEE LICENSE IN LICENSE.md", + "dependencies": { + "@primeuix/styled": "^0.3.2" + } + }, + "node_modules/@primeuix/styled": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@primeuix/styled/-/styled-0.3.2.tgz", + "integrity": "sha512-ColZes0+/WKqH4ob2x8DyNYf1NENpe5ZguOvx5yCLxaP8EIMVhLjWLO/3umJiDnQU4XXMLkn2mMHHw+fhTX/mw==", + "license": "MIT", + "dependencies": { + "@primeuix/utils": "^0.3.2" + }, + "engines": { + "node": ">=12.11.0" + } + }, + "node_modules/@primeuix/utils": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.3.2.tgz", + "integrity": "sha512-B+nphqTQeq+i6JuICLdVWnDMjONome2sNz0xI65qIOyeB4EF12CoKRiCsxuZ5uKAkHi/0d1LqlQ9mIWRSdkavw==", "license": "MIT", "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/unts" + "node": ">=12.11.0" } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz", - "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.8.tgz", + "integrity": "sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==", "cpu": [ "arm" ], @@ -5930,9 +6336,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz", - "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.8.tgz", + "integrity": "sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==", "cpu": [ "arm64" ], @@ -5944,9 +6350,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz", - "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.8.tgz", + "integrity": "sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==", "cpu": [ "arm64" ], @@ -5958,9 +6364,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz", - "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.8.tgz", + "integrity": "sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==", "cpu": [ "x64" ], @@ -5971,10 +6377,38 @@ "darwin" ] }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.8.tgz", + "integrity": "sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.8.tgz", + "integrity": "sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz", - "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.8.tgz", + "integrity": "sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==", "cpu": [ "arm" ], @@ -5986,9 +6420,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz", - "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.8.tgz", + "integrity": "sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==", "cpu": [ "arm" ], @@ -6000,9 +6434,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz", - "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.8.tgz", + "integrity": "sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==", "cpu": [ "arm64" ], @@ -6014,9 +6448,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz", - "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.8.tgz", + "integrity": "sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==", "cpu": [ "arm64" ], @@ -6027,10 +6461,24 @@ "linux" ] }, + "node_modules/@rollup/rollup-linux-loongarch64-gnu": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.8.tgz", + "integrity": "sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz", - "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.8.tgz", + "integrity": "sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==", "cpu": [ "ppc64" ], @@ -6042,9 +6490,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz", - "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.8.tgz", + "integrity": "sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==", "cpu": [ "riscv64" ], @@ -6056,9 +6504,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz", - "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz", + "integrity": "sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==", "cpu": [ "s390x" ], @@ -6070,9 +6518,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz", - "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.8.tgz", + "integrity": "sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==", "cpu": [ "x64" ], @@ -6084,9 +6532,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz", - "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.8.tgz", + "integrity": "sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==", "cpu": [ "x64" ], @@ -6098,9 +6546,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz", - "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.8.tgz", + "integrity": "sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==", "cpu": [ "arm64" ], @@ -6112,9 +6560,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz", - "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.8.tgz", + "integrity": "sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==", "cpu": [ "ia32" ], @@ -6126,9 +6574,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz", - "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.8.tgz", + "integrity": "sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==", "cpu": [ "x64" ], @@ -6143,17 +6591,18 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@schematics/angular": { - "version": "18.2.12", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.12.tgz", - "integrity": "sha512-sIoeipsisK5eTLW3XuNZYcal83AfslBbgI7LnV+3VrXwpasKPGHwo2ZdwhCd2IXAkuJ02Iyu7MyV0aQRM9i/3g==", + "version": "19.1.6", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.1.6.tgz", + "integrity": "sha512-TxFp6iHBqXcuyZIW84HA4z3XkAMz3wTw46K3GNhzyfhFTFD0YD+DtaR3MfQ+vcj3YUYu9j44zrB9nchzugR9Ew==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.12", - "@angular-devkit/schematics": "18.2.12", + "@angular-devkit/core": "19.1.6", + "@angular-devkit/schematics": "19.1.6", "jsonc-parser": "3.3.1" }, "engines": { @@ -6162,98 +6611,86 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@schematics/angular/node_modules/jsonc-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", - "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", - "dev": true, - "license": "MIT" - }, "node_modules/@sigstore/bundle": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz", - "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz", + "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@sigstore/protobuf-specs": "^0.3.2" + "@sigstore/protobuf-specs": "^0.4.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@sigstore/core": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz", - "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz", + "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg==", "dev": true, "license": "Apache-2.0", "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@sigstore/protobuf-specs": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.2.tgz", - "integrity": "sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.4.1.tgz", + "integrity": "sha512-7MJXQhIm7dWF9zo7rRtMYh8d2gSnc3+JddeQOTIg6gUN7FjcuckZ9EwGq+ReeQtbbl3Tbf5YqRrWxA1DMfIn+w==", "dev": true, "license": "Apache-2.0", "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@sigstore/sign": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz", - "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz", + "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@sigstore/bundle": "^2.3.2", - "@sigstore/core": "^1.0.0", - "@sigstore/protobuf-specs": "^0.3.2", - "make-fetch-happen": "^13.0.1", - "proc-log": "^4.2.0", + "@sigstore/bundle": "^3.1.0", + "@sigstore/core": "^2.0.0", + "@sigstore/protobuf-specs": "^0.4.0", + "make-fetch-happen": "^14.0.2", + "proc-log": "^5.0.0", "promise-retry": "^2.0.1" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@sigstore/tuf": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz", - "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.1.1.tgz", + "integrity": "sha512-eFFvlcBIoGwVkkwmTi/vEQFSva3xs5Ot3WmBcjgjVdiaoelBLQaQ/ZBfhlG0MnG0cmTYScPpk7eDdGDWUcFUmg==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@sigstore/protobuf-specs": "^0.3.2", - "tuf-js": "^2.2.1" + "@sigstore/protobuf-specs": "^0.4.1", + "tuf-js": "^3.0.1" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@sigstore/verify": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz", - "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz", + "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@sigstore/bundle": "^2.3.2", - "@sigstore/core": "^1.1.0", - "@sigstore/protobuf-specs": "^0.3.2" + "@sigstore/bundle": "^3.1.0", + "@sigstore/core": "^2.0.0", + "@sigstore/protobuf-specs": "^0.4.1" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, - "node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==" - }, "node_modules/@sindresorhus/merge-streams": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", @@ -6268,293 +6705,314 @@ } }, "node_modules/@smithy/abort-controller": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.9.tgz", - "integrity": "sha512-yiW0WI30zj8ZKoSYNx90no7ugVn3khlyH/z5W8qtKBtVE6awRALbhSG+2SAHA1r6bO/6M9utxYKVZ3PCJ1rWxw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.2.tgz", + "integrity": "sha512-Sl/78VDtgqKxN2+1qduaVE140XF+Xg+TafkncspwM4jFP/LHr76ZHmIY/y3V1M0mMLNk+Je6IGbzxy23RSToMw==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/chunked-blob-reader": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-4.0.0.tgz", - "integrity": "sha512-jSqRnZvkT4egkq/7b6/QRCNXmmYVcHwnJldqJ3IhVpQE2atObVJ137xmGeuGFhjFUr8gCEVAOKwSY79OvpbDaQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.0.0.tgz", + "integrity": "sha512-+sKqDBQqb036hh4NPaUiEkYFkTUGYzRsn3EuFhyfQfMy6oGHEUJDurLP9Ufb5dasr/XiAmPNMr6wa9afjQB+Gw==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" } }, "node_modules/@smithy/chunked-blob-reader-native": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-3.0.1.tgz", - "integrity": "sha512-VEYtPvh5rs/xlyqpm5NRnfYLZn+q0SRPELbvBV+C/G7IQ+ouTuo+NKKa3ShG5OaFR8NYVMXls9hPYLTvIKKDrQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.0.0.tgz", + "integrity": "sha512-R9wM2yPmfEMsUmlMlIgSzOyICs0x9uu7UTHoccMyt7BWw8shcGM8HqB355+BZCPBcySvbTYMs62EgEQkNxz2ig==", "license": "Apache-2.0", "dependencies": { - "@smithy/util-base64": "^3.0.0", + "@smithy/util-base64": "^4.0.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" } }, "node_modules/@smithy/config-resolver": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.13.tgz", - "integrity": "sha512-Gr/qwzyPaTL1tZcq8WQyHhTZREER5R1Wytmz4WnVGL4onA3dNk6Btll55c8Vr58pLdvWZmtG8oZxJTw3t3q7Jg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.1.2.tgz", + "integrity": "sha512-7r6mZGwb5LmLJ+zPtkLoznf2EtwEuSWdtid10pjGl/7HefCE4mueOkrfki8JCUm99W6UfP47/r3tbxx9CfBN5A==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.12", - "@smithy/types": "^3.7.2", - "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.11", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/types": "^4.2.0", + "@smithy/util-config-provider": "^4.0.0", + "@smithy/util-middleware": "^4.0.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/core": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.5.5.tgz", - "integrity": "sha512-G8G/sDDhXA7o0bOvkc7bgai6POuSld/+XhNnWAbpQTpLv2OZPvyqQ58tLPPlz0bSNsXktldDDREIv1LczFeNEw==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.3.3.tgz", + "integrity": "sha512-CiJNc0b/WdnttAfQ6uMkxPQ3Z8hG/ba8wF89x9KtBBLDdZk6CX52K4F8hbe94uNbc8LDUuZFtbqfdhM3T21naw==", "license": "Apache-2.0", "dependencies": { - "@smithy/middleware-serde": "^3.0.11", - "@smithy/protocol-http": "^4.1.8", - "@smithy/types": "^3.7.2", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-middleware": "^3.0.11", - "@smithy/util-stream": "^3.3.2", - "@smithy/util-utf8": "^3.0.0", + "@smithy/middleware-serde": "^4.0.5", + "@smithy/protocol-http": "^5.1.0", + "@smithy/types": "^4.2.0", + "@smithy/util-body-length-browser": "^4.0.0", + "@smithy/util-middleware": "^4.0.2", + "@smithy/util-stream": "^4.2.0", + "@smithy/util-utf8": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/credential-provider-imds": { - "version": "3.2.8", - "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.8.tgz", - "integrity": "sha512-ZCY2yD0BY+K9iMXkkbnjo+08T2h8/34oHd0Jmh6BZUSZwaaGlGCyBT/3wnS7u7Xl33/EEfN4B6nQr3Gx5bYxgw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.4.tgz", + "integrity": "sha512-jN6M6zaGVyB8FmNGG+xOPQB4N89M1x97MMdMnm1ESjljLS3Qju/IegQizKujaNcy2vXAvrz0en8bobe6E55FEA==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.12", - "@smithy/property-provider": "^3.1.11", - "@smithy/types": "^3.7.2", - "@smithy/url-parser": "^3.0.11", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/property-provider": "^4.0.2", + "@smithy/types": "^4.2.0", + "@smithy/url-parser": "^4.0.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/eventstream-codec": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.10.tgz", - "integrity": "sha512-323B8YckSbUH0nMIpXn7HZsAVKHYHFUODa8gG9cHo0ySvA1fr5iWaNT+iIL0UCqUzG6QPHA3BSsBtRQou4mMqQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-4.0.2.tgz", + "integrity": "sha512-p+f2kLSK7ZrXVfskU/f5dzksKTewZk8pJLPvER3aFHPt76C2MxD9vNatSfLzzQSQB4FNO96RK4PSXfhD1TTeMQ==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/crc32": "5.2.0", - "@smithy/types": "^3.7.2", - "@smithy/util-hex-encoding": "^3.0.0", + "@smithy/types": "^4.2.0", + "@smithy/util-hex-encoding": "^4.0.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" } }, "node_modules/@smithy/eventstream-serde-browser": { - "version": "3.0.14", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.14.tgz", - "integrity": "sha512-kbrt0vjOIihW3V7Cqj1SXQvAI5BR8SnyQYsandva0AOR307cXAc+IhPngxIPslxTLfxwDpNu0HzCAq6g42kCPg==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.0.2.tgz", + "integrity": "sha512-CepZCDs2xgVUtH7ZZ7oDdZFH8e6Y2zOv8iiX6RhndH69nlojCALSKK+OXwZUgOtUZEUaZ5e1hULVCHYbCn7pug==", "license": "Apache-2.0", "dependencies": { - "@smithy/eventstream-serde-universal": "^3.0.13", - "@smithy/types": "^3.7.2", + "@smithy/eventstream-serde-universal": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/eventstream-serde-config-resolver": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.11.tgz", - "integrity": "sha512-P2pnEp4n75O+QHjyO7cbw/vsw5l93K/8EWyjNCAAybYwUmj3M+hjSQZ9P5TVdUgEG08ueMAP5R4FkuSkElZ5tQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.1.0.tgz", + "integrity": "sha512-1PI+WPZ5TWXrfj3CIoKyUycYynYJgZjuQo8U+sphneOtjsgrttYybdqESFReQrdWJ+LKt6NEdbYzmmfDBmjX2A==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/eventstream-serde-node": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.13.tgz", - "integrity": "sha512-zqy/9iwbj8Wysmvi7Lq7XFLeDgjRpTbCfwBhJa8WbrylTAHiAu6oQTwdY7iu2lxigbc9YYr9vPv5SzYny5tCXQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.0.2.tgz", + "integrity": "sha512-C5bJ/C6x9ENPMx2cFOirspnF9ZsBVnBMtP6BdPl/qYSuUawdGQ34Lq0dMcf42QTjUZgWGbUIZnz6+zLxJlb9aw==", "license": "Apache-2.0", "dependencies": { - "@smithy/eventstream-serde-universal": "^3.0.13", - "@smithy/types": "^3.7.2", + "@smithy/eventstream-serde-universal": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/eventstream-serde-universal": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.13.tgz", - "integrity": "sha512-L1Ib66+gg9uTnqp/18Gz4MDpJPKRE44geOjOQ2SVc0eiaO5l255ADziATZgjQjqumC7yPtp1XnjHlF1srcwjKw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.0.2.tgz", + "integrity": "sha512-St8h9JqzvnbB52FtckiHPN4U/cnXcarMniXRXTKn0r4b4XesZOGiAyUdj1aXbqqn1icSqBlzzUsCl6nPB018ng==", "license": "Apache-2.0", "dependencies": { - "@smithy/eventstream-codec": "^3.1.10", - "@smithy/types": "^3.7.2", + "@smithy/eventstream-codec": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/fetch-http-handler": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.1.2.tgz", - "integrity": "sha512-R7rU7Ae3ItU4rC0c5mB2sP5mJNbCfoDc8I5XlYjIZnquyUwec7fEo78F6DA3SmgJgkU1qTMcZJuGblxZsl10ZA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.2.tgz", + "integrity": "sha512-+9Dz8sakS9pe7f2cBocpJXdeVjMopUDLgZs1yWeu7h++WqSbjUYv/JAJwKwXw1HV6gq1jyWjxuyn24E2GhoEcQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/protocol-http": "^4.1.8", - "@smithy/querystring-builder": "^3.0.11", - "@smithy/types": "^3.7.2", - "@smithy/util-base64": "^3.0.0", + "@smithy/protocol-http": "^5.1.0", + "@smithy/querystring-builder": "^4.0.2", + "@smithy/types": "^4.2.0", + "@smithy/util-base64": "^4.0.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" } }, "node_modules/@smithy/hash-blob-browser": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.10.tgz", - "integrity": "sha512-elwslXOoNunmfS0fh55jHggyhccobFkexLYC1ZeZ1xP2BTSrcIBaHV2b4xUQOdctrSNOpMqOZH1r2XzWTEhyfA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-4.0.2.tgz", + "integrity": "sha512-3g188Z3DyhtzfBRxpZjU8R9PpOQuYsbNnyStc/ZVS+9nVX1f6XeNOa9IrAh35HwwIZg+XWk8bFVtNINVscBP+g==", "license": "Apache-2.0", "dependencies": { - "@smithy/chunked-blob-reader": "^4.0.0", - "@smithy/chunked-blob-reader-native": "^3.0.1", - "@smithy/types": "^3.7.2", + "@smithy/chunked-blob-reader": "^5.0.0", + "@smithy/chunked-blob-reader-native": "^4.0.0", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" } }, "node_modules/@smithy/hash-node": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.11.tgz", - "integrity": "sha512-emP23rwYyZhQBvklqTtwetkQlqbNYirDiEEwXl2v0GYWMnCzxst7ZaRAnWuy28njp5kAH54lvkdG37MblZzaHA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.0.2.tgz", + "integrity": "sha512-VnTpYPnRUE7yVhWozFdlxcYknv9UN7CeOqSrMH+V877v4oqtVYuoqhIhtSjmGPvYrYnAkaM61sLMKHvxL138yg==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", + "@smithy/types": "^4.2.0", + "@smithy/util-buffer-from": "^4.0.0", + "@smithy/util-utf8": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/hash-stream-node": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.1.10.tgz", - "integrity": "sha512-olomK/jZQ93OMayW1zfTHwcbwBdhcZOHsyWyiZ9h9IXvc1mCD/VuvzbLb3Gy/qNJwI4MANPLctTp2BucV2oU/Q==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-4.0.2.tgz", + "integrity": "sha512-POWDuTznzbIwlEXEvvXoPMS10y0WKXK790soe57tFRfvf4zBHyzE529HpZMqmDdwG9MfFflnyzndUQ8j78ZdSg==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", - "@smithy/util-utf8": "^3.0.0", + "@smithy/types": "^4.2.0", + "@smithy/util-utf8": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/invalid-dependency": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.11.tgz", - "integrity": "sha512-NuQmVPEJjUX6c+UELyVz8kUx8Q539EDeNwbRyu4IIF8MeV7hUtq1FB3SHVyki2u++5XLMFqngeMKk7ccspnNyQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.0.2.tgz", + "integrity": "sha512-GatB4+2DTpgWPday+mnUkoumP54u/MDM/5u44KF9hIu8jF0uafZtQLcdfIKkIcUNuF/fBojpLEHZS/56JqPeXQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" } }, "node_modules/@smithy/is-array-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz", - "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.0.0.tgz", + "integrity": "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/md5-js": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.11.tgz", - "integrity": "sha512-3NM0L3i2Zm4bbgG6Ymi9NBcxXhryi3uE8fIfHJZIOfZVxOkGdjdgjR9A06SFIZCfnEIWKXZdm6Yq5/aPXFFhsQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-4.0.2.tgz", + "integrity": "sha512-Hc0R8EiuVunUewCse2syVgA2AfSRco3LyAv07B/zCOMa+jpXI9ll+Q21Nc6FAlYPcpNcAXqBzMhNs1CD/pP2bA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", - "@smithy/util-utf8": "^3.0.0", + "@smithy/types": "^4.2.0", + "@smithy/util-utf8": "^4.0.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" } }, "node_modules/@smithy/middleware-content-length": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.13.tgz", - "integrity": "sha512-zfMhzojhFpIX3P5ug7jxTjfUcIPcGjcQYzB9t+rv0g1TX7B0QdwONW+ATouaLoD7h7LOw/ZlXfkq4xJ/g2TrIw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.0.2.tgz", + "integrity": "sha512-hAfEXm1zU+ELvucxqQ7I8SszwQ4znWMbNv6PLMndN83JJN41EPuS93AIyh2N+gJ6x8QFhzSO6b7q2e6oClDI8A==", "license": "Apache-2.0", "dependencies": { - "@smithy/protocol-http": "^4.1.8", - "@smithy/types": "^3.7.2", + "@smithy/protocol-http": "^5.1.0", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/middleware-endpoint": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.2.5.tgz", - "integrity": "sha512-VhJNs/s/lyx4weiZdXSloBgoLoS8osV0dKIain8nGmx7of3QFKu5BSdEuk1z/U8x9iwes1i+XCiNusEvuK1ijg==", + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.6.tgz", + "integrity": "sha512-Zdieg07c3ua3ap5ungdcyNnY1OsxmsXXtKDTk28+/YbwIPju0Z1ZX9X5AnkjmDE3+AbqgvhtC/ZuCMSr6VSfPw==", "license": "Apache-2.0", "dependencies": { - "@smithy/core": "^2.5.5", - "@smithy/middleware-serde": "^3.0.11", - "@smithy/node-config-provider": "^3.1.12", - "@smithy/shared-ini-file-loader": "^3.1.12", - "@smithy/types": "^3.7.2", - "@smithy/url-parser": "^3.0.11", - "@smithy/util-middleware": "^3.0.11", + "@smithy/core": "^3.3.3", + "@smithy/middleware-serde": "^4.0.5", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/shared-ini-file-loader": "^4.0.2", + "@smithy/types": "^4.2.0", + "@smithy/url-parser": "^4.0.2", + "@smithy/util-middleware": "^4.0.2", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/middleware-retry": { - "version": "3.0.30", - "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.30.tgz", - "integrity": "sha512-6323RL2BvAR3VQpTjHpa52kH/iSHyxd/G9ohb2MkBk2Ucu+oMtRXT8yi7KTSIS9nb58aupG6nO0OlXnQOAcvmQ==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.1.7.tgz", + "integrity": "sha512-lFIFUJ0E/4I0UaIDY5usNUzNKAghhxO0lDH4TZktXMmE+e4ActD9F154Si0Unc01aCPzcwd+NcOwQw6AfXXRRQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.12", - "@smithy/protocol-http": "^4.1.8", - "@smithy/service-error-classification": "^3.0.11", - "@smithy/smithy-client": "^3.5.0", - "@smithy/types": "^3.7.2", - "@smithy/util-middleware": "^3.0.11", - "@smithy/util-retry": "^3.0.11", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/protocol-http": "^5.1.0", + "@smithy/service-error-classification": "^4.0.3", + "@smithy/smithy-client": "^4.2.6", + "@smithy/types": "^4.2.0", + "@smithy/util-middleware": "^4.0.2", + "@smithy/util-retry": "^4.0.3", "tslib": "^2.6.2", "uuid": "^9.0.1" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/middleware-retry/node_modules/uuid": { @@ -6571,454 +7029,410 @@ } }, "node_modules/@smithy/middleware-serde": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.11.tgz", - "integrity": "sha512-KzPAeySp/fOoQA82TpnwItvX8BBURecpx6ZMu75EZDkAcnPtO6vf7q4aH5QHs/F1s3/snQaSFbbUMcFFZ086Mw==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.0.5.tgz", + "integrity": "sha512-yREC3q/HXqQigq29xX3hiy6tFi+kjPKXoYUQmwQdgPORLbQ0n6V2Z/Iw9Nnlu66da9fM/WhDtGvYvqwecrCljQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", + "@smithy/protocol-http": "^5.1.0", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/middleware-stack": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.11.tgz", - "integrity": "sha512-1HGo9a6/ikgOMrTrWL/WiN9N8GSVYpuRQO5kjstAq4CvV59bjqnh7TbdXGQ4vxLD3xlSjfBjq5t1SOELePsLnA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.0.2.tgz", + "integrity": "sha512-eSPVcuJJGVYrFYu2hEq8g8WWdJav3sdrI4o2c6z/rjnYDd3xH9j9E7deZQCzFn4QvGPouLngH3dQ+QVTxv5bOQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/node-config-provider": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.12.tgz", - "integrity": "sha512-O9LVEu5J/u/FuNlZs+L7Ikn3lz7VB9hb0GtPT9MQeiBmtK8RSY3ULmsZgXhe6VAlgTw0YO+paQx4p8xdbs43vQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.1.1.tgz", + "integrity": "sha512-1slS5jf5icHETwl5hxEVBj+mh6B+LbVW4yRINsGtUKH+nxM5Pw2H59+qf+JqYFCHp9jssG4vX81f5WKnjMN3Vw==", "license": "Apache-2.0", "dependencies": { - "@smithy/property-provider": "^3.1.11", - "@smithy/shared-ini-file-loader": "^3.1.12", - "@smithy/types": "^3.7.2", + "@smithy/property-provider": "^4.0.2", + "@smithy/shared-ini-file-loader": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/node-http-handler": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.3.2.tgz", - "integrity": "sha512-t4ng1DAd527vlxvOfKFYEe6/QFBcsj7WpNlWTyjorwXXcKw3XlltBGbyHfSJ24QT84nF+agDha9tNYpzmSRZPA==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.0.4.tgz", + "integrity": "sha512-/mdqabuAT3o/ihBGjL94PUbTSPSRJ0eeVTdgADzow0wRJ0rN4A27EOrtlK56MYiO1fDvlO3jVTCxQtQmK9dZ1g==", "license": "Apache-2.0", "dependencies": { - "@smithy/abort-controller": "^3.1.9", - "@smithy/protocol-http": "^4.1.8", - "@smithy/querystring-builder": "^3.0.11", - "@smithy/types": "^3.7.2", + "@smithy/abort-controller": "^4.0.2", + "@smithy/protocol-http": "^5.1.0", + "@smithy/querystring-builder": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/property-provider": { - "version": "3.1.11", - "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.11.tgz", - "integrity": "sha512-I/+TMc4XTQ3QAjXfOcUWbSS073oOEAxgx4aZy8jHaf8JQnRkq2SZWw8+PfDtBvLUjcGMdxl+YwtzWe6i5uhL/A==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.2.tgz", + "integrity": "sha512-wNRoQC1uISOuNc2s4hkOYwYllmiyrvVXWMtq+TysNRVQaHm4yoafYQyjN/goYZS+QbYlPIbb/QRjaUZMuzwQ7A==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/protocol-http": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.8.tgz", - "integrity": "sha512-hmgIAVyxw1LySOwkgMIUN0kjN8TG9Nc85LJeEmEE/cNEe2rkHDUWhnJf2gxcSRFLWsyqWsrZGw40ROjUogg+Iw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.1.0.tgz", + "integrity": "sha512-KxAOL1nUNw2JTYrtviRRjEnykIDhxc84qMBzxvu1MUfQfHTuBlCG7PA6EdVwqpJjH7glw7FqQoFxUJSyBQgu7g==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/querystring-builder": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.11.tgz", - "integrity": "sha512-u+5HV/9uJaeLj5XTb6+IEF/dokWWkEqJ0XiaRRogyREmKGUgZnNecLucADLdauWFKUNbQfulHFEZEdjwEBjXRg==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.0.2.tgz", + "integrity": "sha512-NTOs0FwHw1vimmQM4ebh+wFQvOwkEf/kQL6bSM1Lock+Bv4I89B3hGYoUEPkmvYPkDKyp5UdXJYu+PoTQ3T31Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", - "@smithy/util-uri-escape": "^3.0.0", + "@smithy/types": "^4.2.0", + "@smithy/util-uri-escape": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/querystring-parser": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.11.tgz", - "integrity": "sha512-Je3kFvCsFMnso1ilPwA7GtlbPaTixa3WwC+K21kmMZHsBEOZYQaqxcMqeFFoU7/slFjKDIpiiPydvdJm8Q/MCw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.0.2.tgz", + "integrity": "sha512-v6w8wnmZcVXjfVLjxw8qF7OwESD9wnpjp0Dqry/Pod0/5vcEA3qxCr+BhbOHlxS8O+29eLpT3aagxXGwIoEk7Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/service-error-classification": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.11.tgz", - "integrity": "sha512-QnYDPkyewrJzCyaeI2Rmp7pDwbUETe+hU8ADkXmgNusO1bgHBH7ovXJiYmba8t0fNfJx75fE8dlM6SEmZxheog==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.0.3.tgz", + "integrity": "sha512-FTbcajmltovWMjj3tksDQdD23b2w6gH+A0DYA1Yz3iSpjDj8fmkwy62UnXcWMy4d5YoMoSyLFHMfkEVEzbiN8Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2" + "@smithy/types": "^4.2.0" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.12.tgz", - "integrity": "sha512-1xKSGI+U9KKdbG2qDvIR9dGrw3CNx+baqJfyr0igKEpjbHL5stsqAesYBzHChYHlelWtb87VnLWlhvfCz13H8Q==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.2.tgz", + "integrity": "sha512-J9/gTWBGVuFZ01oVA6vdb4DAjf1XbDhK6sLsu3OS9qmLrS6KB5ygpeHiM3miIbj1qgSJ96GYszXFWv6ErJ8QEw==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/signature-v4": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.4.tgz", - "integrity": "sha512-5JWeMQYg81TgU4cG+OexAWdvDTs5JDdbEZx+Qr1iPbvo91QFGzjy0IkXAKaXUHqmKUJgSHK0ZxnCkgZpzkeNTA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.1.0.tgz", + "integrity": "sha512-4t5WX60sL3zGJF/CtZsUQTs3UrZEDO2P7pEaElrekbLqkWPYkgqNW1oeiNYC6xXifBnT9dVBOnNQRvOE9riU9w==", "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", - "@smithy/protocol-http": "^4.1.8", - "@smithy/types": "^3.7.2", - "@smithy/util-hex-encoding": "^3.0.0", - "@smithy/util-middleware": "^3.0.11", - "@smithy/util-uri-escape": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", + "@smithy/is-array-buffer": "^4.0.0", + "@smithy/protocol-http": "^5.1.0", + "@smithy/types": "^4.2.0", + "@smithy/util-hex-encoding": "^4.0.0", + "@smithy/util-middleware": "^4.0.2", + "@smithy/util-uri-escape": "^4.0.0", + "@smithy/util-utf8": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/smithy-client": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.5.0.tgz", - "integrity": "sha512-Y8FeOa7gbDfCWf7njrkoRATPa5eNLUEjlJS5z5rXatYuGkCb80LbHcu8AQR8qgAZZaNHCLyo2N+pxPsV7l+ivg==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.2.6.tgz", + "integrity": "sha512-WEqP0wQ1N/lVS4pwNK1Vk+0i6QIr66cq/xbu1dVy1tM0A0qYwAYyz0JhbquzM5pMa8s89lyDBtoGKxo7iG74GA==", "license": "Apache-2.0", "dependencies": { - "@smithy/core": "^2.5.5", - "@smithy/middleware-endpoint": "^3.2.5", - "@smithy/middleware-stack": "^3.0.11", - "@smithy/protocol-http": "^4.1.8", - "@smithy/types": "^3.7.2", - "@smithy/util-stream": "^3.3.2", + "@smithy/core": "^3.3.3", + "@smithy/middleware-endpoint": "^4.1.6", + "@smithy/middleware-stack": "^4.0.2", + "@smithy/protocol-http": "^5.1.0", + "@smithy/types": "^4.2.0", + "@smithy/util-stream": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/types": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.7.2.tgz", - "integrity": "sha512-bNwBYYmN8Eh9RyjS1p2gW6MIhSO2rl7X9QeLM8iTdcGRP+eDiIWDt66c9IysCc22gefKszZv+ubV9qZc7hdESg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.2.0.tgz", + "integrity": "sha512-7eMk09zQKCO+E/ivsjQv+fDlOupcFUCSC/L2YUPgwhvowVGWbPQHjEFcmjt7QQ4ra5lyowS92SV53Zc6XD4+fg==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/url-parser": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.11.tgz", - "integrity": "sha512-TmlqXkSk8ZPhfc+SQutjmFr5FjC0av3GZP4B/10caK1SbRwe/v+Wzu/R6xEKxoNqL+8nY18s1byiy6HqPG37Aw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.0.2.tgz", + "integrity": "sha512-Bm8n3j2ScqnT+kJaClSVCMeiSenK6jVAzZCNewsYWuZtnBehEz4r2qP0riZySZVfzB+03XZHJeqfmJDkeeSLiQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/querystring-parser": "^3.0.11", - "@smithy/types": "^3.7.2", + "@smithy/querystring-parser": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" } }, "node_modules/@smithy/util-base64": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz", - "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.0.0.tgz", + "integrity": "sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", + "@smithy/util-buffer-from": "^4.0.0", + "@smithy/util-utf8": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-body-length-browser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz", - "integrity": "sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.0.0.tgz", + "integrity": "sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" } }, "node_modules/@smithy/util-body-length-node": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz", - "integrity": "sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.0.0.tgz", + "integrity": "sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz", - "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.0.0.tgz", + "integrity": "sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==", "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", + "@smithy/is-array-buffer": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-config-provider": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz", - "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.0.0.tgz", + "integrity": "sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.30", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.30.tgz", - "integrity": "sha512-nLuGmgfcr0gzm64pqF2UT4SGWVG8UGviAdayDlVzJPNa6Z4lqvpDzdRXmLxtOdEjVlTOEdpZ9dd3ZMMu488mzg==", + "version": "4.0.14", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.14.tgz", + "integrity": "sha512-l7QnMX8VcDOH6n/fBRu4zqguSlOBZxFzWqp58dXFSARFBjNlmEDk5G/z4T7BMGr+rI0Pg8MkhmMUfEtHFgpy2g==", "license": "Apache-2.0", "dependencies": { - "@smithy/property-provider": "^3.1.11", - "@smithy/smithy-client": "^3.5.0", - "@smithy/types": "^3.7.2", + "@smithy/property-provider": "^4.0.2", + "@smithy/smithy-client": "^4.2.6", + "@smithy/types": "^4.2.0", "bowser": "^2.11.0", "tslib": "^2.6.2" }, "engines": { - "node": ">= 10.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.30", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.30.tgz", - "integrity": "sha512-OD63eWoH68vp75mYcfYyuVH+p7Li/mY4sYOROnauDrtObo1cS4uWfsy/zhOTW8F8ZPxQC1ZXZKVxoxvMGUv2Ow==", + "version": "4.0.14", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.14.tgz", + "integrity": "sha512-Ujs1gsWDo3m/T63VWBTBmHLTD2UlU6J6FEokLCEp7OZQv45jcjLHoxTwgWsi8ULpsYozvH4MTWkRP+bhwr0vDg==", "license": "Apache-2.0", "dependencies": { - "@smithy/config-resolver": "^3.0.13", - "@smithy/credential-provider-imds": "^3.2.8", - "@smithy/node-config-provider": "^3.1.12", - "@smithy/property-provider": "^3.1.11", - "@smithy/smithy-client": "^3.5.0", - "@smithy/types": "^3.7.2", + "@smithy/config-resolver": "^4.1.2", + "@smithy/credential-provider-imds": "^4.0.4", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/property-provider": "^4.0.2", + "@smithy/smithy-client": "^4.2.6", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">= 10.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-endpoints": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.7.tgz", - "integrity": "sha512-tSfcqKcN/Oo2STEYCABVuKgJ76nyyr6skGl9t15hs+YaiU06sgMkN7QYjo0BbVw+KT26zok3IzbdSOksQ4YzVw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.0.4.tgz", + "integrity": "sha512-VfFATC1bmZLV2858B/O1NpMcL32wYo8DPPhHxYxDCodDl3f3mSZ5oJheW1IF91A0EeAADz2WsakM/hGGPGNKLg==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.12", - "@smithy/types": "^3.7.2", + "@smithy/node-config-provider": "^4.1.1", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-hex-encoding": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz", - "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.0.0.tgz", + "integrity": "sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-middleware": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.11.tgz", - "integrity": "sha512-dWpyc1e1R6VoXrwLoLDd57U1z6CwNSdkM69Ie4+6uYh2GC7Vg51Qtan7ITzczuVpqezdDTKJGJB95fFvvjU/ow==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.0.2.tgz", + "integrity": "sha512-6GDamTGLuBQVAEuQ4yDQ+ti/YINf/MEmIegrEeg7DdB/sld8BX1lqt9RRuIcABOhAGTA50bRbPzErez7SlDtDQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.7.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-retry": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.11.tgz", - "integrity": "sha512-hJUC6W7A3DQgaee3Hp9ZFcOxVDZzmBIRBPlUAk8/fSOEl7pE/aX7Dci0JycNOnm9Mfr0KV2XjIlUOcGWXQUdVQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.0.3.tgz", + "integrity": "sha512-DPuYjZQDXmKr/sNvy9Spu8R/ESa2e22wXZzSAY6NkjOLj6spbIje/Aq8rT97iUMdDj0qHMRIe+bTxvlU74d9Ng==", "license": "Apache-2.0", "dependencies": { - "@smithy/service-error-classification": "^3.0.11", - "@smithy/types": "^3.7.2", + "@smithy/service-error-classification": "^4.0.3", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-stream": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.3.2.tgz", - "integrity": "sha512-sInAqdiVeisUGYAv/FrXpmJ0b4WTFmciTRqzhb7wVuem9BHvhIG7tpiYHLDWrl2stOokNZpTTGqz3mzB2qFwXg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.2.0.tgz", + "integrity": "sha512-Vj1TtwWnuWqdgQI6YTUF5hQ/0jmFiOYsc51CSMgj7QfyO+RF4EnT2HNjoviNlOOmgzgvf3f5yno+EiC4vrnaWQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/fetch-http-handler": "^4.1.2", - "@smithy/node-http-handler": "^3.3.2", - "@smithy/types": "^3.7.2", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-hex-encoding": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", + "@smithy/fetch-http-handler": "^5.0.2", + "@smithy/node-http-handler": "^4.0.4", + "@smithy/types": "^4.2.0", + "@smithy/util-base64": "^4.0.0", + "@smithy/util-buffer-from": "^4.0.0", + "@smithy/util-hex-encoding": "^4.0.0", + "@smithy/util-utf8": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-uri-escape": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz", - "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.0.0.tgz", + "integrity": "sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-utf8": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz", - "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.0.0.tgz", + "integrity": "sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-buffer-from": "^4.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@smithy/util-waiter": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.2.0.tgz", - "integrity": "sha512-PpjSboaDUE6yl+1qlg3Si57++e84oXdWGbuFUSAciXsVfEZJJJupR2Nb0QuXHiunt2vGR+1PTizOMvnUPaG2Qg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-4.0.3.tgz", + "integrity": "sha512-JtaY3FxmD+te+KSI2FJuEcfNC9T/DGGVf551babM7fAaXhjJUt7oSYurH1Devxd2+BOSUACCgt3buinx4UnmEA==", "license": "Apache-2.0", "dependencies": { - "@smithy/abort-controller": "^3.1.9", - "@smithy/types": "^3.7.2", + "@smithy/abort-controller": "^4.0.2", + "@smithy/types": "^4.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@ts-morph/common": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.23.0.tgz", - "integrity": "sha512-m7Lllj9n/S6sOkCkRftpM7L24uvmfXQFedlW/4hENcuJH1HHm9u5EgxZb9uVjQSCGrbBWBkOGgcTxNg36r6ywA==", - "license": "MIT", - "dependencies": { - "fast-glob": "^3.3.2", - "minimatch": "^9.0.3", - "mkdirp": "^3.0.1", - "path-browserify": "^1.0.1" - } - }, - "node_modules/@ts-morph/common/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@ts-morph/common/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@ts-morph/common/node_modules/mkdirp": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", - "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", - "license": "MIT", - "bin": { - "mkdirp": "dist/cjs/src/bin.js" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=18.0.0" } }, "node_modules/@tufjs/canonical-json": { @@ -7032,51 +7446,17 @@ } }, "node_modules/@tufjs/models": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz", - "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-3.0.1.tgz", + "integrity": "sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==", "dev": true, "license": "MIT", "dependencies": { "@tufjs/canonical-json": "2.0.0", - "minimatch": "^9.0.4" + "minimatch": "^9.0.5" }, "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/@tufjs/models/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@tufjs/models/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@tybys/wasm-util": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz", - "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==", - "dependencies": { - "tslib": "^2.4.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@types/body-parser": { @@ -7121,16 +7501,34 @@ "@types/node": "*" } }, + "node_modules/@types/d3-color": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz", + "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/d3-interpolate": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz", + "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/d3-color": "*" + } + }, "node_modules/@types/d3-selection": { "version": "3.0.11", "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz", "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/diff": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@types/diff/-/diff-6.0.0.tgz", - "integrity": "sha512-dhVCYGv3ZSbzmQaBSagrv1WJ6rXCdkyTcDyoNu1MD8JohI7pR7k8wdZEm+mvdxRKXyHVwckFzWU1vJc+Z29MlA==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@types/diff/-/diff-7.0.2.tgz", + "integrity": "sha512-JSWRMozjFKsGlEjiiKajUjIJVKuKdE3oVy2DNtK+fUo8q82nhFZ2CPQwicAIkXrofahDXrWJ7mjelvZphMS98Q==", "dev": true, "license": "MIT" }, @@ -7138,22 +7536,35 @@ "version": "2.6.7", "resolved": "https://registry.npmjs.org/@types/dom-to-image/-/dom-to-image-2.6.7.tgz", "integrity": "sha512-me5VbCv+fcXozblWwG13krNBvuEOm6kA5xoa4RrjDJCNFOZSWR3/QLtOXimBHk1Fisq69Gx3JtOoXtg1N1tijg==", - "dev": true + "dev": true, + "license": "MIT" }, - "node_modules/@types/dompurify": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz", - "integrity": "sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==", + "node_modules/@types/eslint": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", "dev": true, "license": "MIT", "dependencies": { - "@types/trusted-types": "*" + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" } }, "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "dev": true, "license": "MIT" }, @@ -7171,9 +7582,22 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "4.19.5", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz", - "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz", + "integrity": "sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + }, + "node_modules/@types/express/node_modules/@types/express-serve-static-core": { + "version": "4.19.6", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", + "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", "dev": true, "license": "MIT", "dependencies": { @@ -7193,7 +7617,8 @@ "version": "5.0.2", "resolved": "https://registry.npmjs.org/@types/has-ansi/-/has-ansi-5.0.2.tgz", "integrity": "sha512-umJQ393eDf2R9eBdRxZTyXlRDq82ZVT9/tNfF3H3d2GDIBQILq/LZXHSvwXaH2OSvaSHVe2BX3s+IdoFHQ8zmg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/http-errors": { "version": "2.0.4", @@ -7203,19 +7628,21 @@ "license": "MIT" }, "node_modules/@types/http-proxy": { - "version": "1.17.15", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz", - "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==", + "version": "1.17.16", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz", + "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/jasmine": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.4.tgz", - "integrity": "sha512-px7OMFO/ncXxixDe1zR13V1iycqWae0MxTaw62RpFlksUi5QuNWgQJFkTQjIOvrmutJbI7Fp2Y2N1F6D2R4G6w==", - "dev": true + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.8.tgz", + "integrity": "sha512-u7/CnvRdh6AaaIzYjCgUuVbREFgulhX05Qtf6ZtW+aOcjCKKVvKgpkPYJBFTZSHtFBYimzU4zP0V2vrEsq9Wcg==", + "dev": true, + "license": "MIT" }, "node_modules/@types/json-schema": { "version": "7.0.15", @@ -7228,19 +7655,22 @@ "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/lodash": { - "version": "4.14.191", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz", - "integrity": "sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==", - "dev": true + "version": "4.17.16", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.16.tgz", + "integrity": "sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==", + "dev": true, + "license": "MIT" }, "node_modules/@types/lodash-es": { "version": "4.17.12", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz", "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/lodash": "*" } @@ -7252,23 +7682,14 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/mute-stream": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz", - "integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==", + "node_modules/@types/node": { + "version": "22.15.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.18.tgz", + "integrity": "sha512-v1DKRfUdyW+jJhZNEI1PYy29S2YRxMV5AOO/x/SjKmW0acCIOqmbj6Haf9eHAhsPmrhlHSxEhv/1WszcLWV4cg==", "dev": true, "license": "MIT", "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/node": { - "version": "22.9.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz", - "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==", - "dev": true, - "dependencies": { - "undici-types": "~6.19.8" + "undici-types": "~6.21.0" } }, "node_modules/@types/node-forge": { @@ -7282,16 +7703,16 @@ } }, "node_modules/@types/plotly.js": { - "version": "2.35.1", - "resolved": "https://registry.npmjs.org/@types/plotly.js/-/plotly.js-2.35.1.tgz", - "integrity": "sha512-9fTHC8qeJNEDpGJK1qIJAEcRxrI9uPrap32I8cbCLPKsqwFmafOYHecaBzvIJXEPhLIUiQocN9Bc/tIV9CjsxQ==", + "version": "2.35.6", + "resolved": "https://registry.npmjs.org/@types/plotly.js/-/plotly.js-2.35.6.tgz", + "integrity": "sha512-j4c7UZJ5lYNNfTQrwU0ntHbhX21xmdU2312+0Xas7Kff+0YgVYuvEK/Ze69XtOE+gzfWvitcMTOIrnucYxa9pg==", "dev": true, "license": "MIT" }, "node_modules/@types/qs": { - "version": "6.9.15", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz", - "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==", + "version": "6.9.18", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz", + "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==", "dev": true, "license": "MIT" }, @@ -7356,14 +7777,15 @@ "version": "1.4.6", "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.6.tgz", "integrity": "sha512-iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/trusted-types": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", - "devOptional": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/@types/uuid": { "version": "10.0.0", @@ -7372,17 +7794,10 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/wrap-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz", - "integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/ws": { - "version": "8.5.12", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", - "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==", "dev": true, "license": "MIT", "dependencies": { @@ -7390,27 +7805,27 @@ } }, "node_modules/@types/youtube": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/@types/youtube/-/youtube-0.0.50.tgz", - "integrity": "sha512-d4GpH4uPYp9W07kc487tiq6V/EUHl18vZWFMbQoe4Sk9LXEWzFi/BMf9x7TI4m7/j7gU3KeX8H6M8aPBgykeLw==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@types/youtube/-/youtube-0.1.1.tgz", + "integrity": "sha512-xJSX8yOXLTSCH4ye62/TWEA8y3erYtSEvdd3h56u3Gk/8dpH8Guicv3XLLOg6wjZdsYeYgaZ/u7e9dqt+FL0+A==", "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.0.tgz", - "integrity": "sha512-NR2yS7qUqCL7AIxdJUQf2MKKNDVNaig/dEB0GBLU7D+ZdHgK1NoH/3wsgO3OnPVipn51tG3MAwaODEGil70WEw==", + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz", + "integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.18.0", - "@typescript-eslint/type-utils": "8.18.0", - "@typescript-eslint/utils": "8.18.0", - "@typescript-eslint/visitor-keys": "8.18.0", + "@typescript-eslint/scope-manager": "8.32.1", + "@typescript-eslint/type-utils": "8.32.1", + "@typescript-eslint/utils": "8.32.1", + "@typescript-eslint/visitor-keys": "8.32.1", "graphemer": "^1.4.0", - "ignore": "^5.3.1", + "ignore": "^7.0.0", "natural-compare": "^1.4.0", - "ts-api-utils": "^1.3.0" + "ts-api-utils": "^2.1.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7422,20 +7837,20 @@ "peerDependencies": { "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.0.tgz", - "integrity": "sha512-hgUZ3kTEpVzKaK3uNibExUYm6SKKOmTU2BOxBSvOYwtJEPdVQ70kZJpPjstlnhCHcuc2WGfSbpKlb/69ttyN5Q==", + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz", + "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==", "dev": true, - "license": "MITClause", + "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.18.0", - "@typescript-eslint/types": "8.18.0", - "@typescript-eslint/typescript-estree": "8.18.0", - "@typescript-eslint/visitor-keys": "8.18.0", + "@typescript-eslint/scope-manager": "8.32.1", + "@typescript-eslint/types": "8.32.1", + "@typescript-eslint/typescript-estree": "8.32.1", + "@typescript-eslint/visitor-keys": "8.32.1", "debug": "^4.3.4" }, "engines": { @@ -7447,18 +7862,18 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.0.tgz", - "integrity": "sha512-PNGcHop0jkK2WVYGotk/hxj+UFLhXtGPiGtiaWgVBVP1jhMoMCHlTyJA+hEj4rszoSdLTK3fN4oOatrL0Cp+Xw==", + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz", + "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.0", - "@typescript-eslint/visitor-keys": "8.18.0" + "@typescript-eslint/types": "8.32.1", + "@typescript-eslint/visitor-keys": "8.32.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7469,16 +7884,16 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.0.tgz", - "integrity": "sha512-er224jRepVAVLnMF2Q7MZJCq5CsdH2oqjP4dT7K6ij09Kyd+R21r7UVJrF0buMVdZS5QRhDzpvzAxHxabQadow==", + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz", + "integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.18.0", - "@typescript-eslint/utils": "8.18.0", + "@typescript-eslint/typescript-estree": "8.32.1", + "@typescript-eslint/utils": "8.32.1", "debug": "^4.3.4", - "ts-api-utils": "^1.3.0" + "ts-api-utils": "^2.1.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7489,13 +7904,13 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/types": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.0.tgz", - "integrity": "sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==", + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz", + "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==", "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7506,20 +7921,20 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.0.tgz", - "integrity": "sha512-rqQgFRu6yPkauz+ms3nQpohwejS8bvgbPyIDq13cgEDbkXt4LH4OkDMT0/fN1RUtzG8e8AKJyDBoocuQh8qNeg==", + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz", + "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.0", - "@typescript-eslint/visitor-keys": "8.18.0", + "@typescript-eslint/types": "8.32.1", + "@typescript-eslint/visitor-keys": "8.32.1", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", - "ts-api-utils": "^1.3.0" + "ts-api-utils": "^2.1.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7529,46 +7944,20 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <5.8.0" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/utils": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.0.tgz", - "integrity": "sha512-p6GLdY383i7h5b0Qrfbix3Vc3+J2k6QWw6UMUeY5JGfm3C5LbZ4QIZzJNoNOfgyRe0uuYKjvVOsO/jD4SJO+xg==", + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz", + "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.18.0", - "@typescript-eslint/types": "8.18.0", - "@typescript-eslint/typescript-estree": "8.18.0" + "@eslint-community/eslint-utils": "^4.7.0", + "@typescript-eslint/scope-manager": "8.32.1", + "@typescript-eslint/types": "8.32.1", + "@typescript-eslint/typescript-estree": "8.32.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7579,17 +7968,17 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.0.tgz", - "integrity": "sha512-pCh/qEA8Lb1wVIqNvBke8UaRjJ6wrAWkJO5yyIbs8Yx6TNGYyfNjOo61tLv+WwLvoLPp4BQ8B7AHKijl8NGUfw==", + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz", + "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.0", + "@typescript-eslint/types": "8.32.1", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -7614,86 +8003,86 @@ } }, "node_modules/@vitejs/plugin-basic-ssl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz", - "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.2.0.tgz", + "integrity": "sha512-mkQnxTkcldAzIsomk1UuLfAu9n+kpQ3JbHcpCp7d2Oo6ITtji8pHS3QToOWjhPFvNQSnhlkAjmGbhv2QvwO/7Q==", "dev": true, "license": "MIT", "engines": { - "node": ">=14.6.0" + "node": ">=14.21.3" }, "peerDependencies": { - "vite": "^3.0.0 || ^4.0.0 || ^5.0.0" + "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" } }, "node_modules/@webassemblyjs/ast": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", - "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", + "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + "@webassemblyjs/helper-numbers": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz", + "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==", "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz", + "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==", "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", - "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz", + "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==", "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz", + "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/floating-point-hex-parser": "1.13.2", + "@webassemblyjs/helper-api-error": "1.13.2", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz", + "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==", "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", - "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz", + "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/wasm-gen": "1.14.1" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz", + "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==", "dev": true, "license": "MIT", "dependencies": { @@ -7701,9 +8090,9 @@ } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz", + "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -7711,79 +8100,79 @@ } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz", + "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==", "dev": true, "license": "MIT" }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", - "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz", + "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-opt": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1", - "@webassemblyjs/wast-printer": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/helper-wasm-section": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-opt": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1", + "@webassemblyjs/wast-printer": "1.14.1" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", - "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz", + "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", - "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz", + "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", - "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz", + "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-api-error": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", - "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz", + "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==", "dev": true, "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/ast": "1.14.1", "@xtuc/long": "4.2.2" } }, @@ -7804,66 +8193,46 @@ "node_modules/@yarnpkg/lockfile": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==" - }, - "node_modules/@yarnpkg/parsers": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.2.tgz", - "integrity": "sha512-/HcYgtUSiJiot/XWGLOlGxPYUG65+/31V8oqk17vZLW1xlCoR4PampyePljOxY2n8/3jz9+tIFzICsyGujJZoA==", - "dependencies": { - "js-yaml": "^3.10.0", - "tslib": "^2.4.0" - }, - "engines": { - "node": ">=18.12.0" - } - }, - "node_modules/@zkochan/js-yaml": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.7.tgz", - "integrity": "sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz", + "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==", "dev": true, "license": "ISC", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", + "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", "dev": true, "license": "MIT", "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" + "mime-types": "^3.0.0", + "negotiator": "^1.0.0" }, "engines": { "node": ">= 0.6" } }, "node_modules/ace-builds": { - "version": "1.36.5", - "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.36.5.tgz", - "integrity": "sha512-mZ5KVanRT6nLRDLqtG/1YQQLX/gZVC/v526cm1Ru/MTSlrbweSmqv2ZT0d2GaHpJq035MwCMIrj+LgDAUnDXrg==", + "version": "1.41.0", + "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.41.0.tgz", + "integrity": "sha512-tiEUfw7V/FpHuI4tG7KS+muOTMIuPh6zReBAD2Uqhe9t00tLeyVGxjXu0tSqz5OIPWy7/wvuJBVXAsNWx0rYvQ==", "license": "BSD-3-Clause" }, "node_modules/acorn": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", - "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -7871,16 +8240,6 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-attributes": { - "version": "1.9.5", - "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", - "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "acorn": "^8" - } - }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -7921,32 +8280,15 @@ } }, "node_modules/agent-base": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", - "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", + "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", "dev": true, "license": "MIT", - "dependencies": { - "debug": "^4.3.4" - }, "engines": { "node": ">= 14" } }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/ajv": { "version": "8.17.1", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", @@ -7996,19 +8338,19 @@ } }, "node_modules/angular-eslint": { - "version": "18.4.3", - "resolved": "https://registry.npmjs.org/angular-eslint/-/angular-eslint-18.4.3.tgz", - "integrity": "sha512-0ZjLzzADGRLUhZC8ZpwSo6CE/m6QhQB/oljMJ0mEfP+lB1sy1v8PBKNsJboIcfEEgGW669Z/efVQ3df88yJLYg==", + "version": "19.4.0", + "resolved": "https://registry.npmjs.org/angular-eslint/-/angular-eslint-19.4.0.tgz", + "integrity": "sha512-/Xg77jhVHqn67AxZL6ELPV6JpwNLZKUTRYYfZcG7ro7CpOgdOXaJg7a1UeZLxFuNGGrfhacBQNX0ajM4Giue7A==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": ">= 18.0.0 < 19.0.0", - "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0", - "@angular-eslint/builder": "18.4.3", - "@angular-eslint/eslint-plugin": "18.4.3", - "@angular-eslint/eslint-plugin-template": "18.4.3", - "@angular-eslint/schematics": "18.4.3", - "@angular-eslint/template-parser": "18.4.3", + "@angular-devkit/core": ">= 19.0.0 < 20.0.0", + "@angular-devkit/schematics": ">= 19.0.0 < 20.0.0", + "@angular-eslint/builder": "19.4.0", + "@angular-eslint/eslint-plugin": "19.4.0", + "@angular-eslint/eslint-plugin-template": "19.4.0", + "@angular-eslint/schematics": "19.4.0", + "@angular-eslint/template-parser": "19.4.0", "@typescript-eslint/types": "^8.0.0", "@typescript-eslint/utils": "^8.0.0" }, @@ -8022,6 +8364,7 @@ "version": "7.0.2", "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-7.0.2.tgz", "integrity": "sha512-/BGuNiA38n9klexHO1xgnsA3VYigj9v+jUGjKtBRgfB26bCxZKsNWParSu2k3EqbATrfAJC4Nl8f7cORpJFf4w==", + "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, @@ -8030,15 +8373,16 @@ } }, "node_modules/angular-split": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/angular-split/-/angular-split-18.0.0.tgz", - "integrity": "sha512-vreR7dhwg6ubC3ZZn0vJG9Fb+8Xacf77FRQ/3IdChzsRFya1LxJh/Wk7uBk8q9Xi0pOKBKruZ3OWGjhqvHmETg==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/angular-split/-/angular-split-19.0.0.tgz", + "integrity": "sha512-vQqXWLcCimFmInu2lpGKIfS9FtYBgKmoWenPjeYkHSRdWmb7HLGlQoNPj1oALrwdhIWFPdySgp0BIXDe2IAepQ==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/common": ">=18.0.0", - "@angular/core": ">=18.0.0", + "@angular/common": ">=19.0.0", + "@angular/core": ">=19.0.0", "rxjs": ">=7.0.0" } }, @@ -8046,6 +8390,8 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -8080,9 +8426,10 @@ } }, "node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -8094,6 +8441,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -8109,6 +8457,7 @@ "version": "0.7.2", "resolved": "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.7.2.tgz", "integrity": "sha512-v6MqmEpNlxF+POuyhKkidusCHWWkaLcGRURzivcU3I9tv7k4JVhFcnukrM5Rlk2rUywdZuzYAZ+kbZqWCnfN3g==", + "license": "MIT", "dependencies": { "entities": "^2.2.0" }, @@ -8133,11 +8482,25 @@ "node": ">= 8" } }, + "node_modules/anymatch/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/are-docs-informative": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz", "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==", "dev": true, + "license": "MIT", "engines": { "node": ">=14" } @@ -8145,7 +8508,9 @@ "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" }, "node_modules/aria-query": { "version": "5.3.2", @@ -8158,13 +8523,14 @@ } }, "node_modules/array-buffer-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", - "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.5", - "is-array-buffer": "^3.0.4" + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" }, "engines": { "node": ">= 0.4" @@ -8185,6 +8551,7 @@ "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -8201,17 +8568,19 @@ } }, "node_modules/array.prototype.findlastindex": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz", - "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz", + "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", + "es-abstract": "^1.23.9", "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", - "es-shim-unscopables": "^1.0.2" + "es-object-atoms": "^1.1.1", + "es-shim-unscopables": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -8221,15 +8590,16 @@ } }, "node_modules/array.prototype.flat": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", - "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz", + "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -8239,15 +8609,16 @@ } }, "node_modules/array.prototype.flatmap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", - "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -8257,19 +8628,19 @@ } }, "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", - "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", "dev": true, + "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.1", - "call-bind": "^1.0.5", + "call-bind": "^1.0.8", "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", - "es-errors": "^1.2.1", - "get-intrinsic": "^1.2.3", - "is-array-buffer": "^3.0.4", - "is-shared-array-buffer": "^1.0.2" + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" }, "engines": { "node": ">= 0.4" @@ -8278,15 +8649,15 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/async": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", - "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==" - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + "node_modules/async-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz", + "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } }, "node_modules/autoprefixer": { "version": "10.4.20", @@ -8331,6 +8702,7 @@ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, + "license": "MIT", "dependencies": { "possible-typed-array-names": "^1.0.0" }, @@ -8341,16 +8713,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/axios": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", - "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", - "dependencies": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/axobject-query": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz", @@ -8362,9 +8724,9 @@ } }, "node_modules/babel-loader": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz", - "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz", + "integrity": "sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==", "dev": true, "license": "MIT", "dependencies": { @@ -8380,14 +8742,14 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz", - "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==", + "version": "0.4.13", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.13.tgz", + "integrity": "sha512-3sX/eOms8kd3q2KZ6DAhKPc0dgm525Gqq5NtWKZ7QYYZEv57OQ54KtblzJzH1lQF/eQxO8KjWGIK9IPUJNus5g==", "dev": true, "license": "MIT", "dependencies": { "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.6.2", + "@babel/helper-define-polyfill-provider": "^0.6.4", "semver": "^6.3.1" }, "peerDependencies": { @@ -8405,27 +8767,27 @@ } }, "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz", - "integrity": "sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz", + "integrity": "sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.6.1", - "core-js-compat": "^3.36.1" + "@babel/helper-define-polyfill-provider": "^0.6.3", + "core-js-compat": "^3.40.0" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz", - "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.4.tgz", + "integrity": "sha512-7gD3pRadPrbjhjLyxebmx/WrFYcuSjZ0XbdUujQMZ/fcE9oeewk2U/7PCvez84UeuK3oSjmPZ0Ch0dlupQvGzw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.6.2" + "@babel/helper-define-polyfill-provider": "^0.6.4" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -8434,12 +8796,15 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, "funding": [ { "type": "github", @@ -8453,7 +8818,8 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/batch": { "version": "0.6.1", @@ -8462,6 +8828,26 @@ "dev": true, "license": "MIT" }, + "node_modules/beasties": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/beasties/-/beasties-0.3.2.tgz", + "integrity": "sha512-p4AF8uYzm9Fwu8m/hSVTCPXrRBPmB34hQpHsec2KOaR9CZmgoU8IOv4Cvwq4hgz2p4hLMNbsdNl5XeA6XbAQwA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "css-select": "^5.1.0", + "css-what": "^6.1.0", + "dom-serializer": "^2.0.0", + "domhandler": "^5.0.3", + "htmlparser2": "^10.0.0", + "picocolors": "^1.1.1", + "postcss": "^8.4.49", + "postcss-media-query-parser": "^0.2.3" + }, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/big.js": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", @@ -8489,6 +8875,8 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dev": true, + "license": "MIT", "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -8496,57 +8884,30 @@ } }, "node_modules/body-parser": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", - "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", + "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", "dev": true, + "license": "MIT", "dependencies": { - "bytes": "3.1.2", - "content-type": "~1.0.5", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.13.0", - "raw-body": "2.5.2", - "type-is": "~1.6.18", - "unpipe": "1.0.0" + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.0", + "http-errors": "^2.0.0", + "iconv-lite": "^0.6.3", + "on-finished": "^2.4.1", + "qs": "^6.14.0", + "raw-body": "^3.0.0", + "type-is": "^2.0.0" }, "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" + "node": ">=18" } }, - "node_modules/body-parser/node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/body-parser/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/body-parser/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, "node_modules/bonjour-service": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz", - "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz", + "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==", "dev": true, "license": "MIT", "dependencies": { @@ -8562,9 +8923,9 @@ "license": "ISC" }, "node_modules/bootstrap": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", - "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", + "version": "5.3.6", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.6.tgz", + "integrity": "sha512-jX0GAcRzvdwISuvArXn3m7KZscWWFAf1MKBcnzaN02qWMb3jpMoUX4/qgeiGzqyIb4ojulRzs89UCUmGcFSzTA==", "funding": [ { "type": "github", @@ -8575,6 +8936,7 @@ "url": "https://opencollective.com/bootstrap" } ], + "license": "MIT", "peerDependencies": { "@popperjs/core": "^2.11.8" } @@ -8586,18 +8948,20 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "balanced-match": "^1.0.0" } }, "node_modules/braces": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, "license": "MIT", "dependencies": { "fill-range": "^7.1.1" @@ -8607,9 +8971,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", - "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", + "version": "4.24.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz", + "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==", "dev": true, "funding": [ { @@ -8627,10 +8991,10 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001646", - "electron-to-chromium": "^1.5.4", - "node-releases": "^2.0.18", - "update-browserslist-db": "^1.1.0" + "caniuse-lite": "^1.0.30001716", + "electron-to-chromium": "^1.5.149", + "node-releases": "^2.0.19", + "update-browserslist-db": "^1.1.3" }, "bin": { "browserslist": "cli.js" @@ -8643,6 +9007,7 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, "funding": [ { "type": "github", @@ -8657,6 +9022,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -8686,9 +9052,9 @@ } }, "node_modules/bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true, "license": "MIT", "engines": { @@ -8696,13 +9062,13 @@ } }, "node_modules/cacache": { - "version": "18.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", - "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", + "version": "19.0.1", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz", + "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==", "dev": true, "license": "ISC", "dependencies": { - "@npmcli/fs": "^3.1.0", + "@npmcli/fs": "^4.0.0", "fs-minipass": "^3.0.0", "glob": "^10.2.2", "lru-cache": "^10.0.1", @@ -8710,26 +9076,116 @@ "minipass-collect": "^2.0.1", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" + "p-map": "^7.0.2", + "ssri": "^12.0.0", + "tar": "^7.4.3", + "unique-filename": "^4.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" + } + }, + "node_modules/cacache/node_modules/chownr": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", + "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } + }, + "node_modules/cacache/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/cacache/node_modules/mkdirp": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", + "dev": true, + "license": "MIT", + "bin": { + "mkdirp": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/cacache/node_modules/tar": { + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.0.1", + "mkdirp": "^3.0.1", + "yallist": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/cacache/node_modules/yallist": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" } }, "node_modules/call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "dev": true, "license": "MIT", "dependencies": { + "call-bind-apply-helpers": "^1.0.0", "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.1" + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" }, "engines": { "node": ">= 0.4" @@ -8743,14 +9199,15 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001646", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001646.tgz", - "integrity": "sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw==", + "version": "1.0.30001718", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz", + "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==", "dev": true, "funding": [ { @@ -8772,6 +9229,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -8792,9 +9250,10 @@ "license": "MIT" }, "node_modules/chart.js": { - "version": "4.4.6", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.6.tgz", - "integrity": "sha512-8Y406zevUPbbIBA/HRk33khEmQPk5+cxeflWE/2rx1NJsjVWMPw/9mSP9rxHP5eqi6LNoPBVMfZHxbwLSgldYA==", + "version": "4.4.9", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.9.tgz", + "integrity": "sha512-EyZ9wWKgpAU0fLJ43YAEIF8sr5F2W3LqbS40ZJyHIner2lY14ufqv2VMp69MAiZ2rpwxEUxEhIH/0U3xyRynxg==", + "license": "MIT", "dependencies": { "@kurkle/color": "^0.3.0" }, @@ -8806,6 +9265,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/chartjs-adapter-date-fns/-/chartjs-adapter-date-fns-3.0.0.tgz", "integrity": "sha512-Rs3iEB3Q5pJ973J93OBTpnP7qoGwvq3nUnoMdtxO+9aoJof7UFcRbWcIDteXuYd1fgAvct/32T9qaLyLuZVwCg==", + "license": "MIT", "peerDependencies": { "chart.js": ">=2.8.0", "date-fns": ">=2.0.0" @@ -8815,6 +9275,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/chartjs-plugin-annotation/-/chartjs-plugin-annotation-3.1.0.tgz", "integrity": "sha512-EkAed6/ycXD/7n0ShrlT1T2Hm3acnbFhgkIEJLa0X+M6S16x0zwj1Fv4suv/2bwayCT3jGPdAtI9uLcAMToaQQ==", + "license": "MIT", "peerDependencies": { "chart.js": ">=4.0.0" } @@ -8833,28 +9294,19 @@ } }, "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", "dev": true, "license": "MIT", "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" + "readdirp": "^4.0.1" }, "engines": { - "node": ">= 8.10.0" + "node": ">= 14.16.0" }, "funding": { "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" } }, "node_modules/chownr": { @@ -8877,31 +9329,28 @@ "node": ">=6.0" } }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "node_modules/cli-cursor": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", + "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", "dev": true, "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dependencies": { - "restore-cursor": "^3.1.0" + "restore-cursor": "^5.0.0" }, "engines": { - "node": ">=8" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/cli-spinners": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", - "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "dev": true, + "license": "MIT", "engines": { "node": ">=6" }, @@ -8926,47 +9375,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/cli-truncate/node_modules/emoji-regex": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", - "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", - "dev": true, - "license": "MIT" - }, - "node_modules/cli-truncate/node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-truncate/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/cli-width": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz", @@ -8981,6 +9389,8 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -8990,10 +9400,85 @@ "node": ">=12" } }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/cliui/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "dev": true, + "license": "MIT", "engines": { "node": ">=0.8" } @@ -9013,16 +9498,24 @@ "node": ">=6" } }, - "node_modules/code-block-writer": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-13.0.2.tgz", - "integrity": "sha512-XfXzAGiStXSmCIwrkdfvc7FS5Dtj8yelCtyOf2p2skCAfvLd6zu0rGzuS9NSCO3bq1JKpFZ7tbKdKlcd5occQA==", - "license": "MIT" + "node_modules/clone-deep/node_modules/is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, + "license": "MIT", + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } }, "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, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -9035,6 +9528,7 @@ "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, "license": "MIT" }, "node_modules/colorette": { @@ -9047,18 +9541,8 @@ "node_modules/colornames": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", - "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=" - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } + "integrity": "sha512-/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A==", + "license": "MIT" }, "node_modules/commander": { "version": "2.20.3", @@ -9072,6 +9556,7 @@ "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz", "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 12.0.0" } @@ -9097,18 +9582,18 @@ } }, "node_modules/compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz", + "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==", "dev": true, "license": "MIT", "dependencies": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", + "bytes": "3.1.2", + "compressible": "~2.0.18", "debug": "2.6.9", + "negotiator": "~0.6.4", "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", + "safe-buffer": "5.2.1", "vary": "~1.1.2" }, "engines": { @@ -9132,17 +9617,22 @@ "dev": true, "license": "MIT" }, - "node_modules/compression/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "node_modules/compression/node_modules/negotiator": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">= 0.6" + } }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" }, "node_modules/connect-history-api-fallback": { "version": "2.0.0", @@ -9155,9 +9645,9 @@ } }, "node_modules/content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz", + "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==", "dev": true, "license": "MIT", "dependencies": { @@ -9172,32 +9662,37 @@ "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", "dev": true, "license": "MIT" }, "node_modules/cookie": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", - "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", + "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">=6.6.0" + } }, "node_modules/copy-anything": { "version": "2.0.6", @@ -9237,74 +9732,14 @@ "webpack": "^5.1.0" } }, - "node_modules/copy-webpack-plugin/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/copy-webpack-plugin/node_modules/globby": { - "version": "14.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz", - "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sindresorhus/merge-streams": "^2.1.0", - "fast-glob": "^3.3.2", - "ignore": "^5.2.4", - "path-type": "^5.0.0", - "slash": "^5.1.0", - "unicorn-magic": "^0.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/copy-webpack-plugin/node_modules/path-type": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", - "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/copy-webpack-plugin/node_modules/slash": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", - "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/core-js-compat": { - "version": "3.37.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz", - "integrity": "sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==", + "version": "3.42.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.42.0.tgz", + "integrity": "sha512-bQasjMfyDGyaeWKBIu33lHh9qlSR0MFE/Nmc6nMjf/iU9b3rSMdAYz1Baxrv4lPdGUsTqZudHA4jIGSJy0SWZQ==", "dev": true, "license": "MIT", "dependencies": { - "browserslist": "^4.23.0" + "browserslist": "^4.24.4" }, "funding": { "type": "opencollective", @@ -9318,6 +9753,20 @@ "dev": true, "license": "MIT" }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dev": true, + "license": "MIT", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/cosmiconfig": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", @@ -9345,36 +9794,6 @@ } } }, - "node_modules/cosmiconfig/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/critters": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.24.tgz", - "integrity": "sha512-Oyqew0FGM0wYUSNqR0L6AteO5MpMoUU0rhKRieXeiKs+PmRTxiJMyaunYB2KF6fQ3dzChXKCpbFOEJx3OQ1v/Q==", - "deprecated": "Ownership of Critters has moved to the Nuxt team, who will be maintaining the project going forward. If you'd like to keep using Critters, please switch to the actively-maintained fork at https://github.com/danielroe/beasties", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "chalk": "^4.1.0", - "css-select": "^5.1.0", - "dom-serializer": "^2.0.0", - "domhandler": "^5.0.2", - "htmlparser2": "^8.0.2", - "postcss": "^8.4.23", - "postcss-media-query-parser": "^0.2.3" - } - }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -9478,23 +9897,46 @@ "node": ">=10" } }, + "node_modules/d3-color": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", + "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-interpolate": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", + "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", + "license": "ISC", + "dependencies": { + "d3-color": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/d3-selection": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", + "license": "ISC", "engines": { "node": ">=12" } }, "node_modules/data-view-buffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", - "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.6", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" + "is-data-view": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -9504,29 +9946,31 @@ } }, "node_modules/data-view-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", - "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" + "is-data-view": "^1.0.2" }, "engines": { "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/inspect-js" } }, "node_modules/data-view-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", - "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.6", + "call-bound": "^1.0.2", "es-errors": "^1.3.0", "is-data-view": "^1.0.1" }, @@ -9541,19 +9985,20 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz", "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/kossnocorp" } }, "node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", + "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", "dev": true, "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -9568,7 +10013,8 @@ "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 + "dev": true, + "license": "MIT" }, "node_modules/default-browser": { "version": "5.2.1", @@ -9600,31 +10046,24 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/default-gateway": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", - "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "execa": "^5.0.0" - }, - "engines": { - "node": ">= 10" - } - }, "node_modules/defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", + "dev": true, + "license": "MIT", "dependencies": { "clone": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/define-data-property": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", @@ -9639,11 +10078,16 @@ } }, "node_modules/define-lazy-prop": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", - "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", + "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "dev": true, + "license": "MIT", "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/define-properties": { @@ -9651,6 +10095,7 @@ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, + "license": "MIT", "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", @@ -9663,19 +10108,12 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -9685,17 +10123,19 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" } }, "node_modules/detect-libc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", - "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", + "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", "dev": true, "license": "Apache-2.0", + "optional": true, "engines": { "node": ">=8" } @@ -9716,14 +10156,6 @@ "node": ">=0.3.1" } }, - "node_modules/diff-sequences": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", - "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, "node_modules/dns-packet": { "version": "5.6.1", "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", @@ -9737,6 +10169,19 @@ "node": ">=6" } }, + "node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/dom-serializer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", @@ -9768,7 +10213,8 @@ "node_modules/dom-to-image": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/dom-to-image/-/dom-to-image-2.6.0.tgz", - "integrity": "sha512-Dt0QdaHmLpjURjU7Tnu3AgYSF2LuOmksSGsUcE6ItvJoCWTBEmiMXcqBdNSAm9+QbbwD7JMoVsuuKX6ZVQv1qA==" + "integrity": "sha512-Dt0QdaHmLpjURjU7Tnu3AgYSF2LuOmksSGsUcE6ItvJoCWTBEmiMXcqBdNSAm9+QbbwD7JMoVsuuKX6ZVQv1qA==", + "license": "MIT" }, "node_modules/domelementtype": { "version": "2.3.0", @@ -9800,18 +10246,18 @@ } }, "node_modules/dompurify": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.3.tgz", - "integrity": "sha512-U1U5Hzc2MO0oW3DF+G9qYN0aT7atAou4AgI0XjWz061nyBPbdxkfdhfy5uMgGn6+oLFCfn44ZGbdDqCzVmlOWA==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.5.tgz", + "integrity": "sha512-mLPd29uoRe9HpvwP2TxClGQBzGXeEC/we/q+bFlmPPmj2p2Ugl3r6ATu/UU1v77DXNcehiBg9zsr1dREyA/dJQ==", "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7" } }, "node_modules/domutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", - "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", + "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -9823,29 +10269,18 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, - "node_modules/dotenv": { - "version": "16.4.5", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", - "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://dotenvx.com" - } - }, - "node_modules/dotenv-expand": { - "version": "11.0.6", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.6.tgz", - "integrity": "sha512-8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g==", + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", "dependencies": { - "dotenv": "^16.4.4" + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://dotenvx.com" + "node": ">= 0.4" } }, "node_modules/eastasianwidth": { @@ -9862,31 +10297,19 @@ "dev": true, "license": "MIT" }, - "node_modules/ejs": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", - "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", - "dependencies": { - "jake": "^10.8.5" - }, - "bin": { - "ejs": "bin/cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/electron-to-chromium": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz", - "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==", + "version": "1.5.154", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.154.tgz", + "integrity": "sha512-G4VCFAyKbp1QJ+sWdXYIRYsPGvlV5sDACfCmoMFog3rjm1syLhI41WXm/swZypwCIWIm4IFLWzHY14joWMQ5Fw==", "dev": true, "license": "ISC" }, "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "dev": true, + "license": "MIT" }, "node_modules/emojis-list": { "version": "3.0.0", @@ -9903,6 +10326,7 @@ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -9918,32 +10342,10 @@ "iconv-lite": "^0.6.2" } }, - "node_modules/encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dependencies": { - "once": "^1.4.0" - } - }, "node_modules/enhanced-resolve": { - "version": "5.17.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", - "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", + "version": "5.18.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz", + "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==", "dev": true, "license": "MIT", "dependencies": { @@ -9954,21 +10356,11 @@ "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==", - "dependencies": { - "ansi-colors": "^4.1.1" - }, - "engines": { - "node": ">=8.6" - } - }, "node_modules/entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "license": "BSD-2-Clause", "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -10028,57 +10420,63 @@ } }, "node_modules/es-abstract": { - "version": "1.23.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", - "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", + "version": "1.23.9", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz", + "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==", "dev": true, + "license": "MIT", "dependencies": { - "array-buffer-byte-length": "^1.0.1", - "arraybuffer.prototype.slice": "^1.0.3", + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "data-view-buffer": "^1.0.1", - "data-view-byte-length": "^1.0.1", - "data-view-byte-offset": "^1.0.0", - "es-define-property": "^1.0.0", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "data-view-buffer": "^1.0.2", + "data-view-byte-length": "^1.0.2", + "data-view-byte-offset": "^1.0.1", + "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", - "es-set-tostringtag": "^2.0.3", - "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.4", - "get-symbol-description": "^1.0.2", - "globalthis": "^1.0.3", - "gopd": "^1.0.1", + "es-set-tostringtag": "^2.1.0", + "es-to-primitive": "^1.3.0", + "function.prototype.name": "^1.1.8", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.0", + "get-symbol-description": "^1.1.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.3", - "has-symbols": "^1.0.3", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", "hasown": "^2.0.2", - "internal-slot": "^1.0.7", - "is-array-buffer": "^3.0.4", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", "is-callable": "^1.2.7", - "is-data-view": "^1.0.1", - "is-negative-zero": "^2.0.3", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.3", - "is-string": "^1.0.7", - "is-typed-array": "^1.1.13", - "is-weakref": "^1.0.2", - "object-inspect": "^1.13.1", + "is-data-view": "^1.0.2", + "is-regex": "^1.2.1", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.0", + "math-intrinsics": "^1.1.0", + "object-inspect": "^1.13.3", "object-keys": "^1.1.1", - "object.assign": "^4.1.5", - "regexp.prototype.flags": "^1.5.2", - "safe-array-concat": "^1.1.2", - "safe-regex-test": "^1.0.3", - "string.prototype.trim": "^1.2.9", - "string.prototype.trimend": "^1.0.8", + "object.assign": "^4.1.7", + "own-keys": "^1.0.1", + "regexp.prototype.flags": "^1.5.3", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", "string.prototype.trimstart": "^1.0.8", - "typed-array-buffer": "^1.0.2", - "typed-array-byte-length": "^1.0.1", - "typed-array-byte-offset": "^1.0.2", - "typed-array-length": "^1.0.6", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.15" + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.18" }, "engines": { "node": ">= 0.4" @@ -10088,13 +10486,10 @@ } }, "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", "license": "MIT", - "dependencies": { - "get-intrinsic": "^1.2.4" - }, "engines": { "node": ">= 0.4" } @@ -10109,17 +10504,17 @@ } }, "node_modules/es-module-lexer": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", - "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz", + "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==", "dev": true, "license": "MIT" }, "node_modules/es-object-atoms": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", - "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", - "dev": true, + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0" }, @@ -10128,37 +10523,44 @@ } }, "node_modules/es-set-tostringtag": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", - "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", "dev": true, + "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.4", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", "has-tostringtag": "^1.0.2", - "hasown": "^2.0.1" + "hasown": "^2.0.2" }, "engines": { "node": ">= 0.4" } }, "node_modules/es-shim-unscopables": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", - "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz", + "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==", "dev": true, + "license": "MIT", "dependencies": { - "hasown": "^2.0.0" + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", "dev": true, + "license": "MIT", "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" }, "engines": { "node": ">= 0.4" @@ -10168,9 +10570,9 @@ } }, "node_modules/esbuild": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz", - "integrity": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz", + "integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -10181,36 +10583,37 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.23.0", - "@esbuild/android-arm": "0.23.0", - "@esbuild/android-arm64": "0.23.0", - "@esbuild/android-x64": "0.23.0", - "@esbuild/darwin-arm64": "0.23.0", - "@esbuild/darwin-x64": "0.23.0", - "@esbuild/freebsd-arm64": "0.23.0", - "@esbuild/freebsd-x64": "0.23.0", - "@esbuild/linux-arm": "0.23.0", - "@esbuild/linux-arm64": "0.23.0", - "@esbuild/linux-ia32": "0.23.0", - "@esbuild/linux-loong64": "0.23.0", - "@esbuild/linux-mips64el": "0.23.0", - "@esbuild/linux-ppc64": "0.23.0", - "@esbuild/linux-riscv64": "0.23.0", - "@esbuild/linux-s390x": "0.23.0", - "@esbuild/linux-x64": "0.23.0", - "@esbuild/netbsd-x64": "0.23.0", - "@esbuild/openbsd-arm64": "0.23.0", - "@esbuild/openbsd-x64": "0.23.0", - "@esbuild/sunos-x64": "0.23.0", - "@esbuild/win32-arm64": "0.23.0", - "@esbuild/win32-ia32": "0.23.0", - "@esbuild/win32-x64": "0.23.0" + "@esbuild/aix-ppc64": "0.25.4", + "@esbuild/android-arm": "0.25.4", + "@esbuild/android-arm64": "0.25.4", + "@esbuild/android-x64": "0.25.4", + "@esbuild/darwin-arm64": "0.25.4", + "@esbuild/darwin-x64": "0.25.4", + "@esbuild/freebsd-arm64": "0.25.4", + "@esbuild/freebsd-x64": "0.25.4", + "@esbuild/linux-arm": "0.25.4", + "@esbuild/linux-arm64": "0.25.4", + "@esbuild/linux-ia32": "0.25.4", + "@esbuild/linux-loong64": "0.25.4", + "@esbuild/linux-mips64el": "0.25.4", + "@esbuild/linux-ppc64": "0.25.4", + "@esbuild/linux-riscv64": "0.25.4", + "@esbuild/linux-s390x": "0.25.4", + "@esbuild/linux-x64": "0.25.4", + "@esbuild/netbsd-arm64": "0.25.4", + "@esbuild/netbsd-x64": "0.25.4", + "@esbuild/openbsd-arm64": "0.25.4", + "@esbuild/openbsd-x64": "0.25.4", + "@esbuild/sunos-x64": "0.25.4", + "@esbuild/win32-arm64": "0.25.4", + "@esbuild/win32-ia32": "0.25.4", + "@esbuild/win32-x64": "0.25.4" } }, "node_modules/esbuild-wasm": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.23.0.tgz", - "integrity": "sha512-6jP8UmWy6R6TUUV8bMuC3ZyZ6lZKI56x0tkxyCIqWwRRJ/DgeQKneh/Oid5EoGoPFLrGNkz47ZEtWAYuiY/u9g==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.25.4.tgz", + "integrity": "sha512-2HlCS6rNvKWaSKhWaG/YIyRsTsL3gUrMP2ToZMBIjw9LM7vVcIs+rz8kE2vExvTJgvM8OKPqNpcHawY/BQc/qQ==", "dev": true, "license": "MIT", "bin": { @@ -10221,9 +10624,10 @@ } }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -10237,38 +10641,45 @@ "license": "MIT" }, "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", "engines": { - "node": ">=0.8.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/eslint": { - "version": "9.16.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.16.0.tgz", - "integrity": "sha512-whp8mSQI4C8VXd+fLgSM0lh3UlmcFtVwUQjyKCFfsp+2ItAIYhlq/hqGahGqHE6cv9unM41VlqKk2VtKYR2TaA==", + "version": "9.26.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.26.0.tgz", + "integrity": "sha512-Hx0MOjPh6uK9oq9nVsATZKE/Wlbai7KFjfCuw9UHaguDW3x+HF0O5nIi3ud39TWgrTjTO5nHxmL3R1eANinWHQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.19.0", - "@eslint/core": "^0.9.0", - "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.16.0", - "@eslint/plugin-kit": "^0.2.3", + "@eslint/config-array": "^0.20.0", + "@eslint/config-helpers": "^0.2.1", + "@eslint/core": "^0.13.0", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.26.0", + "@eslint/plugin-kit": "^0.2.8", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.1", + "@humanwhocodes/retry": "^0.4.2", + "@modelcontextprotocol/sdk": "^1.8.0", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.5", + "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.2.0", + "eslint-scope": "^8.3.0", "eslint-visitor-keys": "^4.2.0", "espree": "^10.3.0", "esquery": "^1.5.0", @@ -10284,7 +10695,8 @@ "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3" + "optionator": "^0.9.3", + "zod": "^3.24.2" }, "bin": { "eslint": "bin/eslint.js" @@ -10309,6 +10721,7 @@ "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^3.2.7", "is-core-module": "^2.13.0", @@ -10320,6 +10733,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "^2.1.1" } @@ -10329,6 +10743,7 @@ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz", "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^3.2.7" }, @@ -10346,6 +10761,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "^2.1.1" } @@ -10355,6 +10771,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", "dev": true, + "license": "MIT", "dependencies": { "@rtsao/scc": "^1.1.0", "array-includes": "^3.1.8", @@ -10383,25 +10800,38 @@ "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9" } }, + "node_modules/eslint-plugin-import/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/eslint-plugin-import/node_modules/debug": { "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "^2.1.1" } }, - "node_modules/eslint-plugin-import/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "node_modules/eslint-plugin-import/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "license": "ISC", "dependencies": { - "esutils": "^2.0.2" + "brace-expansion": "^1.1.7" }, "engines": { - "node": ">=0.10.0" + "node": "*" } }, "node_modules/eslint-plugin-import/node_modules/semver": { @@ -10409,28 +10839,28 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } }, "node_modules/eslint-plugin-jsdoc": { - "version": "50.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.6.0.tgz", - "integrity": "sha512-tCNp4fR79Le3dYTPB0dKEv7yFyvGkUCa+Z3yuTrrNGGOxBlXo9Pn0PEgroOZikUQOGjxoGMVKNjrOHcYEdfszg==", + "version": "50.6.17", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.6.17.tgz", + "integrity": "sha512-hq+VQylhd12l8qjexyriDsejZhqiP33WgMTy2AmaGZ9+MrMWVqPECsM87GPxgHfQn0zw+YTuhqjUfk1f+q67aQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "@es-joy/jsdoccomment": "~0.49.0", + "@es-joy/jsdoccomment": "~0.50.1", "are-docs-informative": "^0.0.2", "comment-parser": "1.4.1", "debug": "^4.3.6", "escape-string-regexp": "^4.0.0", "espree": "^10.1.0", "esquery": "^1.6.0", - "parse-imports": "^2.1.1", + "parse-imports-exports": "^0.2.4", "semver": "^7.6.3", - "spdx-expression-parse": "^4.0.0", - "synckit": "^0.9.1" + "spdx-expression-parse": "^4.0.0" }, "engines": { "node": ">=18" @@ -10439,42 +10869,22 @@ "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" } }, - "node_modules/eslint-plugin-jsdoc/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-plugin-jsdoc/node_modules/spdx-expression-parse": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz", - "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==", - "dev": true, - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, "node_modules/eslint-plugin-prefer-arrow": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz", "integrity": "sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==", "dev": true, + "license": "MIT", "peerDependencies": { "eslint": ">=2.0.0" } }, "node_modules/eslint-scope": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", - "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", + "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -10491,6 +10901,7 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -10498,17 +10909,12 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", - "dev": true - }, "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, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -10520,16 +10926,15 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "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==", + "node_modules/eslint/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" } }, "node_modules/eslint/node_modules/eslint-visitor-keys": { @@ -10537,6 +10942,7 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -10544,83 +10950,34 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "node_modules/eslint/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, + "license": "MIT", "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" + "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/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, + "license": "MIT" + }, + "node_modules/eslint/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", "dependencies": { - "p-locate": "^5.0.0" + "brace-expansion": "^1.1.7" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "*" } }, "node_modules/espree": { @@ -10628,6 +10985,7 @@ "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", @@ -10645,6 +11003,7 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -10652,18 +11011,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/esquery": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", @@ -10682,6 +11029,7 @@ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -10704,6 +11052,7 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } @@ -10713,14 +11062,15 @@ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/eventemitter3": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", - "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", "dev": true, "license": "MIT" }, @@ -10734,34 +11084,33 @@ "node": ">=0.8.x" } }, - "node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "node_modules/eventsource": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz", + "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==", "dev": true, "license": "MIT", "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" + "eventsource-parser": "^3.0.1" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" + "node": ">=18.0.0" + } + }, + "node_modules/eventsource-parser": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.2.tgz", + "integrity": "sha512-6RxOBZ/cYgd8usLwsEl+EC09Au/9BcmCKYF2/xbml6DNczf7nv0MQb+7BA2F+li6//I+28VNlQR37XfQtcAJuA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18.0.0" } }, "node_modules/exponential-backoff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", - "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz", + "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==", "dev": true, "license": "Apache-2.0" }, @@ -10769,74 +11118,70 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/export-to-csv/-/export-to-csv-1.4.0.tgz", "integrity": "sha512-6CX17Cu+rC2Fi2CyZ4CkgVG3hLl6BFsdAxfXiZkmDFIDY4mRx2y2spdeH6dqPHI9rP+AsHEfGeKz84Uuw7+Pmg==", + "license": "MIT", "engines": { "node": "^v12.20.0 || >=v14.13.0" } }, "node_modules/express": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", - "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz", + "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", "dev": true, "license": "MIT", "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.3", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.7.1", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.3.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.3", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.12", - "proxy-addr": "~2.0.7", - "qs": "6.13.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.19.0", - "serve-static": "1.16.2", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" + "accepts": "^2.0.0", + "body-parser": "^2.2.0", + "content-disposition": "^1.0.0", + "content-type": "^1.0.5", + "cookie": "^0.7.1", + "cookie-signature": "^1.2.1", + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "finalhandler": "^2.1.0", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "merge-descriptors": "^2.0.0", + "mime-types": "^3.0.0", + "on-finished": "^2.4.1", + "once": "^1.4.0", + "parseurl": "^1.3.3", + "proxy-addr": "^2.0.7", + "qs": "^6.14.0", + "range-parser": "^1.2.1", + "router": "^2.2.0", + "send": "^1.1.0", + "serve-static": "^2.2.0", + "statuses": "^2.0.1", + "type-is": "^2.0.1", + "vary": "^1.1.2" }, "engines": { - "node": ">= 0.10.0" + "node": ">= 18" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/express" } }, - "node_modules/express/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "node_modules/express-rate-limit": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz", + "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==", "dev": true, "license": "MIT", - "dependencies": { - "ms": "2.0.0" + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/express-rate-limit" + }, + "peerDependencies": { + "express": "^4.11 || 5 || ^5.0.0-beta.1" } }, - "node_modules/express/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true, - "license": "MIT" - }, "node_modules/external-editor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", @@ -10852,59 +11197,87 @@ "node": ">=4" } }, - "node_modules/external-editor/node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "node_modules/external-editor/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "license": "MIT", "dependencies": { - "os-tmpdir": "~1.0.2" + "safer-buffer": ">= 2.1.2 < 3" }, "engines": { - "node": ">=0.6.0" + "node": ">=0.10.0" } }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.4" + "micromatch": "^4.0.8" }, "engines": { "node": ">=8.6.0" } }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "node_modules/fast-uri": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", - "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", "dev": true, "license": "MIT" }, + "node_modules/fast-uri": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz", + "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "BSD-3-Clause" + }, "node_modules/fast-xml-parser": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz", @@ -10928,9 +11301,11 @@ } }, "node_modules/fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "dev": true, + "license": "ISC", "dependencies": { "reusify": "^1.0.4" } @@ -10948,18 +11323,19 @@ "node": ">=0.8.0" } }, - "node_modules/figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dependencies": { - "escape-string-regexp": "^1.0.5" + "node_modules/fdir": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "picomatch": "^3 || ^4" }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } } }, "node_modules/file-entry-cache": { @@ -10975,37 +11351,11 @@ "node": ">=16.0.0" } }, - "node_modules/filelist": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", - "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", - "dependencies": { - "minimatch": "^5.0.1" - } - }, - "node_modules/filelist/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/filelist/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/filesize": { "version": "10.1.6", "resolved": "https://registry.npmjs.org/filesize/-/filesize-10.1.6.tgz", "integrity": "sha512-sJslQKU2uM33qH5nqewAwVB2QgR6w1aMNsYUp3aN5rMRyXEwJGmZvaWzeJFNTOXWlHQyBFCWrdj3fV/fsTOX8w==", + "license": "BSD-3-Clause", "engines": { "node": ">= 10.4.0" } @@ -11014,6 +11364,7 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" @@ -11023,38 +11374,23 @@ } }, "node_modules/finalhandler": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", - "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz", + "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==", "dev": true, + "license": "MIT", "dependencies": { - "debug": "2.6.9", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "on-finished": "^2.4.1", + "parseurl": "^1.3.3", + "statuses": "^2.0.1" }, "engines": { "node": ">= 0.8" } }, - "node_modules/finalhandler/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/finalhandler/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, "node_modules/find-cache-dir": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz", @@ -11073,36 +11409,28 @@ } }, "node_modules/find-up": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", - "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "license": "MIT", "dependencies": { - "locate-path": "^7.1.0", - "path-exists": "^5.0.0" + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/find-up/node_modules/path-exists": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", - "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, "node_modules/flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "license": "BSD-3-Clause", "bin": { "flat": "cli.js" } @@ -11122,22 +11450,24 @@ } }, "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", "dev": true, "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "dev": true, "funding": [ { "type": "individual", "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -11148,22 +11478,29 @@ } }, "node_modules/for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", "dev": true, + "license": "MIT", "dependencies": { - "is-callable": "^1.1.3" + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/foreground-child": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", - "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", "dev": true, "license": "ISC", "dependencies": { - "cross-spawn": "^7.0.0", + "cross-spawn": "^7.0.6", "signal-exit": "^4.0.1" }, "engines": { @@ -11173,32 +11510,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/form-data": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", - "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -11224,27 +11535,15 @@ } }, "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", + "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", "dev": true, + "license": "MIT", "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, - "node_modules/front-matter": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz", - "integrity": "sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==", - "dependencies": { - "js-yaml": "^3.13.1" - } - }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" - }, "node_modules/fs-minipass": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", @@ -11277,20 +11576,24 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/function.prototype.name": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", - "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", + "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "functions-have-names": "^1.2.3" + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "functions-have-names": "^1.2.3", + "hasown": "^2.0.2", + "is-callable": "^1.2.7" }, "engines": { "node": ">= 0.4" @@ -11304,6 +11607,7 @@ "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -11322,14 +11626,16 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } }, "node_modules/get-east-asian-width": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz", - "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz", + "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==", "dev": true, "license": "MIT", "engines": { @@ -11340,16 +11646,21 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "license": "MIT", "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -11358,28 +11669,29 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", "license": "MIT", - "engines": { - "node": ">=10" + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": ">= 0.4" } }, "node_modules/get-symbol-description": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", - "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.5", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4" + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" @@ -11410,14 +11722,16 @@ } }, "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", "dependencies": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" }, "engines": { - "node": ">= 6" + "node": ">=10.13.0" } }, "node_modules/glob-to-regexp": { @@ -11427,32 +11741,6 @@ "dev": true, "license": "BSD-2-Clause" }, - "node_modules/glob/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/glob/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -11464,12 +11752,14 @@ } }, "node_modules/globalthis": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", - "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", "dev": true, + "license": "MIT", "dependencies": { - "define-properties": "^1.1.3" + "define-properties": "^1.2.1", + "gopd": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -11478,12 +11768,34 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "node_modules/globby": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz", + "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==", + "dev": true, + "license": "MIT", "dependencies": { - "get-intrinsic": "^1.1.3" + "@sindresorhus/merge-streams": "^2.1.0", + "fast-glob": "^3.3.3", + "ignore": "^7.0.3", + "path-type": "^6.0.0", + "slash": "^5.1.0", + "unicorn-magic": "^0.3.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -11507,6 +11819,7 @@ "version": "2.0.8", "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==", + "license": "MIT", "engines": { "node": ">=0.8.0" } @@ -11534,10 +11847,14 @@ } }, "node_modules/has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -11546,6 +11863,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -11555,6 +11873,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, "license": "MIT", "dependencies": { "es-define-property": "^1.0.0" @@ -11564,9 +11883,14 @@ } }, "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -11575,9 +11899,10 @@ } }, "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -11590,6 +11915,7 @@ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, + "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" }, @@ -11604,6 +11930,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -11615,6 +11942,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz", "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw==", + "license": "MIT", "engines": { "node": ">=6" }, @@ -11625,21 +11953,29 @@ "node_modules/hocon-parser": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hocon-parser/-/hocon-parser-1.0.1.tgz", - "integrity": "sha1-t5tmFDmZslXgi2c8gykbXjY/C3g=" + "integrity": "sha512-qMKuQh6pLPQc0gXsl91hAJEjD4JghV1VukO5gKOzjolCnupCbGHpERzMCkZLwVDLq7sL8xR6P4iWhcM1my3HtA==", + "license": "ISC" }, "node_modules/hosted-git-info": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz", - "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.1.0.tgz", + "integrity": "sha512-Rw/B2DNQaPBICNXEm8balFz9a6WpZrkCGpcWFpy7nCj+NyhSdqXipmfvtmWt9xGfp0wZnBxB+iVpLmQMYt47Tw==", "dev": true, "license": "ISC", "dependencies": { "lru-cache": "^10.0.1" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, + "node_modules/hosted-git-info/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC" + }, "node_modules/hpack.js": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", @@ -11683,27 +12019,20 @@ "dev": true, "license": "MIT" }, - "node_modules/html-entities": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz", - "integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==", + "node_modules/hpack.js/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/mdevils" - }, - { - "type": "patreon", - "url": "https://patreon.com/mdevils" - } - ], - "license": "MIT" + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } }, "node_modules/htmlparser2": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", - "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.0.0.tgz", + "integrity": "sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==", "dev": true, "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", @@ -11716,14 +12045,14 @@ "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "entities": "^4.4.0" + "domutils": "^3.2.1", + "entities": "^6.0.0" } }, "node_modules/htmlparser2/node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz", + "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==", "dev": true, "license": "BSD-2-Clause", "engines": { @@ -11734,9 +12063,9 @@ } }, "node_modules/http-cache-semantics": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", + "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", "dev": true, "license": "BSD-2-Clause" }, @@ -11752,6 +12081,7 @@ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dev": true, + "license": "MIT", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -11764,9 +12094,9 @@ } }, "node_modules/http-parser-js": { - "version": "0.5.8", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", - "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz", + "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==", "dev": true, "license": "MIT" }, @@ -11800,10 +12130,11 @@ } }, "node_modules/http-proxy-middleware": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.3.tgz", - "integrity": "sha512-usY0HG5nyDUwtqpiZdETNbmKtw3QQ1jwYFZ9wi5iHzX2BcILwQKtYDJPo7XHTsu5Z0B2Hj3W9NNnbd+AjFWjqg==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.5.tgz", + "integrity": "sha512-GLZZm1X38BPY4lkXA01jhwxvDoOkkXqjgVyUzVxiEK4iuRu03PZoYHhHRwxnfhQMDuaxi3vVri0YgSro/1oWqg==", "dev": true, + "license": "MIT", "dependencies": { "@types/http-proxy": "^1.17.15", "debug": "^4.3.6", @@ -11816,46 +12147,20 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/http-proxy-middleware/node_modules/is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/http-proxy/node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "dev": true, - "license": "MIT" - }, "node_modules/https-proxy-agent": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", - "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", "dev": true, "license": "MIT", "dependencies": { - "agent-base": "^7.0.2", + "agent-base": "^7.1.2", "debug": "4" }, "engines": { "node": ">= 14" } }, - "node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=10.17.0" - } - }, "node_modules/hyperdyperid": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz", @@ -11867,13 +12172,13 @@ } }, "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, "license": "MIT", "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": ">= 2.1.2 < 3.0.0" }, "engines": { "node": ">=0.10.0" @@ -11896,6 +12201,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, "funding": [ { "type": "github", @@ -11909,54 +12215,30 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "BSD-3-Clause" }, "node_modules/ignore": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", - "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz", + "integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==", + "dev": true, "license": "MIT", "engines": { "node": ">= 4" } }, "node_modules/ignore-walk": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz", - "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-7.0.0.tgz", + "integrity": "sha512-T4gbf83A4NH95zvhVYZc+qWocBBGlpzUXLPGurJggw/WIOwicfXJChLDP/iBZnN5WqROSu5Bm3hhle4z8a8YGQ==", "dev": true, "license": "ISC", "dependencies": { "minimatch": "^9.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/ignore-walk/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/ignore-walk/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/image-size": { @@ -11974,17 +12256,18 @@ } }, "node_modules/immutable": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", - "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.2.tgz", + "integrity": "sha512-qHKXW1q6liAk1Oys6umoaZbDRqjcjgSrbnrifHsfsttza7zcvRAsL7mMV6xWcyhwQy7Xj5v4hhbr6b+iDYwlmQ==", "dev": true, "license": "MIT" }, "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", "dev": true, + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -11996,58 +12279,43 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/import-fresh/node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": ">=0.8.19" } }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" }, "node_modules/ini": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz", - "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-5.0.0.tgz", + "integrity": "sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==", "dev": true, "license": "ISC", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/internal-slot": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", - "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", "dev": true, + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", - "hasown": "^2.0.0", - "side-channel": "^1.0.4" + "hasown": "^2.0.2", + "side-channel": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -12068,23 +12336,25 @@ } }, "node_modules/ipaddr.js": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz", - "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", "dev": true, "license": "MIT", "engines": { - "node": ">= 10" + "node": ">= 0.10" } }, "node_modules/is-array-buffer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", - "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1" + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" @@ -12100,13 +12370,37 @@ "dev": true, "license": "MIT" }, - "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "node_modules/is-async-function": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", + "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==", "dev": true, + "license": "MIT", "dependencies": { - "has-bigints": "^1.0.1" + "async-function": "^1.0.0", + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-bigints": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -12126,13 +12420,14 @@ } }, "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz", + "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -12146,6 +12441,7 @@ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -12154,10 +12450,11 @@ } }, "node_modules/is-core-module": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", - "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", "dev": true, + "license": "MIT", "dependencies": { "hasown": "^2.0.2" }, @@ -12169,11 +12466,14 @@ } }, "node_modules/is-data-view": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", - "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", "dev": true, + "license": "MIT", "dependencies": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", "is-typed-array": "^1.1.13" }, "engines": { @@ -12184,12 +12484,14 @@ } }, "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", "dev": true, + "license": "MIT", "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -12199,14 +12501,16 @@ } }, "node_modules/is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", + "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", + "dev": true, + "license": "MIT", "bin": { "is-docker": "cli.js" }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -12215,23 +12519,67 @@ "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "node_modules/is-finalizationregistry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, "engines": { - "node": ">=8" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", + "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-generator-function": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -12258,42 +12606,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-inside-container/node_modules/is-docker": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", - "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", - "dev": true, - "license": "MIT", - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-interactive": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", + "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-negative-zero": { + "node_modules/is-map": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", - "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -12318,18 +12646,21 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.12.0" } }, "node_modules/is-number-object": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz", - "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", "dev": true, + "license": "MIT", "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -12352,26 +12683,33 @@ } }, "node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", "dev": true, "license": "MIT", - "dependencies": { - "isobject": "^3.0.1" - }, "engines": { "node": ">=0.10.0" } }, - "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "node_modules/is-promise": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", + "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", "dev": true, + "license": "MIT" + }, + "node_modules/is-regex": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -12380,13 +12718,27 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-shared-array-buffer": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", - "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7" + "call-bound": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -12395,26 +12747,15 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "node_modules/is-string": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", "dev": true, "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -12424,12 +12765,15 @@ } }, "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", "dev": true, + "license": "MIT", "dependencies": { - "has-symbols": "^1.0.2" + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -12439,12 +12783,13 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", - "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", "dev": true, + "license": "MIT", "dependencies": { - "which-typed-array": "^1.1.14" + "which-typed-array": "^1.1.16" }, "engines": { "node": ">= 0.4" @@ -12457,6 +12802,8 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -12464,13 +12811,47 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz", + "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==", + "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2" + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -12484,27 +12865,34 @@ "license": "MIT" }, "node_modules/is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz", + "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==", + "dev": true, + "license": "MIT", "dependencies": { - "is-docker": "^2.0.0" + "is-inside-container": "^1.0.0" }, "engines": { - "node": ">=8" + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/isarray": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" }, "node_modules/isobject": { "version": "3.0.1", @@ -12559,45 +12947,6 @@ "@pkgjs/parseargs": "^0.11.0" } }, - "node_modules/jake": { - "version": "10.9.2", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", - "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", - "dependencies": { - "async": "^3.2.3", - "chalk": "^4.0.2", - "filelist": "^1.0.4", - "minimatch": "^3.1.2" - }, - "bin": { - "jake": "bin/cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/jest-diff": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", - "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", - "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^29.6.3", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-get-type": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", - "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, "node_modules/jest-worker": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", @@ -12630,9 +12979,9 @@ } }, "node_modules/jiti": { - "version": "1.21.6", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz", - "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==", + "version": "1.21.7", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz", + "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", "dev": true, "license": "MIT", "bin": { @@ -12647,30 +12996,18 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, - "node_modules/js-yaml/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/js-yaml/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" - }, "node_modules/jsbn": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", @@ -12683,21 +13020,22 @@ "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz", "integrity": "sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==", "dev": true, + "license": "MIT", "engines": { "node": ">=12.0.0" } }, "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", "dev": true, "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, "engines": { - "node": ">=4" + "node": ">=6" } }, "node_modules/json-buffer": { @@ -12708,13 +13046,13 @@ "license": "MIT" }, "node_modules/json-parse-even-better-errors": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", - "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz", + "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==", "dev": true, "license": "MIT", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/json-schema-traverse": { @@ -12727,13 +13065,16 @@ "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 + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", "bin": { "json5": "lib/cli.js" }, @@ -12742,9 +13083,11 @@ } }, "node_modules/jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", + "dev": true, + "license": "MIT" }, "node_modules/jsonparse": { "version": "1.3.1", @@ -12787,9 +13130,9 @@ } }, "node_modules/launch-editor": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.0.tgz", - "integrity": "sha512-vJranOAJrI/llyWGRQqiDM+adrw+k83fvmmx3+nV47g3+36xM15jE+zyZ6Ffel02+xSvuM0b2GDRosXZkbb6wA==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.10.0.tgz", + "integrity": "sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==", "dev": true, "license": "MIT", "dependencies": { @@ -12798,9 +13141,9 @@ } }, "node_modules/less": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/less/-/less-4.2.0.tgz", - "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/less/-/less-4.2.2.tgz", + "integrity": "sha512-tkuLHQlvWUTeQ3doAqnHbNn8T6WX1KA8yvbKG9x4VtKtIjHsVKQZCH11zRgAfbDAXC2UNIg/K9BYAAcEzUIrNg==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -12867,6 +13210,7 @@ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -12894,17 +13238,16 @@ } }, "node_modules/lines-and-columns": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", - "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true, + "license": "MIT" }, "node_modules/listr2": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz", - "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.5.tgz", + "integrity": "sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==", "dev": true, "license": "MIT", "dependencies": { @@ -12932,47 +13275,13 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/listr2/node_modules/emoji-regex": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", - "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "node_modules/listr2/node_modules/eventemitter3": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", "dev": true, "license": "MIT" }, - "node_modules/listr2/node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/listr2/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/listr2/node_modules/wrap-ansi": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", @@ -12992,29 +13301,30 @@ } }, "node_modules/lmdb": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.0.13.tgz", - "integrity": "sha512-UGe+BbaSUQtAMZobTb4nHvFMrmvuAQKSeaqAX2meTEQjfsbpl5sxdHD8T72OnwD4GU9uwNhYXIVe4QGs8N9Zyw==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.2.6.tgz", + "integrity": "sha512-SuHqzPl7mYStna8WRotY8XX/EUZBjjv3QyKIByeCLFfC9uXT/OIHByEcA07PzbMfQAM0KYJtLgtpMRlIe5dErQ==", "dev": true, "hasInstallScript": true, "license": "MIT", + "optional": true, "dependencies": { - "msgpackr": "^1.10.2", + "msgpackr": "^1.11.2", "node-addon-api": "^6.1.0", "node-gyp-build-optional-packages": "5.2.2", - "ordered-binary": "^1.4.1", + "ordered-binary": "^1.5.3", "weak-lru-cache": "^1.2.2" }, "bin": { "download-lmdb-prebuilds": "bin/download-prebuilds.js" }, "optionalDependencies": { - "@lmdb/lmdb-darwin-arm64": "3.0.13", - "@lmdb/lmdb-darwin-x64": "3.0.13", - "@lmdb/lmdb-linux-arm": "3.0.13", - "@lmdb/lmdb-linux-arm64": "3.0.13", - "@lmdb/lmdb-linux-x64": "3.0.13", - "@lmdb/lmdb-win32-x64": "3.0.13" + "@lmdb/lmdb-darwin-arm64": "3.2.6", + "@lmdb/lmdb-darwin-x64": "3.2.6", + "@lmdb/lmdb-linux-arm": "3.2.6", + "@lmdb/lmdb-linux-arm64": "3.2.6", + "@lmdb/lmdb-linux-x64": "3.2.6", + "@lmdb/lmdb-win32-x64": "3.2.6" } }, "node_modules/loader-runner": { @@ -13038,16 +13348,16 @@ } }, "node_modules/locate-path": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", - "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, "license": "MIT", "dependencies": { - "p-locate": "^6.0.0" + "p-locate": "^5.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -13056,7 +13366,8 @@ "node_modules/lodash-es": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", - "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==", + "license": "MIT" }, "node_modules/lodash.debounce": { "version": "4.0.8", @@ -13069,27 +13380,33 @@ "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 + "dev": true, + "license": "MIT" }, "node_modules/lodash.padend": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz", - "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=" + "integrity": "sha512-sOQs2aqGpbl27tmCS1QNZA09Uqp01ZzWfDUoD+xzTii0E7dSQfRKcRetFwa+uXaxaqL+TKm7CgD2JdKP7aZBSw==", + "license": "MIT" }, "node_modules/lodash.trimstart": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/lodash.trimstart/-/lodash.trimstart-4.5.1.tgz", - "integrity": "sha1-j/TexTLYJIavWVc8OURZFOlEp/E=" + "integrity": "sha512-b/+D6La8tU76L/61/aN0jULWHkT0EeJCmVstPBn/K9MtD2qBW83AsBNrr63dKuWYwVMO7ucv13QNO/Ek/2RKaQ==", + "license": "MIT" }, "node_modules/lodash.words": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.words/-/lodash.words-4.2.0.tgz", - "integrity": "sha1-Xs/q+Oz4rKqODIOGKV8Zk8nPQDY=" + "integrity": "sha512-mXxqd8Yx9BGPij3lZKFSdOsjOTbL4krbCCp9slEozaN4EMppA2dFmK/f8HeohodprY6W0vOdiQ5WFgPaTI75xQ==", + "license": "MIT" }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -13150,29 +13467,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/log-update/node_modules/cli-cursor": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", - "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", - "dev": true, - "license": "MIT", - "dependencies": { - "restore-cursor": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/emoji-regex": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", - "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", - "dev": true, - "license": "MIT" - }, "node_modules/log-update/node_modules/is-fullwidth-code-point": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz", @@ -13189,52 +13483,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/log-update/node_modules/onetime": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", - "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-function": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/restore-cursor": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", - "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", - "dev": true, - "license": "MIT", - "dependencies": { - "onetime": "^7.0.0", - "signal-exit": "^4.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/log-update/node_modules/slice-ansi": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz", @@ -13252,40 +13500,6 @@ "url": "https://github.com/chalk/slice-ansi?sponsor=1" } }, - "node_modules/log-update/node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/log-update/node_modules/wrap-ansi": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", @@ -13305,21 +13519,25 @@ } }, "node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, - "license": "ISC" + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" + } }, "node_modules/lucene": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/lucene/-/lucene-2.1.1.tgz", - "integrity": "sha512-l0qCX+pgXEZh/7sYQNG+vzhOIFRPjlJJkQ/irk9n7Ak3d+1MrU6F7IV31KILwFkUn153oLK8a2AIt48DzLdVPg==" + "integrity": "sha512-l0qCX+pgXEZh/7sYQNG+vzhOIFRPjlJJkQ/irk9n7Ak3d+1MrU6F7IV31KILwFkUn153oLK8a2AIt48DzLdVPg==", + "license": "MIT" }, "node_modules/magic-string": { - "version": "0.30.11", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", - "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", + "version": "0.30.17", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", "dev": true, "license": "MIT", "dependencies": { @@ -13353,33 +13571,33 @@ } }, "node_modules/make-fetch-happen": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", - "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", + "version": "14.0.3", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz", + "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==", "dev": true, "license": "ISC", "dependencies": { - "@npmcli/agent": "^2.0.0", - "cacache": "^18.0.0", + "@npmcli/agent": "^3.0.0", + "cacache": "^19.0.1", "http-cache-semantics": "^4.1.1", - "is-lambda": "^1.0.1", "minipass": "^7.0.2", - "minipass-fetch": "^3.0.0", + "minipass-fetch": "^4.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "proc-log": "^4.2.0", + "negotiator": "^1.0.0", + "proc-log": "^5.0.0", "promise-retry": "^2.0.1", - "ssri": "^10.0.0" + "ssri": "^12.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/marked": { "version": "12.0.2", "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.2.tgz", "integrity": "sha512-qXUm7e/YKFoqFPYPa3Ukg9xlI5cyAtGmyEIzMfW//m6kXwCy2Ps9DYf5ioijFKQ8qyuscrHoY04iJGctu2Kg0Q==", + "license": "MIT", "bin": { "marked": "bin/marked.js" }, @@ -13387,19 +13605,29 @@ "node": ">= 18" } }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "dev": true, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", "engines": { - "node": ">= 0.6" + "node": ">= 0.4" + } + }, + "node_modules/media-typer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", + "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" } }, "node_modules/memfs": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.11.1.tgz", - "integrity": "sha512-LZcMTBAgqUUKNXZagcZxvXXfgF1bHX7Y7nQ0QyEiNbRJgE29GhgPd8Yna1VQcLlPiHt/5RFJMWYN9Uv/VPNvjQ==", + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.17.1.tgz", + "integrity": "sha512-thuTRd7F4m4dReCIy7vv4eNYnU6XI/tHMLSMMHLiortw/Y0QxqKtinG523U2aerzwYWGi606oBP4oMPy4+edag==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -13417,10 +13645,14 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", + "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } @@ -13436,6 +13668,8 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } @@ -13454,6 +13688,7 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, "license": "MIT", "dependencies": { "braces": "^3.0.3", @@ -13463,6 +13698,19 @@ "node": ">=8.6" } }, + "node_modules/micromatch/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -13477,19 +13725,23 @@ } }, "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "dev": true, + "license": "MIT", "dependencies": { - "mime-db": "1.52.0" + "mime-db": "^1.54.0" }, "engines": { "node": ">= 0.6" @@ -13499,6 +13751,8 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -13517,9 +13771,9 @@ } }, "node_modules/mini-css-extract-plugin": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz", - "integrity": "sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz", + "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==", "dev": true, "license": "MIT", "dependencies": { @@ -13545,20 +13799,27 @@ "license": "ISC" }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", "dependencies": { - "brace-expansion": "^1.1.7" + "brace-expansion": "^2.0.1" }, "engines": { - "node": "*" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/minimist": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -13587,18 +13848,18 @@ } }, "node_modules/minipass-fetch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz", + "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==", "dev": true, "license": "MIT", "dependencies": { "minipass": "^7.0.3", "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" + "minizlib": "^3.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" }, "optionalDependencies": { "encoding": "^0.1.13" @@ -13630,6 +13891,13 @@ "node": ">=8" } }, + "node_modules/minipass-flush/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, "node_modules/minipass-pipeline": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", @@ -13656,6 +13924,13 @@ "node": ">=8" } }, + "node_modules/minipass-pipeline/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, "node_modules/minipass-sized": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", @@ -13682,31 +13957,24 @@ "node": ">=8" } }, + "node_modules/minipass-sized/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz", + "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==", "dev": true, "license": "MIT", "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" + "minipass": "^7.1.2" }, "engines": { - "node": ">= 8" - } - }, - "node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" + "node": ">= 18" } }, "node_modules/mkdirp": { @@ -13723,9 +13991,9 @@ } }, "node_modules/mrmime": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz", - "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz", + "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==", "dev": true, "license": "MIT", "engines": { @@ -13733,10 +14001,11 @@ } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" }, "node_modules/msgpackr": { "version": "1.11.2", @@ -13744,6 +14013,7 @@ "integrity": "sha512-F9UngXRlPyWCDEASDpTf6c9uNhGPTqnTeLVt7bN+bU1eajoR/8V9ys2BRaV5C/e5ihE6sJ9uPIKaYt6bFuO32g==", "dev": true, "license": "MIT", + "optional": true, "optionalDependencies": { "msgpackr-extract": "^3.0.2" } @@ -13786,19 +14056,19 @@ } }, "node_modules/mute-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", - "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz", + "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==", "dev": true, "license": "ISC", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/nanoid": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", - "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", "dev": true, "funding": [ { @@ -13817,8 +14087,9 @@ "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 + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" }, "node_modules/needle": { "version": "3.3.1", @@ -13838,24 +14109,10 @@ "node": ">= 4.4.x" } }, - "node_modules/needle/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", "dev": true, "license": "MIT", "engines": { @@ -13870,18 +14127,19 @@ "license": "MIT" }, "node_modules/ng2-charts": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-6.0.1.tgz", - "integrity": "sha512-pO7evbvHqjiKB7zqE12tCKWQI9gmQ8DVOEaWBBLlxJabc4fLGk7o9t4jC4+Q9pJiQrTtQkugm0dIPQ4PFHUaWA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-8.0.0.tgz", + "integrity": "sha512-nofsNHI2Zt+EAwT+BJBVg0kgOhNo9ukO4CxULlaIi7VwZSr7I1km38kWSoU41Oq6os6qqIh5srnL+CcV+RFPFA==", + "license": "MIT", "dependencies": { "lodash-es": "^4.17.15", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/cdk": ">=17.0.0", - "@angular/common": ">=17.0.0", - "@angular/core": ">=17.0.0", - "@angular/platform-browser": ">=17.0.0", + "@angular/cdk": ">=19.0.0", + "@angular/common": ">=19.0.0", + "@angular/core": ">=19.0.0", + "@angular/platform-browser": ">=19.0.0", "chart.js": "^3.4.0 || ^4.0.0", "rxjs": "^6.5.3 || ^7.4.0" } @@ -13890,6 +14148,7 @@ "version": "16.0.0", "resolved": "https://registry.npmjs.org/ngx-clipboard/-/ngx-clipboard-16.0.0.tgz", "integrity": "sha512-rZ/Eo1PqiKMiyF8tdjhmUkoUu68f7OzBJ7YH1YFeh2RAaNrerTaW8XfFOzppSckjFQqA1fwGSYuTTJlDhDag5w==", + "license": "MIT", "dependencies": { "ngx-window-token": ">=7.0.0", "tslib": "^2.0.0" @@ -13900,9 +14159,9 @@ } }, "node_modules/ngx-color-picker": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-17.0.0.tgz", - "integrity": "sha512-kHuhW4vErpb0LlBlgTnf1+cYWdaq0gOvDwiX9LeaFKNvhV5li+YEyk7tC3o1Sbhqd4lsFKb8zHyqi1teLWN4Zg==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-19.0.0.tgz", + "integrity": "sha512-jZs7nk/DJB6FryElYnfkojWYCgpEc650s800g+39ebocVMZ18fAHf/CQd5+Bdm4E3zoRod0a0sErJ+c8tGQcCg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -13914,22 +14173,23 @@ } }, "node_modules/ngx-device-detector": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/ngx-device-detector/-/ngx-device-detector-8.0.0.tgz", - "integrity": "sha512-ik6EwUKnlN+xwoWHzyJp5+V+QRWYrmpTqAvRwa16xBnAVd7/i3jElN7MZjs/InwcYz7AW3XcSNeu+XRvtHgb9w==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/ngx-device-detector/-/ngx-device-detector-9.0.0.tgz", + "integrity": "sha512-zpio/wqH1GnxIpWCdA7cp5fmWf7YLycgzfXzQHmB9vaS7eAcqpBF5mxDS65IhE7TzNTJziDrYJCT+9tVqBcsDg==", "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/common": "^18.0.0", - "@angular/core": "^18.0.0" + "@angular/common": "^19.0.0", + "@angular/core": "^19.0.0" } }, "node_modules/ngx-markdown-editor": { "version": "5.3.4", "resolved": "https://registry.npmjs.org/ngx-markdown-editor/-/ngx-markdown-editor-5.3.4.tgz", "integrity": "sha512-YFp06lIWlh67tbww2y7rtEkQmClC4LHmr+oejUZ0OBIdgh7/B+0v/FiEzIAshPCocC2uPF4VHuNJZG7dFn42xA==", + "license": "Apache License 2.0", "dependencies": { "tslib": "^2.3.0" }, @@ -13940,9 +14200,10 @@ } }, "node_modules/ngx-print": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/ngx-print/-/ngx-print-1.5.1.tgz", - "integrity": "sha512-hrFMZCIAIyxXHnSWEgztJ1CQnelO306A23EVhRcbLgeZPdU8CBE6ixILTna/qf5ZbLv07vxWMm+UxbPcxNvOrA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ngx-print/-/ngx-print-2.0.0.tgz", + "integrity": "sha512-AMdLvMlch2FmqiSI5RLDS5qtvb/4Dvhm4NbOeQ3EvmRXiqmM185vBt7EW1NVWCkqOicYXtfn3Rx87GXqPVyauw==", + "license": "MIT", "dependencies": { "tslib": "^2.3.0" } @@ -13951,6 +14212,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/ngx-window-token/-/ngx-window-token-7.0.0.tgz", "integrity": "sha512-5+XfRVSY7Dciu8xyCNMkOlH2UfwR9W2P1Pirz7caaZgOZDjFbL8aEO2stjfJJm2FFf1D6dlVHNzhLWGk9HGkqA==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, @@ -13963,14 +14225,11 @@ } }, "node_modules/ngxtension": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ngxtension/-/ngxtension-4.1.0.tgz", - "integrity": "sha512-qS/Twu6lkL6K/fN2CInOTKmd9xZ9gCH3XSm+fEqlTGKlG66E3c6xsph3Vf2f+fUgbvsKlrrvkiWKeKeU9vrFxw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ngxtension/-/ngxtension-5.0.0.tgz", + "integrity": "sha512-apARBtvuxQ8slUib0FJJRc+bYIEavl8jwmHiQ9oLDh24deugHNMjtKLlL/tbk9MynAdHiEtS+77UpcN5aKP7nA==", + "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "^18.0.1", - "@nx/devkit": "^20.0.0", - "nx": "^20.0.0", - "ts-morph": "^22.0.0", "tslib": "^2.3.0" }, "engines": { @@ -13988,36 +14247,13 @@ } } }, - "node_modules/nice-napi": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", - "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "!win32" - ], - "dependencies": { - "node-addon-api": "^3.0.0", - "node-gyp-build": "^4.2.2" - } - }, - "node_modules/nice-napi/node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/node-addon-api": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", "dev": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/node-forge": { "version": "1.3.1", @@ -14030,41 +14266,28 @@ } }, "node_modules/node-gyp": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", - "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.2.0.tgz", + "integrity": "sha512-T0S1zqskVUSxcsSTkAsLc7xCycrRYmtDHadDinzocrThjyQCn5kMlEBSj6H4qDbgsIOSLmmlRIeb0lZXj+UArA==", "dev": true, "license": "MIT", "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", - "glob": "^10.3.10", "graceful-fs": "^4.2.6", - "make-fetch-happen": "^13.0.0", - "nopt": "^7.0.0", - "proc-log": "^4.1.0", + "make-fetch-happen": "^14.0.3", + "nopt": "^8.0.0", + "proc-log": "^5.0.0", "semver": "^7.3.5", - "tar": "^6.2.1", - "which": "^4.0.0" + "tar": "^7.4.3", + "tinyglobby": "^0.2.12", + "which": "^5.0.0" }, "bin": { "node-gyp": "bin/node-gyp.js" }, "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/node-gyp-build": { - "version": "4.8.4", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz", - "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==", - "dev": true, - "license": "MIT", - "optional": true, - "bin": { - "node-gyp-build": "bin.js", - "node-gyp-build-optional": "optional.js", - "node-gyp-build-test": "build-test.js" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/node-gyp-build-optional-packages": { @@ -14073,6 +14296,7 @@ "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==", "dev": true, "license": "MIT", + "optional": true, "dependencies": { "detect-libc": "^2.0.1" }, @@ -14082,6 +14306,16 @@ "node-gyp-build-optional-packages-test": "build-test.js" } }, + "node_modules/node-gyp/node_modules/chownr": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", + "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } + }, "node_modules/node-gyp/node_modules/isexe": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", @@ -14092,10 +14326,44 @@ "node": ">=16" } }, + "node_modules/node-gyp/node_modules/mkdirp": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", + "dev": true, + "license": "MIT", + "bin": { + "mkdirp": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/node-gyp/node_modules/tar": { + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.0.1", + "mkdirp": "^3.0.1", + "yallist": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/node-gyp/node_modules/which": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", + "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==", "dev": true, "license": "ISC", "dependencies": { @@ -14105,50 +14373,40 @@ "node-which": "bin/which.js" }, "engines": { - "node": "^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, - "node_modules/node-machine-id": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz", - "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==" + "node_modules/node-gyp/node_modules/yallist": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } }, "node_modules/node-releases": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", - "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", + "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", "dev": true, "license": "MIT" }, "node_modules/nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz", + "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==", "dev": true, "license": "ISC", "dependencies": { - "abbrev": "^2.0.0" + "abbrev": "^3.0.0" }, "bin": { "nopt": "bin/nopt.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/normalize-package-data": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz", - "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "hosted-git-info": "^7.0.0", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/normalize-path": { @@ -14172,115 +14430,104 @@ } }, "node_modules/npm-bundled": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", - "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-4.0.0.tgz", + "integrity": "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA==", "dev": true, "license": "ISC", "dependencies": { - "npm-normalize-package-bin": "^3.0.0" + "npm-normalize-package-bin": "^4.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-install-checks": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", - "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.1.tgz", + "integrity": "sha512-u6DCwbow5ynAX5BdiHQ9qvexme4U3qHW3MWe5NqH+NeBm0LbiH6zvGjNNew1fY+AZZUtVHbOPF3j7mJxbUzpXg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { "semver": "^7.1.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-normalize-package-bin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", - "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz", + "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==", "dev": true, "license": "ISC", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-package-arg": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz", - "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-12.0.2.tgz", + "integrity": "sha512-f1NpFjNI9O4VbKMOlA5QoBq/vSQPORHcTZ2feJpFkTHJ9eQkdlmZEKSjcAhxTGInC7RlEyScT9ui67NaOsjFWA==", "dev": true, "license": "ISC", "dependencies": { - "hosted-git-info": "^7.0.0", - "proc-log": "^4.0.0", + "hosted-git-info": "^8.0.0", + "proc-log": "^5.0.0", "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" + "validate-npm-package-name": "^6.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-packlist": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz", - "integrity": "sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-9.0.0.tgz", + "integrity": "sha512-8qSayfmHJQTx3nJWYbbUmflpyarbLMBc6LCAjYsiGtXxDB68HaZpb8re6zeaLGxZzDuMdhsg70jryJe+RrItVQ==", "dev": true, "license": "ISC", "dependencies": { - "ignore-walk": "^6.0.4" + "ignore-walk": "^7.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-pick-manifest": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz", - "integrity": "sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-10.0.0.tgz", + "integrity": "sha512-r4fFa4FqYY8xaM7fHecQ9Z2nE9hgNfJR+EmoKv0+chvzWkBcORX3r0FpTByP+CbOVJDladMXnPQGVN8PBLGuTQ==", "dev": true, "license": "ISC", "dependencies": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^11.0.0", + "npm-install-checks": "^7.1.0", + "npm-normalize-package-bin": "^4.0.0", + "npm-package-arg": "^12.0.0", "semver": "^7.3.5" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-registry-fetch": { - "version": "17.1.0", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz", - "integrity": "sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==", + "version": "18.0.2", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-18.0.2.tgz", + "integrity": "sha512-LeVMZBBVy+oQb5R6FDV9OlJCcWDU+al10oKpe+nsvcHnG24Z3uM3SvJYKfGJlfGjVU8v9liejCrUR/M5HO5NEQ==", "dev": true, "license": "ISC", "dependencies": { - "@npmcli/redact": "^2.0.0", + "@npmcli/redact": "^3.0.0", "jsonparse": "^1.3.1", - "make-fetch-happen": "^13.0.0", + "make-fetch-happen": "^14.0.0", "minipass": "^7.0.2", - "minipass-fetch": "^3.0.0", - "minizlib": "^2.1.2", - "npm-package-arg": "^11.0.0", - "proc-log": "^4.0.0" + "minipass-fetch": "^4.0.0", + "minizlib": "^3.0.1", + "npm-package-arg": "^12.0.0", + "proc-log": "^5.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dependencies": { - "path-key": "^3.0.0" - }, - "engines": { - "node": ">=8" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/nth-check": { @@ -14296,142 +14543,29 @@ "url": "https://github.com/fb55/nth-check?sponsor=1" } }, - "node_modules/nx": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/nx/-/nx-20.0.12.tgz", - "integrity": "sha512-pQ7Rwb2Qlhr+fEamd0qc4VsL/aKjVJ0MXPsosuhdZobLJQOKHefe+nXSSZ1Jy19VM3RRpxUKFneD/V2jvs3qDA==", - "hasInstallScript": true, - "dependencies": { - "@napi-rs/wasm-runtime": "0.2.4", - "@yarnpkg/lockfile": "^1.1.0", - "@yarnpkg/parsers": "3.0.2", - "@zkochan/js-yaml": "0.0.7", - "axios": "^1.7.4", - "chalk": "^4.1.0", - "cli-cursor": "3.1.0", - "cli-spinners": "2.6.1", - "cliui": "^8.0.1", - "dotenv": "~16.4.5", - "dotenv-expand": "~11.0.6", - "enquirer": "~2.3.6", - "figures": "3.2.0", - "flat": "^5.0.2", - "front-matter": "^4.0.2", - "ignore": "^5.0.4", - "jest-diff": "^29.4.1", - "jsonc-parser": "3.2.0", - "lines-and-columns": "2.0.3", - "minimatch": "9.0.3", - "node-machine-id": "1.1.12", - "npm-run-path": "^4.0.1", - "open": "^8.4.0", - "ora": "5.3.0", - "semver": "^7.5.3", - "string-width": "^4.2.3", - "tar-stream": "~2.2.0", - "tmp": "~0.2.1", - "tsconfig-paths": "^4.1.2", - "tslib": "^2.3.0", - "yargs": "^17.6.2", - "yargs-parser": "21.1.1" - }, - "bin": { - "nx": "bin/nx.js", - "nx-cloud": "bin/nx-cloud.js" - }, - "optionalDependencies": { - "@nx/nx-darwin-arm64": "20.0.12", - "@nx/nx-darwin-x64": "20.0.12", - "@nx/nx-freebsd-x64": "20.0.12", - "@nx/nx-linux-arm-gnueabihf": "20.0.12", - "@nx/nx-linux-arm64-gnu": "20.0.12", - "@nx/nx-linux-arm64-musl": "20.0.12", - "@nx/nx-linux-x64-gnu": "20.0.12", - "@nx/nx-linux-x64-musl": "20.0.12", - "@nx/nx-win32-arm64-msvc": "20.0.12", - "@nx/nx-win32-x64-msvc": "20.0.12" - }, - "peerDependencies": { - "@swc-node/register": "^1.8.0", - "@swc/core": "^1.3.85" - }, - "peerDependenciesMeta": { - "@swc-node/register": { - "optional": true - }, - "@swc/core": { - "optional": true - } - } - }, - "node_modules/nx/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/nx/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "license": "MIT", "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/nx/node_modules/ora": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz", - "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==", - "dependencies": { - "bl": "^4.0.3", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "log-symbols": "^4.0.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/nx/node_modules/tsconfig-paths": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", - "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", - "dependencies": { - "json5": "^2.2.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=6" + "node": ">=0.10.0" } }, "node_modules/object-hash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", + "license": "MIT", "engines": { "node": ">= 6" } }, "node_modules/object-inspect": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", - "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -14445,19 +14579,23 @@ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" } }, "node_modules/object.assign": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", - "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.5", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", - "has-symbols": "^1.0.3", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", "object-keys": "^1.1.1" }, "engines": { @@ -14472,6 +14610,7 @@ "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -14490,6 +14629,7 @@ "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -14500,12 +14640,14 @@ } }, "node_modules/object.values": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", - "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", "es-object-atoms": "^1.0.0" }, @@ -14550,52 +14692,60 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", "dependencies": { "wrappy": "1" } }, "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", + "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", + "dev": true, + "license": "MIT", "dependencies": { - "mimic-fn": "^2.1.0" + "mimic-function": "^5.0.0" }, "engines": { - "node": ">=6" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/open": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", - "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz", + "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==", + "dev": true, + "license": "MIT", "dependencies": { - "define-lazy-prop": "^2.0.0", - "is-docker": "^2.1.1", - "is-wsl": "^2.2.0" + "default-browser": "^5.2.1", + "define-lazy-prop": "^3.0.0", + "is-inside-container": "^1.0.0", + "is-wsl": "^3.1.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/optionator": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", - "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", "dev": true, + "license": "MIT", "dependencies": { - "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0" + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" }, "engines": { "node": ">= 0.8.0" @@ -14625,12 +14775,86 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/ora/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ora/node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ora/node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ora/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/ora/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/ordered-binary": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.3.tgz", "integrity": "sha512-oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==", "dev": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/os-tmpdir": { "version": "1.0.2", @@ -14642,59 +14866,32 @@ "node": ">=0.10.0" } }, + "node_modules/own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/p-limit": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", - "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "license": "MIT", "dependencies": { - "yocto-queue": "^1.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-limit/node_modules/yocto-queue": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz", - "integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", - "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "aggregate-error": "^3.0.0" + "yocto-queue": "^0.1.0" }, "engines": { "node": ">=10" @@ -14703,10 +14900,39 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz", + "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/p-retry": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.0.tgz", - "integrity": "sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz", + "integrity": "sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==", "dev": true, "license": "MIT", "dependencies": { @@ -14732,42 +14958,42 @@ } }, "node_modules/package-json-from-dist": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", - "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", "dev": true, "license": "BlueOak-1.0.0" }, "node_modules/pacote": { - "version": "18.0.6", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-18.0.6.tgz", - "integrity": "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==", + "version": "20.0.0", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-20.0.0.tgz", + "integrity": "sha512-pRjC5UFwZCgx9kUFDVM9YEahv4guZ1nSLqwmWiLUnDbGsjs+U5w7z6Uc8HNR1a6x8qnu5y9xtGE6D1uAuYz+0A==", "dev": true, "license": "ISC", "dependencies": { - "@npmcli/git": "^5.0.0", - "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/package-json": "^5.1.0", - "@npmcli/promise-spawn": "^7.0.0", - "@npmcli/run-script": "^8.0.0", - "cacache": "^18.0.0", + "@npmcli/git": "^6.0.0", + "@npmcli/installed-package-contents": "^3.0.0", + "@npmcli/package-json": "^6.0.0", + "@npmcli/promise-spawn": "^8.0.0", + "@npmcli/run-script": "^9.0.0", + "cacache": "^19.0.0", "fs-minipass": "^3.0.0", "minipass": "^7.0.2", - "npm-package-arg": "^11.0.0", - "npm-packlist": "^8.0.0", - "npm-pick-manifest": "^9.0.0", - "npm-registry-fetch": "^17.0.0", - "proc-log": "^4.0.0", + "npm-package-arg": "^12.0.0", + "npm-packlist": "^9.0.0", + "npm-pick-manifest": "^10.0.0", + "npm-registry-fetch": "^18.0.0", + "proc-log": "^5.0.0", "promise-retry": "^2.0.1", - "sigstore": "^2.2.0", - "ssri": "^10.0.0", + "sigstore": "^3.0.0", + "ssri": "^12.0.0", "tar": "^6.1.11" }, "bin": { "pacote": "bin/index.js" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/parent-module": { @@ -14775,6 +15001,7 @@ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -14782,18 +15009,14 @@ "node": ">=6" } }, - "node_modules/parse-imports": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.1.1.tgz", - "integrity": "sha512-TDT4HqzUiTMO1wJRwg/t/hYk8Wdp3iF/ToMIlAoVQfL1Xs/sTxq1dKWSMjMbQmIarfWKymOyly40+zmPHXMqCA==", + "node_modules/parse-imports-exports": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/parse-imports-exports/-/parse-imports-exports-0.2.4.tgz", + "integrity": "sha512-4s6vd6dx1AotCx/RCI2m7t7GCh5bDRUtGNvRfHSP2wbBQdMi67pPe7mtzmgwcaQ8VKK/6IB7Glfyu3qdZJPybQ==", "dev": true, - "license": "Apache-2.0", + "license": "MIT", "dependencies": { - "es-module-lexer": "^1.5.3", - "slashes": "^3.0.12" - }, - "engines": { - "node": ">= 18" + "parse-statements": "1.0.11" } }, "node_modules/parse-json": { @@ -14822,13 +15045,6 @@ "dev": true, "license": "MIT" }, - "node_modules/parse-json/node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true, - "license": "MIT" - }, "node_modules/parse-node-version": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", @@ -14839,13 +15055,21 @@ "node": ">= 0.10" } }, + "node_modules/parse-statements": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/parse-statements/-/parse-statements-1.0.11.tgz", + "integrity": "sha512-HlsyYdMBnbPQ9Jr/VgJ1YF4scnldvJpJxCVx6KgqPL4dxppsWrJHCIIxQXMJrqGnsRkNPATbeMJ8Yxu7JMsYcA==", + "dev": true, + "license": "MIT" + }, "node_modules/parse5": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", - "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", + "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", "devOptional": true, + "license": "MIT", "dependencies": { - "entities": "^4.4.0" + "entities": "^6.0.0" }, "funding": { "url": "https://github.com/inikulin/parse5?sponsor=1" @@ -14893,10 +15117,11 @@ } }, "node_modules/parse5/node_modules/entities": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz", - "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz", + "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==", "devOptional": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -14914,17 +15139,12 @@ "node": ">= 0.8" } }, - "node_modules/path-browserify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", - "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", - "license": "MIT" - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -14933,6 +15153,8 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -14941,7 +15163,8 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/path-scurry": { "version": "1.11.1", @@ -14960,25 +15183,51 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/path-to-regexp": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "dev": true, - "license": "MIT" + "license": "ISC" + }, + "node_modules/path-to-regexp": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", + "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + } + }, + "node_modules/path-type": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz", + "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", "engines": { - "node": ">=8.6" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" @@ -14996,13 +15245,23 @@ } }, "node_modules/piscina": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.6.1.tgz", - "integrity": "sha512-z30AwWGtQE+Apr+2WBZensP2lIvwoaMcOPkQlIEmSGMJNUvaYACylPYrQM6wSdUNJlnDVMSpLv7xTMJqlVshOA==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.8.0.tgz", + "integrity": "sha512-EZJb+ZxDrQf3dihsUL7p42pjNyrNIFJCrRHPMgxu/svsj+P3xS3fuEWp7k2+rfsavfl1N0G29b1HGs7J0m8rZA==", "dev": true, "license": "MIT", "optionalDependencies": { - "nice-napi": "^1.0.2" + "@napi-rs/nice": "^1.0.1" + } + }, + "node_modules/pkce-challenge": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz", + "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16.20.0" } }, "node_modules/pkg-dir": { @@ -15021,19 +15280,108 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/possible-typed-array-names": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", - "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "node_modules/pkg-dir/node_modules/find-up": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", + "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^7.1.0", + "path-exists": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", + "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^6.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", + "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^1.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", + "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/path-exists": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", + "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/pkg-dir/node_modules/yocto-queue": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.1.tgz", + "integrity": "sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" } }, "node_modules/postcss": { - "version": "8.4.41", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz", - "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==", + "version": "8.5.2", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz", + "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==", "dev": true, "funding": [ { @@ -15051,9 +15399,9 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.7", - "picocolors": "^1.0.1", - "source-map-js": "^1.2.0" + "nanoid": "^3.3.8", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" }, "engines": { "node": "^10 || ^12 || >=14" @@ -15112,14 +15460,14 @@ } }, "node_modules/postcss-modules-local-by-default": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", - "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz", + "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==", "dev": true, "license": "MIT", "dependencies": { "icss-utils": "^5.0.0", - "postcss-selector-parser": "^6.0.2", + "postcss-selector-parser": "^7.0.0", "postcss-value-parser": "^4.1.0" }, "engines": { @@ -15130,13 +15478,13 @@ } }, "node_modules/postcss-modules-scope": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", - "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz", + "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==", "dev": true, "license": "ISC", "dependencies": { - "postcss-selector-parser": "^6.0.4" + "postcss-selector-parser": "^7.0.0" }, "engines": { "node": "^10 || ^12 || >= 14" @@ -15162,9 +15510,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz", - "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz", + "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==", "dev": true, "license": "MIT", "dependencies": { @@ -15187,53 +15535,36 @@ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8.0" } }, - "node_modules/pretty-format": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", - "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", - "dependencies": { - "@jest/schemas": "^29.6.3", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/pretty-format/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/primeicons": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/primeicons/-/primeicons-7.0.0.tgz", - "integrity": "sha512-jK3Et9UzwzTsd6tzl2RmwrVY/b8raJ3QZLzoDACj+oTJ0oX7L9Hy+XnVwgo4QVKlKpnP/Ur13SXV/pVh4LzaDw==" + "integrity": "sha512-jK3Et9UzwzTsd6tzl2RmwrVY/b8raJ3QZLzoDACj+oTJ0oX7L9Hy+XnVwgo4QVKlKpnP/Ur13SXV/pVh4LzaDw==", + "license": "MIT" }, "node_modules/primeng": { - "version": "17.18.15", - "resolved": "https://registry.npmjs.org/primeng/-/primeng-17.18.15.tgz", - "integrity": "sha512-66iKLPBxuZguebSylKbAst5V3Qz+2dbzT+oCHQnCbv4Gu4JH6WqbBJWr283HacQB1mUNGvyxgcHVVPhQbnEXvA==", - "license": "MIT", + "version": "19.1.2", + "resolved": "https://registry.npmjs.org/primeng/-/primeng-19.1.2.tgz", + "integrity": "sha512-iu4lDrStBPCyYn+iSfofp/Hsv/dHVlnlsOhqFZlYTQB1o+MlVXa4PanLgHdoBr1thy3ozRkNDZHsICkUecWu0A==", + "license": "SEE LICENSE IN LICENSE.md", "dependencies": { + "@primeuix/styled": "^0.3.2", + "@primeuix/utils": "^0.3.2", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^17.0.0 || ^18.0.0", - "@angular/core": "^17.0.0 || ^18.0.0", - "@angular/forms": "^17.0.0 || ^18.0.0", - "rxjs": "^6.0.0 || ^7.8.1", - "zone.js": "~0.14.0" + "@angular/animations": "^19.0.0", + "@angular/cdk": "^19.0.0", + "@angular/common": "^19.0.0", + "@angular/core": "^19.0.0", + "@angular/forms": "^19.0.0", + "@angular/platform-browser": "^19.0.0", + "@angular/router": "^19.0.0", + "rxjs": "^6.0.0 || ^7.8.1" } }, "node_modules/primeng-sass-theme": { @@ -15243,13 +15574,13 @@ "license": "MIT" }, "node_modules/proc-log": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", - "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz", + "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==", "dev": true, "license": "ISC", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/process-nextick-args": { @@ -15259,13 +15590,6 @@ "dev": true, "license": "MIT" }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true, - "license": "ISC" - }, "node_modules/promise-retry": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", @@ -15294,21 +15618,6 @@ "node": ">= 0.10" } }, - "node_modules/proxy-addr/node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, "node_modules/prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -15318,20 +15627,18 @@ "optional": true }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true, - "engines": { - "node": ">=6" - } + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", + "license": "MIT" }, "node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.6" + "side-channel": "^1.1.0" }, "engines": { "node": ">=0.6" @@ -15344,6 +15651,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, "funding": [ { "type": "github", @@ -15357,7 +15665,8 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/randombytes": { "version": "2.1.0", @@ -15380,38 +15689,27 @@ } }, "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz", + "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==", "dev": true, + "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", - "iconv-lite": "0.4.24", + "iconv-lite": "0.6.3", "unpipe": "1.0.0" }, "engines": { "node": ">= 0.8" } }, - "node_modules/raw-body/node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==" - }, "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -15422,16 +15720,17 @@ } }, "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", "dev": true, "license": "MIT", - "dependencies": { - "picomatch": "^2.2.1" - }, "engines": { - "node": ">=8.10.0" + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, "node_modules/reflect-metadata": { @@ -15441,6 +15740,29 @@ "dev": true, "license": "Apache-2.0" }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", + "which-builtin-type": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/regenerate": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", @@ -15449,9 +15771,9 @@ "license": "MIT" }, "node_modules/regenerate-unicode-properties": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", - "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz", + "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==", "dev": true, "license": "MIT", "dependencies": { @@ -15468,32 +15790,25 @@ "dev": true, "license": "MIT" }, - "node_modules/regenerator-transform": { - "version": "0.15.2", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", - "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.8.4" - } - }, "node_modules/regex-parser": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz", - "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.1.tgz", + "integrity": "sha512-yXLRqatcCuKtVHsWrNg0JL3l1zGfdXeEvDa0bdu4tCDQw0RpMDZsqbkyRTUnKMR0tXF627V2oEWjBEaEdqTwtQ==", "dev": true, "license": "MIT" }, "node_modules/regexp.prototype.flags": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz", - "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "define-properties": "^1.2.1", "es-errors": "^1.3.0", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", "set-function-name": "^2.0.2" }, "engines": { @@ -15504,16 +15819,16 @@ } }, "node_modules/regexpu-core": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", - "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz", + "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/regjsgen": "^0.8.0", "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.1.0", - "regjsparser": "^0.9.1", + "regenerate-unicode-properties": "^10.2.0", + "regjsgen": "^0.8.0", + "regjsparser": "^0.12.0", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.1.0" }, @@ -15521,32 +15836,45 @@ "node": ">=4" } }, + "node_modules/regjsgen": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz", + "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==", + "dev": true, + "license": "MIT" + }, "node_modules/regjsparser": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", - "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz", + "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "jsesc": "~0.5.0" + "jsesc": "~3.0.2" }, "bin": { "regjsparser": "bin/parser" } }, "node_modules/regjsparser/node_modules/jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", "dev": true, + "license": "MIT", "bin": { "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" } }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -15569,22 +15897,36 @@ "license": "MIT" }, "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", "dev": true, + "license": "MIT", "dependencies": { - "is-core-module": "^2.13.0", + "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/resolve-url-loader": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz", @@ -15602,13 +15944,6 @@ "node": ">=12" } }, - "node_modules/resolve-url-loader/node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true, - "license": "MIT" - }, "node_modules/resolve-url-loader/node_modules/loader-utils": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", @@ -15635,15 +15970,20 @@ } }, "node_modules/restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", + "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", + "dev": true, + "license": "MIT", "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" + "onetime": "^7.0.0", + "signal-exit": "^4.1.0" }, "engines": { - "node": ">=8" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/retry": { @@ -15657,9 +15997,11 @@ } }, "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, + "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -15676,34 +16018,19 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-3.0.0.tgz", "integrity": "sha512-8h7ZcwxCBDKvchSWbWngJuSCqJGQ6nDuLLg+QcRyQDbX9jMWt+PpPeXAhSla0GOooEomk3lCprUpGkMdsLjKyg==", + "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/rimraf": { - "version": "5.0.10", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", - "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^10.3.7" - }, - "bin": { - "rimraf": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/rollup": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz", - "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.8.tgz", + "integrity": "sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==", "dev": true, "license": "MIT", "dependencies": { - "@types/estree": "1.0.5" + "@types/estree": "1.0.6" }, "bin": { "rollup": "dist/bin/rollup" @@ -15713,25 +16040,52 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.22.4", - "@rollup/rollup-android-arm64": "4.22.4", - "@rollup/rollup-darwin-arm64": "4.22.4", - "@rollup/rollup-darwin-x64": "4.22.4", - "@rollup/rollup-linux-arm-gnueabihf": "4.22.4", - "@rollup/rollup-linux-arm-musleabihf": "4.22.4", - "@rollup/rollup-linux-arm64-gnu": "4.22.4", - "@rollup/rollup-linux-arm64-musl": "4.22.4", - "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4", - "@rollup/rollup-linux-riscv64-gnu": "4.22.4", - "@rollup/rollup-linux-s390x-gnu": "4.22.4", - "@rollup/rollup-linux-x64-gnu": "4.22.4", - "@rollup/rollup-linux-x64-musl": "4.22.4", - "@rollup/rollup-win32-arm64-msvc": "4.22.4", - "@rollup/rollup-win32-ia32-msvc": "4.22.4", - "@rollup/rollup-win32-x64-msvc": "4.22.4", + "@rollup/rollup-android-arm-eabi": "4.34.8", + "@rollup/rollup-android-arm64": "4.34.8", + "@rollup/rollup-darwin-arm64": "4.34.8", + "@rollup/rollup-darwin-x64": "4.34.8", + "@rollup/rollup-freebsd-arm64": "4.34.8", + "@rollup/rollup-freebsd-x64": "4.34.8", + "@rollup/rollup-linux-arm-gnueabihf": "4.34.8", + "@rollup/rollup-linux-arm-musleabihf": "4.34.8", + "@rollup/rollup-linux-arm64-gnu": "4.34.8", + "@rollup/rollup-linux-arm64-musl": "4.34.8", + "@rollup/rollup-linux-loongarch64-gnu": "4.34.8", + "@rollup/rollup-linux-powerpc64le-gnu": "4.34.8", + "@rollup/rollup-linux-riscv64-gnu": "4.34.8", + "@rollup/rollup-linux-s390x-gnu": "4.34.8", + "@rollup/rollup-linux-x64-gnu": "4.34.8", + "@rollup/rollup-linux-x64-musl": "4.34.8", + "@rollup/rollup-win32-arm64-msvc": "4.34.8", + "@rollup/rollup-win32-ia32-msvc": "4.34.8", + "@rollup/rollup-win32-x64-msvc": "4.34.8", "fsevents": "~2.3.2" } }, + "node_modules/rollup/node_modules/@types/estree": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/router": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", + "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.4.0", + "depd": "^2.0.0", + "is-promise": "^4.0.0", + "parseurl": "^1.3.3", + "path-to-regexp": "^8.0.0" + }, + "engines": { + "node": ">= 18" + } + }, "node_modules/run-applescript": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz", @@ -15749,6 +16103,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, "funding": [ { "type": "github", @@ -15763,27 +16118,31 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } }, "node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "version": "7.8.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", + "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/safe-array-concat": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", - "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", + "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4", - "has-symbols": "^1.0.3", + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", "isarray": "^2.0.5" }, "engines": { @@ -15814,15 +16173,33 @@ ], "license": "MIT" }, - "node_modules/safe-regex-test": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", - "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.6", "es-errors": "^1.3.0", - "is-regex": "^1.1.4" + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-regex-test": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-regex": "^1.2.1" }, "engines": { "node": ">= 0.4" @@ -15839,14 +16216,14 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.77.6", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz", - "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==", + "version": "1.85.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.85.0.tgz", + "integrity": "sha512-3ToiC1xZ1Y8aU7+CkgCI/tqyuPXEmYGJXO7H4uqp0xkLXUqp88rQQ4j1HmP37xSJLbCJPaIiv+cT1y+grssrww==", "dev": true, "license": "MIT", "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", + "chokidar": "^4.0.0", + "immutable": "^5.0.2", "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { @@ -15854,12 +16231,15 @@ }, "engines": { "node": ">=14.0.0" + }, + "optionalDependencies": { + "@parcel/watcher": "^2.4.1" } }, "node_modules/sass-loader": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.0.tgz", - "integrity": "sha512-n13Z+3rU9A177dk4888czcVFiC8CL9dii4qpXWUg3YIIgZEvi9TCFKjOQcbK0kJM7DJu9VucrZFddvNfYCPwtw==", + "version": "16.0.5", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.5.tgz", + "integrity": "sha512-oL+CMBXrj6BZ/zOq4os+UECPL+bWqt6OAC6DWS8Ln8GZRcMDjlJ4JC3FBDuHJdYaFWIdKNIBYmtZtK2MaMkNIw==", "dev": true, "license": "MIT", "dependencies": { @@ -15906,9 +16286,9 @@ "optional": true }, "node_modules/schema-utils": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", - "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz", + "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==", "dev": true, "license": "MIT", "dependencies": { @@ -15918,7 +16298,7 @@ "ajv-keywords": "^5.1.0" }, "engines": { - "node": ">= 12.13.0" + "node": ">= 10.13.0" }, "funding": { "type": "opencollective", @@ -15965,9 +16345,10 @@ } }, "node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -15977,59 +16358,28 @@ } }, "node_modules/send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", + "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", "dev": true, + "license": "MIT", "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" + "debug": "^4.3.5", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "mime-types": "^3.0.1", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.1" }, "engines": { - "node": ">= 0.8.0" + "node": ">= 18" } }, - "node_modules/send/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/send/node_modules/debug/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/send/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/send/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - }, "node_modules/serialize-javascript": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", @@ -16059,6 +16409,20 @@ "node": ">= 0.8.0" } }, + "node_modules/serve-index/node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/serve-index/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -16102,6 +16466,29 @@ "dev": true, "license": "ISC" }, + "node_modules/serve-index/node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/serve-index/node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/serve-index/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -16109,6 +16496,16 @@ "dev": true, "license": "MIT" }, + "node_modules/serve-index/node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/serve-index/node_modules/setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", @@ -16127,24 +16524,26 @@ } }, "node_modules/serve-static": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", - "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", + "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", "dev": true, + "license": "MIT", "dependencies": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.19.0" + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" }, "engines": { - "node": ">= 0.8.0" + "node": ">= 18" } }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, "license": "MIT", "dependencies": { "define-data-property": "^1.1.4", @@ -16163,6 +16562,7 @@ "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", "dev": true, + "license": "MIT", "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -16173,11 +16573,27 @@ "node": ">= 0.4" } }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/shallow-clone": { "version": "3.0.1", @@ -16197,6 +16613,7 @@ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -16209,30 +16626,88 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/shell-quote": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", - "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz", + "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==", "dev": true, "license": "MIT", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -16242,34 +16717,48 @@ } }, "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } }, "node_modules/sigstore": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz", - "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-3.1.0.tgz", + "integrity": "sha512-ZpzWAFHIFqyFE56dXqgX/DkDRZdz+rRcjoIk/RQU4IX0wiCv1l8S7ZrXDHcCc+uaf+6o7w3h2l3g6GYG5TKN9Q==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@sigstore/bundle": "^2.3.2", - "@sigstore/core": "^1.0.0", - "@sigstore/protobuf-specs": "^0.3.2", - "@sigstore/sign": "^2.3.2", - "@sigstore/tuf": "^2.3.4", - "@sigstore/verify": "^1.2.1" + "@sigstore/bundle": "^3.1.0", + "@sigstore/core": "^2.0.0", + "@sigstore/protobuf-specs": "^0.4.0", + "@sigstore/sign": "^3.1.0", + "@sigstore/tuf": "^3.1.0", + "@sigstore/verify": "^2.1.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, - "node_modules/slashes": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz", - "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==", + "node_modules/slash": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", + "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", "dev": true, - "license": "ISC" + "license": "MIT", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/slice-ansi": { "version": "5.0.0", @@ -16301,19 +16790,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/smart-buffer": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", @@ -16348,9 +16824,9 @@ } }, "node_modules/socks": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", - "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz", + "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==", "dev": true, "license": "MIT", "dependencies": { @@ -16363,13 +16839,13 @@ } }, "node_modules/socks-proxy-agent": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", - "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", + "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", "dev": true, "license": "MIT", "dependencies": { - "agent-base": "^7.1.1", + "agent-base": "^7.1.2", "debug": "^4.3.4", "socks": "^2.8.3" }, @@ -16392,6 +16868,7 @@ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -16417,19 +16894,6 @@ "webpack": "^5.72.1" } }, - "node_modules/source-map-loader/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/source-map-support": { "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", @@ -16462,13 +16926,7 @@ "spdx-license-ids": "^3.0.0" } }, - "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "node_modules/spdx-expression-parse": { + "node_modules/spdx-correct/node_modules/spdx-expression-parse": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", @@ -16479,11 +16937,30 @@ "spdx-license-ids": "^3.0.0" } }, + "node_modules/spdx-exceptions": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "dev": true, + "license": "CC-BY-3.0" + }, + "node_modules/spdx-expression-parse": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz", + "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, "node_modules/spdx-license-ids": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", - "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", - "dev": true + "version": "3.0.21", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", + "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==", + "dev": true, + "license": "CC0-1.0" }, "node_modules/spdy": { "version": "4.0.2", @@ -16525,16 +17002,16 @@ "license": "BSD-3-Clause" }, "node_modules/ssri": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", - "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz", + "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==", "dev": true, "license": "ISC", "dependencies": { "minipass": "^7.0.3" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/statuses": { @@ -16542,27 +17019,26 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "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, + "license": "MIT", "dependencies": { - "safe-buffer": "~5.1.0" + "safe-buffer": "~5.2.0" } }, - "node_modules/string_decoder/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, "node_modules/string-to-color": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/string-to-color/-/string-to-color-2.2.2.tgz", "integrity": "sha512-XeA2goP7PNsSlz8RRn6KhYswnMf5Tl+38ajfy8n4oZJyMGC4qqKgHNHsZ/3qwvr42NRIjf9eSr721SyetDeMkA==", + "license": "MIT", "dependencies": { "colornames": "^1.1.1", "hex-rgb": "^4.1.0", @@ -16573,16 +17049,21 @@ } }, "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "dev": true, + "license": "MIT", "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=8" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/string-width-cjs": { @@ -16601,16 +17082,60 @@ "node": ">=8" } }, - "node_modules/string.prototype.trim": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", - "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", + "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-data-property": "^1.1.4", "define-properties": "^1.2.1", - "es-abstract": "^1.23.0", - "es-object-atoms": "^1.0.0" + "es-abstract": "^1.23.5", + "es-object-atoms": "^1.0.0", + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -16620,15 +17145,20 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", - "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", + "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", "define-properties": "^1.2.1", "es-object-atoms": "^1.0.0" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -16638,6 +17168,7 @@ "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -16651,14 +17182,19 @@ } }, "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", "dependencies": { - "ansi-regex": "^5.0.1" + "ansi-regex": "^6.0.1" }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/strip-ansi-cjs": { @@ -16685,30 +17221,14 @@ "node": ">=8" } }, - "node_modules/strip-ansi/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, "node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "engines": { - "node": ">=4" - } - }, - "node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", "dev": true, "license": "MIT", "engines": { - "node": ">=6" + "node": ">=4" } }, "node_modules/strip-json-comments": { @@ -16716,6 +17236,7 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -16724,15 +17245,22 @@ } }, "node_modules/strnum": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz", + "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], "license": "MIT" }, "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, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -16746,6 +17274,7 @@ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -16763,27 +17292,11 @@ "node": ">=0.10" } }, - "node_modules/synckit": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz", - "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@pkgr/core": "^0.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/unts" - } - }, "node_modules/taira": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/taira/-/taira-3.2.2.tgz", "integrity": "sha512-Uu06/5JrIRdokVSnbjCVwtmTXYMMNGwRYvWEYZhkB1WGcOinL5Ikr01X6MrUTqA/BU0dGWoIE1l5Ghr1Jq2QYA==", + "license": "MIT", "engines": { "node": ">=12.0.0" } @@ -16816,21 +17329,6 @@ "node": ">=10" } }, - "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/tar/node_modules/fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -16867,10 +17365,44 @@ "node": ">=8" } }, + "node_modules/tar/node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/tar/node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tar/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, "node_modules/terser": { - "version": "5.31.6", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz", - "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==", + "version": "5.39.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz", + "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -16887,17 +17419,17 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.10", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", - "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", + "version": "5.3.14", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz", + "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==", "dev": true, "license": "MIT", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.20", + "@jridgewell/trace-mapping": "^0.3.25", "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.26.0" + "schema-utils": "^4.3.0", + "serialize-javascript": "^6.0.2", + "terser": "^5.31.1" }, "engines": { "node": ">= 10.13.0" @@ -16921,59 +17453,6 @@ } } }, - "node_modules/terser-webpack-plugin/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, - "license": "MIT", - "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/terser-webpack-plugin/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/terser-webpack-plugin/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, - "license": "MIT" - }, - "node_modules/terser-webpack-plugin/node_modules/schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, "node_modules/thingies": { "version": "1.21.0", "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz", @@ -16994,28 +17473,41 @@ "dev": true, "license": "MIT" }, - "node_modules/tmp": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", - "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", - "engines": { - "node": ">=14.14" - } - }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "node_modules/tinyglobby": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", + "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", "dev": true, "license": "MIT", + "dependencies": { + "fdir": "^6.4.4", + "picomatch": "^4.0.2" + }, "engines": { - "node": ">=4" + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" } }, "node_modules/to-regex-range": { "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, "license": "MIT", "dependencies": { "is-number": "^7.0.0" @@ -17029,6 +17521,7 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.6" } @@ -17061,25 +17554,16 @@ } }, "node_modules/ts-api-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.0.tgz", - "integrity": "sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", + "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", "dev": true, + "license": "MIT", "engines": { - "node": ">=16" + "node": ">=18.12" }, "peerDependencies": { - "typescript": ">=4.2.0" - } - }, - "node_modules/ts-morph": { - "version": "22.0.0", - "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-22.0.0.tgz", - "integrity": "sha512-M9MqFGZREyeb5fTl6gNHKZLqBQA0TjA1lea+CR48R8EBTDuWrNqW6ccC5QvjNR4s6wDumD3LTCjOFSp9iwlzaw==", - "license": "MIT", - "dependencies": { - "@ts-morph/common": "~0.23.0", - "code-block-writer": "^13.0.1" + "typescript": ">=4.8.4" } }, "node_modules/tsconfig-paths": { @@ -17087,6 +17571,7 @@ "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", "dev": true, + "license": "MIT", "dependencies": { "@types/json5": "^0.0.29", "json5": "^1.0.2", @@ -17099,6 +17584,7 @@ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, + "license": "MIT", "dependencies": { "minimist": "^1.2.0" }, @@ -17109,21 +17595,22 @@ "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" }, "node_modules/tuf-js": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz", - "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-3.0.1.tgz", + "integrity": "sha512-+68OP1ZzSF84rTckf3FA95vJ1Zlx/uaXyiiKyPd1pA4rZNkpEvDAKmsu1xUSmbF/chCRYgZ6UZkDwC7PmzmAyA==", "dev": true, "license": "MIT", "dependencies": { - "@tufjs/models": "2.0.1", - "debug": "^4.3.4", - "make-fetch-happen": "^13.0.1" + "@tufjs/models": "3.0.1", + "debug": "^4.3.6", + "make-fetch-happen": "^14.0.1" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/type-check": { @@ -17131,6 +17618,7 @@ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" }, @@ -17152,43 +17640,47 @@ } }, "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", + "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", "dev": true, + "license": "MIT", "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" + "content-type": "^1.0.5", + "media-typer": "^1.1.0", + "mime-types": "^3.0.0" }, "engines": { "node": ">= 0.6" } }, "node_modules/typed-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", - "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "is-typed-array": "^1.1.13" + "is-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" } }, "node_modules/typed-array-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", - "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -17198,17 +17690,19 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", - "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", "dev": true, + "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" }, "engines": { "node": ">= 0.4" @@ -17218,17 +17712,18 @@ } }, "node_modules/typed-array-length": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", - "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-proto": "^1.0.3", "is-typed-array": "^1.1.13", - "possible-typed-array-names": "^1.0.0" + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" }, "engines": { "node": ">= 0.4" @@ -17245,9 +17740,9 @@ "license": "MIT" }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", + "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -17259,15 +17754,15 @@ } }, "node_modules/typescript-eslint": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.18.0.tgz", - "integrity": "sha512-Xq2rRjn6tzVpAyHr3+nmSg1/9k9aIHnJ2iZeOH7cfGOWqTkXTm3kwpQglEuLGdNrYvPF+2gtAs+/KF5rjVo+WQ==", + "version": "8.32.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.32.1.tgz", + "integrity": "sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.18.0", - "@typescript-eslint/parser": "8.18.0", - "@typescript-eslint/utils": "8.18.0" + "@typescript-eslint/eslint-plugin": "8.32.1", + "@typescript-eslint/parser": "8.32.1", + "@typescript-eslint/utils": "8.32.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -17278,35 +17773,39 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", + "call-bound": "^1.0.3", "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/undici-types": { - "version": "6.19.8", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", - "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "dev": true, "license": "MIT" }, "node_modules/unicode-canonical-property-names-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", - "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz", + "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==", "dev": true, "license": "MIT", "engines": { @@ -17328,9 +17827,9 @@ } }, "node_modules/unicode-match-property-value-ecmascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", - "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz", + "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==", "dev": true, "license": "MIT", "engines": { @@ -17348,9 +17847,9 @@ } }, "node_modules/unicorn-magic": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", - "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz", + "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==", "dev": true, "license": "MIT", "engines": { @@ -17361,29 +17860,29 @@ } }, "node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz", + "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==", "dev": true, "license": "ISC", "dependencies": { - "unique-slug": "^4.0.0" + "unique-slug": "^5.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz", + "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==", "dev": true, "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/unpipe": { @@ -17391,14 +17890,15 @@ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/update-browserslist-db": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", - "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", + "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", "dev": true, "funding": [ { @@ -17416,8 +17916,8 @@ ], "license": "MIT", "dependencies": { - "escalade": "^3.1.2", - "picocolors": "^1.0.1" + "escalade": "^3.2.0", + "picocolors": "^1.1.1" }, "bin": { "update-browserslist-db": "cli.js" @@ -17431,10 +17931,21 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } }, + "node_modules/uri-js/node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/url": { "version": "0.11.4", "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz", @@ -17448,15 +17959,12 @@ "node": ">= 0.4" } }, - "node_modules/url/node_modules/punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true, + "license": "MIT" }, "node_modules/utils-merge": { "version": "1.0.1", @@ -17469,13 +17977,14 @@ } }, "node_modules/uuid": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz", - "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz", + "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], + "license": "MIT", "bin": { "uuid": "dist/esm/bin/uuid" } @@ -17491,14 +18000,25 @@ "spdx-expression-parse": "^3.0.0" } }, + "node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, "node_modules/validate-npm-package-name": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", - "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.0.tgz", + "integrity": "sha512-d7KLgL1LD3U3fgnvWEY1cQXoO/q6EQ1BSz48Sa149V/5zVTAbgmZIpyI8TRi6U9/JNyeYLlTKsEMPtLC27RFUg==", "dev": true, "license": "ISC", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/vary": { @@ -17512,21 +18032,21 @@ } }, "node_modules/vite": { - "version": "5.4.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz", - "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==", + "version": "6.2.7", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.7.tgz", + "integrity": "sha512-qg3LkeuinTrZoJHHF94coSaTfIPyBYoywp+ys4qu20oSJFbKMYoIJo0FWJT9q6Vp49l6z9IsJRbHdcGtiKbGoQ==", "dev": true, "license": "MIT", "dependencies": { - "esbuild": "^0.21.3", - "postcss": "^8.4.43", - "rollup": "^4.20.0" + "esbuild": "^0.25.0", + "postcss": "^8.5.3", + "rollup": "^4.30.1" }, "bin": { "vite": "bin/vite.js" }, "engines": { - "node": "^18.0.0 || >=20.0.0" + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" }, "funding": { "url": "https://github.com/vitejs/vite?sponsor=1" @@ -17535,19 +18055,25 @@ "fsevents": "~2.3.3" }, "peerDependencies": { - "@types/node": "^18.0.0 || >=20.0.0", + "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", + "jiti": ">=1.21.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", - "terser": "^5.4.0" + "terser": "^5.16.0", + "tsx": "^4.8.1", + "yaml": "^2.4.2" }, "peerDependenciesMeta": { "@types/node": { "optional": true }, + "jiti": { + "optional": true + }, "less": { "optional": true }, @@ -17568,443 +18094,19 @@ }, "terser": { "optional": true + }, + "tsx": { + "optional": true + }, + "yaml": { + "optional": true } } }, - "node_modules/vite/node_modules/@esbuild/aix-ppc64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", - "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/android-arm": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", - "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/android-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", - "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/android-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", - "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/darwin-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", - "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/darwin-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", - "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/freebsd-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", - "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/freebsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", - "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-arm": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", - "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", - "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-ia32": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", - "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-loong64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", - "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-mips64el": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", - "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", - "cpu": [ - "mips64el" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-ppc64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", - "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-riscv64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", - "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-s390x": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", - "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", - "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/netbsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", - "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/openbsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", - "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/sunos-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", - "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/win32-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", - "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/win32-ia32": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", - "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/win32-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", - "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/esbuild": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", - "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.21.5", - "@esbuild/android-arm": "0.21.5", - "@esbuild/android-arm64": "0.21.5", - "@esbuild/android-x64": "0.21.5", - "@esbuild/darwin-arm64": "0.21.5", - "@esbuild/darwin-x64": "0.21.5", - "@esbuild/freebsd-arm64": "0.21.5", - "@esbuild/freebsd-x64": "0.21.5", - "@esbuild/linux-arm": "0.21.5", - "@esbuild/linux-arm64": "0.21.5", - "@esbuild/linux-ia32": "0.21.5", - "@esbuild/linux-loong64": "0.21.5", - "@esbuild/linux-mips64el": "0.21.5", - "@esbuild/linux-ppc64": "0.21.5", - "@esbuild/linux-riscv64": "0.21.5", - "@esbuild/linux-s390x": "0.21.5", - "@esbuild/linux-x64": "0.21.5", - "@esbuild/netbsd-x64": "0.21.5", - "@esbuild/openbsd-x64": "0.21.5", - "@esbuild/sunos-x64": "0.21.5", - "@esbuild/win32-arm64": "0.21.5", - "@esbuild/win32-ia32": "0.21.5", - "@esbuild/win32-x64": "0.21.5" - } - }, "node_modules/vite/node_modules/postcss": { - "version": "8.4.49", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz", - "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==", + "version": "8.5.3", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", + "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==", "dev": true, "funding": [ { @@ -18022,7 +18124,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.7", + "nanoid": "^3.3.8", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -18031,9 +18133,9 @@ } }, "node_modules/watchpack": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz", - "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", "dev": true, "license": "MIT", "dependencies": { @@ -18057,7 +18159,9 @@ "node_modules/wcwidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "dev": true, + "license": "MIT", "dependencies": { "defaults": "^1.0.3" } @@ -18067,22 +18171,23 @@ "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz", "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==", "dev": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/webpack": { - "version": "5.94.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", - "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", + "version": "5.98.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz", + "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==", "dev": true, "license": "MIT", "dependencies": { - "@types/estree": "^1.0.5", - "@webassemblyjs/ast": "^1.12.1", - "@webassemblyjs/wasm-edit": "^1.12.1", - "@webassemblyjs/wasm-parser": "^1.12.1", - "acorn": "^8.7.1", - "acorn-import-attributes": "^1.9.5", - "browserslist": "^4.21.10", + "@types/eslint-scope": "^3.7.7", + "@types/estree": "^1.0.6", + "@webassemblyjs/ast": "^1.14.1", + "@webassemblyjs/wasm-edit": "^1.14.1", + "@webassemblyjs/wasm-parser": "^1.14.1", + "acorn": "^8.14.0", + "browserslist": "^4.24.0", "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", @@ -18094,9 +18199,9 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.2.0", + "schema-utils": "^4.3.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.10", + "terser-webpack-plugin": "^5.3.11", "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, @@ -18121,6 +18226,7 @@ "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.2.tgz", "integrity": "sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA==", "dev": true, + "license": "MIT", "dependencies": { "colorette": "^2.0.10", "memfs": "^4.6.0", @@ -18145,10 +18251,33 @@ } } }, + "node_modules/webpack-dev-middleware/node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/webpack-dev-middleware/node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/webpack-dev-server": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz", - "integrity": "sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.0.tgz", + "integrity": "sha512-90SqqYXA2SK36KcT6o1bvwvZfJFcmoamqeJY7+boioffX9g9C0wjjJRGUrQIuh43pb0ttX7+ssavmj/WN2RHtA==", "dev": true, "license": "MIT", "dependencies": { @@ -18165,23 +18294,20 @@ "colorette": "^2.0.10", "compression": "^1.7.4", "connect-history-api-fallback": "^2.0.0", - "default-gateway": "^6.0.3", - "express": "^4.17.3", + "express": "^4.21.2", "graceful-fs": "^4.2.6", - "html-entities": "^2.4.0", - "http-proxy-middleware": "^2.0.3", + "http-proxy-middleware": "^2.0.7", "ipaddr.js": "^2.1.0", "launch-editor": "^2.6.1", "open": "^10.0.3", "p-retry": "^6.2.0", - "rimraf": "^5.0.5", "schema-utils": "^4.2.0", "selfsigned": "^2.4.1", "serve-index": "^1.9.1", "sockjs": "^0.3.24", "spdy": "^4.0.2", - "webpack-dev-middleware": "^7.1.0", - "ws": "^8.16.0" + "webpack-dev-middleware": "^7.4.2", + "ws": "^8.18.0" }, "bin": { "webpack-dev-server": "bin/webpack-dev-server.js" @@ -18205,24 +18331,212 @@ } } }, - "node_modules/webpack-dev-server/node_modules/define-lazy-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", - "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "node_modules/webpack-dev-server/node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/webpack-dev-server/node_modules/body-parser": { + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "dev": true, + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.13.0", + "raw-body": "2.5.2", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/webpack-dev-server/node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/webpack-dev-server/node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/webpack-dev-server/node_modules/cookie": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "dev": true, "license": "MIT", "engines": { - "node": ">=12" + "node": ">= 0.6" + } + }, + "node_modules/webpack-dev-server/node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/webpack-dev-server/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/webpack-dev-server/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "license": "MIT" + }, + "node_modules/webpack-dev-server/node_modules/express": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.3", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.7.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.3.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.3", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.12", + "proxy-addr": "~2.0.7", + "qs": "6.13.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.19.0", + "serve-static": "1.16.2", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/webpack-dev-server/node_modules/finalhandler": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/webpack-dev-server/node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/webpack-dev-server/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" } }, "node_modules/webpack-dev-server/node_modules/http-proxy-middleware": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", - "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz", + "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==", "dev": true, + "license": "MIT", "dependencies": { "@types/http-proxy": "^1.17.8", "http-proxy": "^1.18.1", @@ -18242,39 +18556,210 @@ } } }, - "node_modules/webpack-dev-server/node_modules/is-wsl": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz", - "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==", + "node_modules/webpack-dev-server/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "license": "MIT", "dependencies": { - "is-inside-container": "^1.0.0" + "safer-buffer": ">= 2.1.2 < 3" }, "engines": { - "node": ">=16" - }, + "node": ">=0.10.0" + } + }, + "node_modules/webpack-dev-server/node_modules/ipaddr.js": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz", + "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/webpack-dev-server/node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/webpack-dev-server/node_modules/merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/webpack-dev-server/node_modules/open": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz", - "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==", + "node_modules/webpack-dev-server/node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/webpack-dev-server/node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "dev": true, "license": "MIT", "dependencies": { - "default-browser": "^5.2.1", - "define-lazy-prop": "^3.0.0", - "is-inside-container": "^1.0.0", - "is-wsl": "^3.1.0" + "mime-db": "1.52.0" }, "engines": { - "node": ">=18" + "node": ">= 0.6" + } + }, + "node_modules/webpack-dev-server/node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/webpack-dev-server/node_modules/path-to-regexp": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/webpack-dev-server/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/webpack-dev-server/node_modules/qs": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/webpack-dev-server/node_modules/raw-body": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "dev": true, + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/webpack-dev-server/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/webpack-dev-server/node_modules/send": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/webpack-dev-server/node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/webpack-dev-server/node_modules/serve-static": { + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "dev": true, + "license": "MIT", + "dependencies": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.19.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/webpack-dev-server/node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" } }, "node_modules/webpack-merge": { @@ -18324,33 +18809,6 @@ } } }, - "node_modules/webpack/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, - "license": "MIT", - "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/webpack/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^6.9.1" - } - }, "node_modules/webpack/node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -18382,30 +18840,27 @@ "dev": true, "license": "MIT" }, - "node_modules/webpack/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==", + "node_modules/webpack/node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">= 0.6" + } }, - "node_modules/webpack/node_modules/schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "node_modules/webpack/node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "dev": true, "license": "MIT", "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" + "mime-db": "1.52.0" }, "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "node": ">= 0.6" } }, "node_modules/websocket-driver": { @@ -18438,6 +18893,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -18449,31 +18905,85 @@ } }, "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", "dev": true, + "license": "MIT", "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", + "is-async-function": "^2.0.0", + "is-date-object": "^1.1.0", + "is-finalizationregistry": "^1.1.0", + "is-generator-function": "^1.0.10", + "is-regex": "^1.2.1", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.1.0", + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/which-typed-array": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", - "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", "dev": true, + "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", "has-tostringtag": "^1.0.2" }, "engines": { @@ -18490,20 +19000,29 @@ "dev": true, "license": "MIT" }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "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", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "node": ">=8" } }, "node_modules/wrap-ansi-cjs": { @@ -18525,15 +19044,127 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi-cjs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" }, "node_modules/ws": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", - "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", + "version": "8.18.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz", + "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==", "dev": true, "license": "MIT", "engines": { @@ -18556,6 +19187,7 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz", "integrity": "sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw==", + "license": "MIT", "engines": { "node": ">= 6" } @@ -18564,14 +19196,16 @@ "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", "engines": { "node": ">=10" } }, "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true, "license": "ISC" }, @@ -18579,6 +19213,8 @@ "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -18596,15 +19232,73 @@ "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "license": "ISC", "engines": { "node": ">=12" } }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/yargs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -18625,6 +19319,26 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/zod": { + "version": "3.24.4", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz", + "integrity": "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/colinhacks" + } + }, + "node_modules/zod-to-json-schema": { + "version": "3.24.5", + "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.5.tgz", + "integrity": "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==", + "dev": true, + "license": "ISC", + "peerDependencies": { + "zod": "^3.24.1" + } + }, "node_modules/zone.js": { "version": "0.15.0", "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.0.tgz", diff --git a/package.json b/package.json index ac076e36..a118a9c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "clearml-webapp", - "version": "2.0.0", + "version": "2.1.0", "license": "", "scripts": { "ng": "ng", @@ -19,46 +19,49 @@ }, "private": true, "dependencies": { - "@angular/animations": "^18.2.12", - "@angular/cdk": "^18.2.14", - "@angular/common": "^18.2.12", - "@angular/compiler": "^18.2.12", - "@angular/core": "^18.2.12", - "@angular/forms": "^18.2.12", - "@angular/material": "^18.2.14", - "@angular/platform-browser": "^18.2.12", - "@angular/platform-browser-dynamic": "^18.2.12", - "@angular/platform-server": "^18.2.12", - "@angular/router": "^18.2.12", - "@angular/service-worker": "^18.2.12", - "@angular/youtube-player": "^18.2.14", - "@aws-sdk/client-s3": "^3.693.0", - "@aws-sdk/s3-request-presigner": "^3.693.0", + "@angular/animations": "19.1.5", + "@angular/cdk": "19.1.3", + "@angular/common": "19.1.5", + "@angular/compiler": "19.1.5", + "@angular/core": "19.1.5", + "@angular/forms": "19.1.5", + "@angular/material": "19.1.3", + "@angular/platform-browser": "19.1.5", + "@angular/platform-browser-dynamic": "19.1.5", + "@angular/platform-server": "19.1.5", + "@angular/router": "19.1.5", + "@angular/service-worker": "19.1.5", + "@angular/youtube-player": "19.1.3", + "@aws-sdk/client-s3": "^3.782.0", + "@aws-sdk/s3-request-presigner": "^3.782.0", "@ctrl/ngx-github-buttons": "^9.0.0", "@ctrl/tinycolor": "^4.1.0", "@ngneat/dag": "^2.0.0", - "@ngrx/component": "^18.1.1", - "@ngrx/effects": "^18.1.1", - "@ngrx/entity": "^18.1.1", - "@ngrx/operators": "^18.1.1", - "@ngrx/router-store": "^18.1.1", - "@ngrx/store": "^18.1.1", - "@typescript-eslint/types": "^8.15.0", - "ace-builds": "^1.36.5", + "@ngrx/component": "19.1.0", + "@ngrx/effects": "19.1.0", + "@ngrx/entity": "19.1.0", + "@ngrx/operators": "19.1.0", + "@ngrx/router-store": "19.1.0", + "@ngrx/signals": "19.1.0", + "@ngrx/store": "19.1.0", + "@primeng/themes": "^19.0.10", + "@typescript-eslint/types": "^8.29.1", + "ace-builds": "^1.39.1", "angular-resizable-element": "^7.0.2", - "angular-split": "^18.0.0", + "angular-split": "^19.0.0", "ansi-to-html": "^0.7.2", - "bootstrap": "^5.3.3", - "chart.js": "^4.4.6", + "bootstrap": "^5.3.5", + "chart.js": "^4.4.8", "chartjs-adapter-date-fns": "^3.0.0", "chartjs-plugin-annotation": "^3.1.0", - "chartjs-plugin-zoom": "^2.1.0", + "chartjs-plugin-zoom": "^2.2.0", "curved-arrows": "^0.3.0", + "d3-interpolate": "^3.0.1", "d3-selection": "^3.0.0", "date-fns": "^4.1.0", "diff": "^7.0.0", "dom-to-image": "^2.6.0", - "dompurify": "^3.2.0", + "dompurify": "^3.2.5", "export-to-csv": "^1.4.0", "filesize": "^10.1.6", "has-ansi": "^6.0.0", @@ -66,54 +69,54 @@ "lodash-es": "^4.17.21", "lucene": "^2.1.1", "marked": "^12.0.2", - "ng2-charts": "^6.0.1", + "ng2-charts": "^8.0.0", "ngx-clipboard": "^16.0.0", - "ngx-color-picker": "^17.0.0", - "ngx-device-detector": "^8.0.0", + "ngx-color-picker": "^19.0.0", + "ngx-device-detector": "^9.0.0", "ngx-markdown-editor": "^5.3.4", - "ngx-print": "^1.5.1", + "ngx-print": "^2.0.0", "ngx-window-token": "^7.0.0", - "ngxtension": "^4.1.0", + "ngxtension": "^5.0.0", "object-hash": "^3.0.0", "primeicons": "^7.0.0", - "primeng": "^17.18.15", - "rxjs": "^7.8.1", + "primeng": "^19.0.10", + "rxjs": "^7.8.2", "string-to-color": "^2.2.2", "taira": "^3.2.2", "tslib": "^2.8.1", "url": "^0.11.4", - "uuid": "^11.0.3", + "uuid": "^11.1.0", "zone.js": "~0.15.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^18.2.12", - "@angular-devkit/core": "^18.2.12", - "@angular-devkit/schematics": "^18.2.12", - "@angular-devkit/schematics-cli": "^18.2.12", - "@angular/cli": "^18.2.12", - "@angular/compiler-cli": "^18.2.12", - "@angular/language-service": "^18.2.12", - "@ngrx/eslint-plugin": "^18.1.1", - "@ngrx/schematics": "^18.1.1", - "@ngrx/store-devtools": "^18.1.1", + "@angular-devkit/build-angular": "^19.2.12", + "@angular-devkit/core": "19.1.6", + "@angular-devkit/schematics": "19.1.6", + "@angular-devkit/schematics-cli": "19.1.6", + "@angular/cli": "19.1.6", + "@angular/compiler-cli": "19.1.5", + "@angular/language-service": "19.1.5", + "@ngrx/eslint-plugin": "19.1.0", + "@ngrx/schematics": "19.1.0", + "@ngrx/store-devtools": "19.1.0", + "@types/d3-interpolate": "^3.0.4", "@types/d3-selection": "^3.0.11", - "@types/diff": "^6.0.0", + "@types/diff": "^7.0.2", "@types/dom-to-image": "^2.6.7", - "@types/dompurify": "^3.0.5", "@types/has-ansi": "^5.0.2", - "@types/jasmine": "^5.1.4", + "@types/jasmine": "^5.1.7", "@types/lodash-es": "^4.17.12", - "@types/node": "^22.9.0", - "@types/plotly.js": "^2.35.0", + "@types/node": "^22.14.0", + "@types/plotly.js": "^2.35.4", "@types/tinycolor2": "^1.4.6", "@types/uuid": "^10.0.0", - "angular-eslint": "^18.4.1", - "eslint": "^9.15.0", + "angular-eslint": "^19.3.0", + "eslint": "^9.24.0", "eslint-plugin-import": "2.31.0", - "eslint-plugin-jsdoc": "^50.5.0", + "eslint-plugin-jsdoc": "^50.6.9", "eslint-plugin-prefer-arrow": "1.2.3", "primeng-sass-theme": "github:primefaces/primeng-sass-theme", - "typescript": "^5.5.4", - "typescript-eslint": "^8.15.0" + "typescript": "^5.7.3", + "typescript-eslint": "^8.29.1" } } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index dea52d1a..9a610358 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -25,12 +25,13 @@ import {ThemeService} from '@common/shared/services/theme.service'; import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; @Component({ - selector: 'sm-root', - templateUrl: 'app.component.html', - styleUrls: ['app.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - encapsulation: ViewEncapsulation.None, - providers: [ThemeService] + selector: 'sm-root', + templateUrl: 'app.component.html', + styleUrls: ['app.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + encapsulation: ViewEncapsulation.None, + providers: [ThemeService], + standalone: false }) export class AppComponent { private router = inject(Router); diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 24dc8c5e..ff00756f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,4 +1,4 @@ -import {APP_INITIALIZER, inject, NgModule} from '@angular/core'; +import {APP_INITIALIZER, inject, NgModule, provideAppInitializer} from '@angular/core'; import {BrowserModule} from '@angular/platform-browser'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {PreloadAllModules, RouteReuseStrategy, RouterModule} from '@angular/router'; @@ -17,10 +17,8 @@ import {NotifierModule} from '@common/angular-notifier'; import {LayoutModule} from './layout/layout.module'; import {ColorHashService} from '@common/shared/services/color-hash/color-hash.service'; import {SharedModule} from './shared/shared.module'; -import {ConfigurationService} from '@common/shared/services/configuration.service'; import {ProjectsSharedModule} from './features/projects/shared/projects-shared.module'; import {MAT_FORM_FIELD_DEFAULT_OPTIONS} from '@angular/material/form-field'; -import {LoginService} from '~/shared/services/login.service'; import {ExperimentSharedModule} from '~/features/experiments/shared/experiment-shared.module'; import {loadUserAndPreferences} from '~/core/app-init'; import {MAT_TOOLTIP_DEFAULT_OPTIONS, MatTooltipDefaultOptions} from '@angular/material/tooltip'; @@ -30,6 +28,8 @@ import {SpinnerComponent} from '@common/shared/ui-components/overlay/spinner/spi import {MatIconRegistry} from '@angular/material/icon'; import {provideCharts, withDefaultRegisterables} from 'ng2-charts'; import {PushPipe} from '@ngrx/component'; +import { providePrimeNG } from 'primeng/config'; +import {cmlPreset} from '@common/styles/prime.preset'; @NgModule({ declarations : [AppComponent], @@ -68,13 +68,8 @@ import {PushPipe} from '@ngrx/component'; ], providers: [ UserPreferences, - {provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: {floatLabel: 'always'}}, - { - provide : APP_INITIALIZER, - deps: [LoginService, ConfigurationService], - useFactory: loadUserAndPreferences, - multi : true, - }, + {provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: {floatLabel: 'always', appearance: 'outline'}}, + provideAppInitializer(() => loadUserAndPreferences()), ColorHashService, {provide: HTTP_INTERCEPTORS, useClass: WebappInterceptor, multi: true}, {provide: RouteReuseStrategy, useClass: CustomReuseStrategy}, @@ -83,6 +78,11 @@ import {PushPipe} from '@ngrx/component'; useValue: {position: 'above'} as MatTooltipDefaultOptions }, provideCharts(withDefaultRegisterables()), + providePrimeNG({ + theme: { + preset: cmlPreset + } + }) ], bootstrap : [AppComponent], exports : [] diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 6497fbd6..a7659589 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -34,6 +34,7 @@ export const routes: Routes = [ {path: '', pathMatch: 'full', children: [], canActivate: [projectRedirectGuardGuard]}, { path: 'overview', + data: {search: false}, loadChildren: () => import('./webapp-common/project-info/project-info.module').then(m => m.ProjectInfoModule), canDeactivate: [resetContextMenuGuard] }, @@ -52,7 +53,7 @@ export const routes: Routes = [ {path: 'compare-experiments', redirectTo: 'compare-tasks'}, { path: 'compare-tasks', - data: {entityType: EntityTypeEnum.experiment}, + data: {entityType: EntityTypeEnum.experiment, search: false}, loadChildren: () => import('./webapp-common/experiments-compare/experiments-compare.module').then(m => m.ExperimentsCompareModule) }, diff --git a/src/app/core/app-init.ts b/src/app/core/app-init.ts index 6a5e7052..1799224f 100644 --- a/src/app/core/app-init.ts +++ b/src/app/core/app-init.ts @@ -1,14 +1,14 @@ import {LoginService} from '~/shared/services/login.service'; import {ConfigurationService} from '@common/shared/services/configuration.service'; -import {combineLatest} from 'rxjs'; +import {switchMap} from 'rxjs'; +import {inject} from '@angular/core'; -export const loadUserAndPreferences = ( - loginService: LoginService, - confService: ConfigurationService, -): () => Promise => (): Promise => new Promise((resolve) => { - combineLatest([ - confService.initConfigurationService(), - loginService.initCredentials() - ]) - .subscribe(() => loginService.loginFlow(resolve)); -}); +export const loadUserAndPreferences = ()=> + new Promise((resolve) => { + const loginService = inject(LoginService); + const confService = inject(ConfigurationService); + + confService.initConfigurationService() + .pipe(switchMap(() => loginService.initCredentials())) + .subscribe(() => loginService.loginFlow(resolve)); + }); diff --git a/src/app/core/reducers/auth.reducers.ts b/src/app/core/reducers/auth.reducers.ts index 22386a29..4a634a8c 100644 --- a/src/app/core/reducers/auth.reducers.ts +++ b/src/app/core/reducers/auth.reducers.ts @@ -2,9 +2,11 @@ import {commonAuthReducer, initAuth, selectAuth} from '@common/core/reducers/com import {createReducer, createSelector} from '@ngrx/store'; const extraCredentials = []; +const services = []; // eslint-disable-next-line @typescript-eslint/no-unused-vars export const selectExtraCredentials = createSelector(selectAuth, state => extraCredentials); +export const selectCompanyPreSignServices = createSelector(selectAuth, state => services); export const authReducer = createReducer( initAuth, diff --git a/src/app/features/dashboard-search/containers/dashboard-search/dashboard-search.component.ts b/src/app/features/dashboard-search/containers/dashboard-search/dashboard-search.component.ts index 9f93b608..a1652b31 100644 --- a/src/app/features/dashboard-search/containers/dashboard-search/dashboard-search.component.ts +++ b/src/app/features/dashboard-search/containers/dashboard-search/dashboard-search.component.ts @@ -1,24 +1,12 @@ import {Component} from '@angular/core'; import {DashboardSearchBaseComponent} from '@common/dashboard/dashboard-search.component.base'; -import {selectIsSearching} from '@common/common-search/common-search.reducer'; -import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; -import {debounceTime, filter} from 'rxjs/operators'; @Component({ - selector: 'sm-dashboard-search', - templateUrl: './dashboard-search.component.html', - styleUrls: ['./dashboard-search.component.scss'], + selector: 'sm-dashboard-search', + templateUrl: './dashboard-search.component.html', + styleUrls: ['./dashboard-search.component.scss'], + standalone: false }) export class DashboardSearchComponent extends DashboardSearchBaseComponent { - constructor() { - super(); - this.store.select(selectIsSearching) - .pipe( - debounceTime(200), - takeUntilDestroyed(), - filter(active => !active) - ) - .subscribe(() => this.router.navigate(['dashboard'], )); - } } diff --git a/src/app/features/dashboard-search/containers/search-results-page/search-results-page.component.html b/src/app/features/dashboard-search/containers/search-results-page/search-results-page.component.html index aa1162db..7db3d1e8 100644 --- a/src/app/features/dashboard-search/containers/search-results-page/search-results-page.component.html +++ b/src/app/features/dashboard-search/containers/search-results-page/search-results-page.component.html @@ -1,4 +1,4 @@ -
+
+ @if (getResults()?.length === 0) { + No data to show + } @else if(getResults()){ + }
diff --git a/src/app/features/dashboard-search/containers/search-results-page/search-results-page.component.scss b/src/app/features/dashboard-search/containers/search-results-page/search-results-page.component.scss index 98a9424b..79d8ce04 100644 --- a/src/app/features/dashboard-search/containers/search-results-page/search-results-page.component.scss +++ b/src/app/features/dashboard-search/containers/search-results-page/search-results-page.component.scss @@ -1,8 +1,22 @@ .mat-mdc-tab-group { --mat-tab-header-label-text-size: 14px; + border-bottom: 1px solid var(--color-outline-variant); + margin: 24px 0; + height: 49px; + } .page-container { - height: calc(100% - 67px); + height: calc(90vh - 224px); + width: calc(90vw - 96px); margin-top: 18px; + + .no-data { + display: flex; + height: 100%; + flex-direction: column; + align-items: center; + justify-content: center; + color: var(--color-outline); + } } diff --git a/src/app/features/dashboard-search/containers/search-results-page/search-results-page.component.ts b/src/app/features/dashboard-search/containers/search-results-page/search-results-page.component.ts index df9711f4..7e3917b6 100644 --- a/src/app/features/dashboard-search/containers/search-results-page/search-results-page.component.ts +++ b/src/app/features/dashboard-search/containers/search-results-page/search-results-page.component.ts @@ -7,9 +7,10 @@ import {activeLinksList, ActiveSearchLink, activeSearchLink} from '~/features/da import {IReport} from '@common/reports/reports.consts'; @Component({ - selector: 'sm-search-results-page', - templateUrl: './search-results-page.component.html', - styleUrls: ['./search-results-page.component.scss'] + selector: 'sm-search-results-page', + templateUrl: './search-results-page.component.html', + styleUrls: ['./search-results-page.component.scss'], + standalone: false }) export class SearchResultsPageComponent { protected readonly searchPages = activeSearchLink; @@ -71,6 +72,8 @@ export class SearchResultsPageComponent { case activeSearchLink.models: return 264; case activeSearchLink.pipelines: + case activeSearchLink.reports: + case activeSearchLink.openDatasets: return 226; default: return 250; diff --git a/src/app/features/dashboard-search/dashboard-search.module.ts b/src/app/features/dashboard-search/dashboard-search.module.ts index 04486c34..6b377c06 100644 --- a/src/app/features/dashboard-search/dashboard-search.module.ts +++ b/src/app/features/dashboard-search/dashboard-search.module.ts @@ -35,7 +35,10 @@ import {MatTab, MatTabGroup} from '@angular/material/tabs'; MatTabGroup, MatTab, ], - declarations:[ + exports: [ + DashboardSearchComponent + ], + declarations: [ SearchResultsPageComponent, DashboardSearchComponent ] }) diff --git a/src/app/features/dashboard/dashboard.component.ts b/src/app/features/dashboard/dashboard.component.ts index 398a1f5f..102a971b 100644 --- a/src/app/features/dashboard/dashboard.component.ts +++ b/src/app/features/dashboard/dashboard.component.ts @@ -17,9 +17,10 @@ import {selectActiveSearch} from '@common/common-search/common-search.reducer'; @Component({ - selector: 'sm-dashboard', - templateUrl: './dashboard.component.html', - styleUrls: ['./dashboard.component.scss'] + selector: 'sm-dashboard', + templateUrl: './dashboard.component.html', + styleUrls: ['./dashboard.component.scss'], + standalone: false }) export class DashboardComponent implements OnInit, OnDestroy { private store = inject(Store); diff --git a/src/app/features/datasets/nested-datasets-page/nested-datasets-page.component.ts b/src/app/features/datasets/nested-datasets-page/nested-datasets-page.component.ts index 52a08023..d39817c3 100644 --- a/src/app/features/datasets/nested-datasets-page/nested-datasets-page.component.ts +++ b/src/app/features/datasets/nested-datasets-page/nested-datasets-page.component.ts @@ -12,22 +12,21 @@ import {MatIcon} from '@angular/material/icon'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; @Component({ - selector: 'sm-nested-datasets-page', - templateUrl: './nested-datasets-page.component.html', - styleUrls: [ - '../../../webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.scss', - '../../../webapp-common/datasets/open-datasets/open-datasets.component.scss' - ], - imports: [ - ProjectsSharedModule, - AsyncPipe, - CircleCounterComponent, - TagListComponent, - MatButton, - MatIcon, - ClickStopPropagationDirective -], - standalone: true + selector: 'sm-nested-datasets-page', + templateUrl: './nested-datasets-page.component.html', + styleUrls: [ + '../../../webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.scss', + '../../../webapp-common/datasets/open-datasets/open-datasets.component.scss' + ], + imports: [ + ProjectsSharedModule, + AsyncPipe, + CircleCounterComponent, + TagListComponent, + MatButton, + MatIcon, + ClickStopPropagationDirective + ] }) export class NestedDatasetsPageComponent extends CommonProjectsPageComponent { entityTypeEnum = ProjectTypeEnum; diff --git a/src/app/features/experiments/containers/experiment-info-navbar/experiment-info-navbar.component.scss b/src/app/features/experiments/containers/experiment-info-navbar/experiment-info-navbar.component.scss index 2e8b320d..76b1f13d 100644 --- a/src/app/features/experiments/containers/experiment-info-navbar/experiment-info-navbar.component.scss +++ b/src/app/features/experiments/containers/experiment-info-navbar/experiment-info-navbar.component.scss @@ -1,7 +1,7 @@ .tab-nav { display: grid; grid-template-columns: 200px 1fr 200px; - border-bottom: 1px solid #efefef; + border-bottom: 1px solid var(--color-surface-container-high); &.minimized { grid-template-columns: 0 1fr 108px; diff --git a/src/app/features/experiments/containers/experiment-info-navbar/experiment-info-navbar.component.ts b/src/app/features/experiments/containers/experiment-info-navbar/experiment-info-navbar.component.ts index 616b0003..3937cba6 100644 --- a/src/app/features/experiments/containers/experiment-info-navbar/experiment-info-navbar.component.ts +++ b/src/app/features/experiments/containers/experiment-info-navbar/experiment-info-navbar.component.ts @@ -3,10 +3,11 @@ import {Link} from '@common/shared/components/router-tab-nav-bar/router-tab-nav- @Component({ - selector: 'sm-experiment-info-navbar', - templateUrl: './experiment-info-navbar.component.html', - styleUrls: ['./experiment-info-navbar.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-experiment-info-navbar', + templateUrl: './experiment-info-navbar.component.html', + styleUrls: ['./experiment-info-navbar.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ExperimentInfoNavbarComponent { public baseInfoRoute: string[]; diff --git a/src/app/features/experiments/containers/experiment-menu-extended/experiment-menu-extended.component.ts b/src/app/features/experiments/containers/experiment-menu-extended/experiment-menu-extended.component.ts index 4d52b20c..4b5b24a0 100644 --- a/src/app/features/experiments/containers/experiment-menu-extended/experiment-menu-extended.component.ts +++ b/src/app/features/experiments/containers/experiment-menu-extended/experiment-menu-extended.component.ts @@ -1,10 +1,11 @@ -import {Component, computed, Signal} from '@angular/core'; +import {Component, computed} from '@angular/core'; import {ExperimentMenuComponent} from '@common/experiments/shared/components/experiment-menu/experiment-menu.component'; @Component({ - selector: 'sm-experiment-menu-extended', - templateUrl: '../../../../webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.html', - styleUrls: ['../../../../webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.scss'] + selector: 'sm-experiment-menu-extended', + templateUrl: '../../../../webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.html', + styleUrls: ['../../../../webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.scss'], + standalone: false }) export class ExperimentMenuExtendedComponent extends ExperimentMenuComponent{ contextMenu = computed(() => this as ExperimentMenuComponent); diff --git a/src/app/features/experiments/containers/experiment-ouptut/experiment-output.component.html b/src/app/features/experiments/containers/experiment-ouptut/experiment-output.component.html index d4eb6b78..ab8dc10b 100644 --- a/src/app/features/experiments/containers/experiment-ouptut/experiment-output.component.html +++ b/src/app/features/experiments/containers/experiment-ouptut/experiment-output.component.html @@ -39,15 +39,19 @@ class="graph-settings-menu" (click)="$event.stopPropagation()" [verticalLayout]="true" - [smoothWeight]="smoothWeight$ | ngrxPush" - [smoothType]="smoothType$ | ngrxPush" - [xAxisType]="xAxisType$ | ngrxPush" - [groupBy]="groupBy$ | ngrxPush" + [smoothWeight]="smoothWeight()" + [smoothSigma]="smoothSigma()" + [smoothType]="smoothType()" + [xAxisType]="xAxisType()" + [groupBy]="groupBy()" + [clearable]="projectId === '*' ? null : !isProjectLevel()" [groupByOptions]="groupByOptions" (changeWeight)="changeSmoothness($event)" + (changeSigma)="changeSigma($event)" (changeXAxisType)="changeXAxisType($event)" (changeGroupBy)="changeGroupBy($event)" (changeSmoothType)="changeSmoothType($event)" + (setToProject)="setToProject()" > diff --git a/src/app/features/experiments/containers/experiment-ouptut/experiment-output.component.ts b/src/app/features/experiments/containers/experiment-ouptut/experiment-output.component.ts index b9e668ff..eb52fd7b 100644 --- a/src/app/features/experiments/containers/experiment-ouptut/experiment-output.component.ts +++ b/src/app/features/experiments/containers/experiment-ouptut/experiment-output.component.ts @@ -1,10 +1,11 @@ import {Component} from '@angular/core'; -import {BaseExperimentOutputComponent} from '../../../../webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component'; +import {BaseExperimentOutputComponent} from '@common/experiments/containers/experiment-ouptut/base-experiment-output.component'; @Component({ selector: 'sm-experiment-output', templateUrl: './experiment-output.component.html', - styleUrls: ['../../../../webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.scss'] + styleUrls: ['../../../../webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.scss'], + standalone: false }) export class ExperimentOutputComponent extends BaseExperimentOutputComponent { public overflow: boolean; diff --git a/src/app/features/experiments/experiments.module.ts b/src/app/features/experiments/experiments.module.ts index 00583625..a52f4e62 100644 --- a/src/app/features/experiments/experiments.module.ts +++ b/src/app/features/experiments/experiments.module.ts @@ -11,68 +11,32 @@ import {ExperimentGraphsModule} from '@common/shared/experiment-graphs/experimen import {ExperimentCompareSharedModule} from '@common/experiments-compare/shared/experiment-compare-shared.module'; import {AngularSplitModule} from 'angular-split'; import {DebugImagesModule} from '@common/debug-images/debug-images.module'; -import { - ExperimentInfoExecutionComponent -} from '@common/experiments/containers/experiment-info-execution/experiment-info-execution.component'; +import {ExperimentInfoExecutionComponent} from '@common/experiments/containers/experiment-info-execution/experiment-info-execution.component'; import {MatSidenavModule} from '@angular/material/sidenav'; import {MatListModule} from '@angular/material/list'; import {ExperimentOutputComponent} from './containers/experiment-ouptut/experiment-output.component'; import {ExperimentInfoNavbarComponent} from './containers/experiment-info-navbar/experiment-info-navbar.component'; -import { - ExperimentInfoHyperParametersComponent -} from '@common/experiments/containers/experiment-info-hyper-parameters/experiment-info-hyper-parameters.component'; -import { - ExperimentInfoArtifactItemComponent -} from '@common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component'; -import { - ExperimentGeneralInfoComponent -} from '@common/experiments/dumb/experiment-general-info/experiment-general-info.component'; -import { - ExperimentArtifactItemViewComponent -} from '@common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component'; -import { - ExperimentHyperParamsNavbarComponent -} from '@common/experiments/dumb/experiment-hyper-params-navbar/experiment-hyper-params-navbar.component'; -import { - ExperimentExecutionSourceCodeComponent -} from '@common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component'; -import { - ExperimentInfoEditDescriptionComponent -} from '@common/experiments/dumb/experiment-info-edit-description/experiment-info-edit-description.component'; -import { - ExperimentOutputModelViewComponent -} from '@common/experiments/dumb/experiment-output-model-view/experiment-output-model-view.component'; -import { - ExperimentInfoGeneralComponent -} from '@common/experiments/containers/experiment-info-general/experiment-info-general.component'; +import {ExperimentInfoHyperParametersComponent} from '@common/experiments/containers/experiment-info-hyper-parameters/experiment-info-hyper-parameters.component'; +import {ExperimentInfoArtifactItemComponent} from '@common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component'; +import {ExperimentArtifactItemViewComponent} from '@common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component'; +import {ExperimentHyperParamsNavbarComponent} from '@common/experiments/dumb/experiment-hyper-params-navbar/experiment-hyper-params-navbar.component'; +import {ExperimentExecutionSourceCodeComponent} from '@common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component'; +import {ExperimentInfoEditDescriptionComponent} from '@common/experiments/dumb/experiment-info-edit-description/experiment-info-edit-description.component'; +import {ExperimentOutputModelViewComponent} from '@common/experiments/dumb/experiment-output-model-view/experiment-output-model-view.component'; +import {ExperimentInfoGeneralComponent} from '@common/experiments/containers/experiment-info-general/experiment-info-general.component'; import {BaseClickableArtifactComponent} from '@common/experiments/dumb/base-clickable-artifact.component'; -import { - ExperimentModelsFormViewComponent -} from '@common/experiments/dumb/experiment-models-form-view/experiment-models-form-view.component'; -import { - ExperimentInfoArtifactsComponent -} from '@common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component'; -import { - ExperimentInfoHeaderComponent -} from '@common/experiments/dumb/experiment-info-header/experiment-info-header.component'; -import { - ExperimentInfoTaskModelComponent -} from '@common/experiments/containers/experiment-info-task-model/experiment-info-task-model.component'; -import { - ExperimentOutputScalarsComponent -} from '@common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component'; -import { - ExperimentInfoModelComponent -} from '@common/experiments/containers/experiment-info-model/experiment-info-model.component'; -import { - ExperimentInfoHyperParametersFormContainerComponent -} from '@common/experiments/containers/experiment-info-hyper-parameters-form-container/experiment-info-hyper-parameters-form-container.component'; +import {ExperimentModelsFormViewComponent} from '@common/experiments/dumb/experiment-models-form-view/experiment-models-form-view.component'; +import {ExperimentInfoArtifactsComponent} from '@common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component'; +import {ExperimentInfoHeaderComponent} from '@common/experiments/dumb/experiment-info-header/experiment-info-header.component'; +import {ExperimentInfoTaskModelComponent} from '@common/experiments/containers/experiment-info-task-model/experiment-info-task-model.component'; +import {ExperimentOutputScalarsComponent} from '@common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component'; +import {ExperimentInfoModelComponent} from '@common/experiments/containers/experiment-info-model/experiment-info-model.component'; +import {ExperimentInfoHyperParametersFormContainerComponent} from '@common/experiments/containers/experiment-info-hyper-parameters-form-container/experiment-info-hyper-parameters-form-container.component'; import {ExperimentOutputLogModule} from '@common/experiments/shared/experiment-output-log/experiment-output-log.module'; import {RouterModule} from '@angular/router'; import {ScrollingModule} from '@angular/cdk/scrolling'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {MatRadioModule} from '@angular/material/radio'; -import {SharedModule} from '~/shared/shared.module'; import {MAT_AUTOCOMPLETE_SCROLL_STRATEGY} from '@angular/material/autocomplete'; import {scrollFactory} from '@common/shared/utils/scroll-factory'; import {Overlay} from '@angular/cdk/overlay'; @@ -81,9 +45,7 @@ import {RouterTabNavBarComponent} from '@common/shared/components/router-tab-nav import {MatTabsModule} from '@angular/material/tabs'; import {OverlayComponent} from '@common/shared/ui-components/overlay/overlay/overlay.component'; import {RefreshButtonComponent} from '@common/shared/components/refresh-button/refresh-button.component'; -import { - InfoHeaderStatusIconLabelComponent -} from '@common/shared/experiment-info-header-status-icon-label/info-header-status-icon-label.component'; +import {InfoHeaderStatusIconLabelComponent} from '@common/shared/experiment-info-header-status-icon-label/info-header-status-icon-label.component'; import {NAPipe} from '@common/shared/pipes/na.pipe'; import {SortPipe} from '@common/shared/pipes/sort.pipe'; import {safeAngularUrlParameterPipe} from '@common/shared/pipes/safeAngularUrlParameter.pipe'; @@ -100,120 +62,114 @@ import {InlineEditComponent} from '@common/shared/ui-components/inputs/inline-ed import {TagsMenuComponent} from '@common/shared/ui-components/tags/tags-menu/tags-menu.component'; import {EntityFooterComponent} from '@common/shared/entity-page/entity-footer/entity-footer.component'; import {MenuComponent} from '@common/shared/ui-components/panel/menu/menu.component'; -import { - ExperimentTypeIconLabelComponent -} from '@common/shared/experiment-type-icon-label/experiment-type-icon-label.component'; +import {ExperimentTypeIconLabelComponent} from '@common/shared/experiment-type-icon-label/experiment-type-icon-label.component'; import {SearchComponent} from '@common/shared/ui-components/inputs/search/search.component'; import {IdBadgeComponent} from '@common/shared/components/id-badge/id-badge.component'; import {ScrollTextareaComponent} from '@common/shared/components/scroll-textarea/scroll-textarea.component'; import {TagListComponent} from '@common/shared/ui-components/tags/tag-list/tag-list.component'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import {LabeledRowComponent} from '@common/shared/ui-components/data/labeled-row/labeled-row.component'; -import { - SelectableGroupedFilterListComponent -} from '@common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component'; +import {SelectableGroupedFilterListComponent} from '@common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component'; import {EditableSectionComponent} from '@common/shared/ui-components/panel/editable-section/editable-section.component'; import {MatMenuModule} from '@angular/material/menu'; import {MatExpansionModule} from '@angular/material/expansion'; import {MatInputModule} from '@angular/material/input'; import {MatSelectModule} from '@angular/material/select'; import {HesitateDirective} from '@common/shared/ui-components/directives/hesitate.directive'; -import { - ShowTooltipIfEllipsisDirective -} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; +import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; import {SelectQueueModule} from '@common/experiments/shared/components/select-queue/select-queue.module'; import {PushPipe} from '@ngrx/component'; import {ExperimentHeaderComponent} from '@common/experiments/dumb/experiment-header/experiment-header.component'; -import { - ExperimentOperationsLogComponent -} from '@common/experiments/dumb/experiment-operations-log/experiment-operations-log.component'; -import { - ExperimentArtifactsNavbarComponent -} from '@common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component'; +import {ExperimentOperationsLogComponent} from '@common/experiments/dumb/experiment-operations-log/experiment-operations-log.component'; +import {ExperimentArtifactsNavbarComponent} from '@common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component'; import {CommonDeleteDialogModule} from '@common/shared/entity-page/entity-delete/common-delete-dialog.module'; import {MatIcon} from '@angular/material/icon'; import {MatButton, MatIconButton} from '@angular/material/button'; +import {GraphSettingsBarComponent} from '@common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component'; +import {MatSlideToggle} from '@angular/material/slide-toggle'; +import {ExperimentDetailsComponent} from '@common/experiments/dumb/experiment-details/experiment-details.component'; @NgModule({ - imports: [ - FormsModule, - LayoutModule, - ReactiveFormsModule, - CommonModule, - ExperimentRouterModule, - ExperimentSharedModule, - ExperimentGraphsModule, - SelectModelModule, - DebugImagesModule, - ExperimentCompareSharedModule, - MatSidenavModule, - MatListModule, - AngularSplitModule, - ScrollingModule, - RouterModule, - SharedModule, - ExperimentOutputLogModule, - MatProgressSpinnerModule, - MatRadioModule, - RouterTabNavBarComponent, - MatTabsModule, - RouterTabNavBarComponent, - OverlayComponent, - RefreshButtonComponent, - InfoHeaderStatusIconLabelComponent, - NAPipe, - SortPipe, - safeAngularUrlParameterPipe, - ReplaceViaMapPipe, - FilterOutPipe, - DurationPipe, - FilterInternalPipe, - FileSizePipe, - HideRedactedArgumentsPipe, - MenuItemComponent, - CopyClipboardComponent, - SectionHeaderComponent, - InlineEditComponent, - TagsMenuComponent, - EntityFooterComponent, - MenuComponent, - ExperimentTypeIconLabelComponent, - SearchComponent, - IdBadgeComponent, - ScrollTextareaComponent, - TagListComponent, - TooltipDirective, - LabeledRowComponent, - EditableSectionComponent, - SelectableGroupedFilterListComponent, - MatMenuModule, - MatExpansionModule, - MatInputModule, - MatSelectModule, - HesitateDirective, - ShowTooltipIfEllipsisDirective, - SelectQueueModule, - PushPipe, - ExperimentHeaderComponent, - ExperimentOperationsLogComponent, - ExperimentArtifactsNavbarComponent, - CommonDeleteDialogModule, - MatIcon, - MatButton, - MatIconButton - ], + imports: [ + MatTabsModule, + MatMenuModule, + MatExpansionModule, + MatInputModule, + MatSelectModule, + MatSlideToggle, + MatButton, + MatIcon, + MatIconButton, + MatListModule, + MatRadioModule, + MatSidenavModule, + MatProgressSpinnerModule, + FormsModule, + LayoutModule, + ReactiveFormsModule, + CommonModule, + ExperimentRouterModule, + ExperimentGraphsModule, + SelectModelModule, + DebugImagesModule, + ExperimentCompareSharedModule, + AngularSplitModule, + ScrollingModule, + CommonDeleteDialogModule, + RouterModule, + ExperimentOutputLogModule, + ExperimentSharedModule, + RouterTabNavBarComponent, + HesitateDirective, + NAPipe, + SortPipe, + safeAngularUrlParameterPipe, + ReplaceViaMapPipe, + FilterOutPipe, + DurationPipe, + FilterInternalPipe, + FileSizePipe, + HideRedactedArgumentsPipe, + InfoHeaderStatusIconLabelComponent, + MenuItemComponent, + CopyClipboardComponent, + SectionHeaderComponent, + InlineEditComponent, + TagsMenuComponent, + EntityFooterComponent, + MenuComponent, + ExperimentTypeIconLabelComponent, + SearchComponent, + IdBadgeComponent, + ScrollTextareaComponent, + TagListComponent, + TooltipDirective, + LabeledRowComponent, + EditableSectionComponent, + SelectableGroupedFilterListComponent, + OverlayComponent, + RefreshButtonComponent, + HesitateDirective, + ShowTooltipIfEllipsisDirective, + SelectQueueModule, + PushPipe, + ExperimentHeaderComponent, + ExperimentOperationsLogComponent, + ExperimentArtifactsNavbarComponent, + GraphSettingsBarComponent, + ], declarations: [ - ExperimentsComponent, - ExperimentInfoExecutionComponent, ExperimentOutputComponent, + ExperimentInfoExecutionComponent, ExperimentInfoNavbarComponent, + ExperimentsComponent, BaseClickableArtifactComponent, ExperimentInfoHeaderComponent, ExperimentInfoModelComponent, ExperimentInfoTaskModelComponent, ExperimentInfoGeneralComponent, - ExperimentGeneralInfoComponent, + ExperimentDetailsComponent, ExperimentModelsFormViewComponent, ExperimentOutputModelViewComponent, ExperimentExecutionSourceCodeComponent, diff --git a/src/app/features/experiments/reducers/index.ts b/src/app/features/experiments/reducers/index.ts index 59d8c0ad..551c045f 100644 --- a/src/app/features/experiments/reducers/index.ts +++ b/src/app/features/experiments/reducers/index.ts @@ -4,10 +4,11 @@ import {experimentOutputReducer, ExperimentOutputState, experimentOutputInitStat import {experimentsViewReducer, ExperimentsViewState, experimentsViewInitialState} from '@common/experiments/reducers/experiments-view.reducer'; import {IExperimentInfo} from '../shared/experiment-info.model'; import {TaskStatusEnum} from '~/business-logic/model/tasks/taskStatusEnum'; -import {selectSelectedModel} from '@common/models/reducers'; +import {selectModelId, selectSelectedModel} from '@common/models/reducers'; import {selectCurrentUser} from '@common/core/reducers/users-reducer'; import {isReadOnly} from '@common/shared/utils/is-read-only'; import {isSharedAndNotOwner} from '@common/shared/utils/is-shared-and-not-owner'; +import { selectSelectedProjectId } from '@common/core/reducers/projects.reducer'; export interface ExperimentState { view: ExperimentsViewState; @@ -60,6 +61,12 @@ export const selectExperimentFormValidity = createSelector(selectExperimentInfoD return !error; }); -export const selectSelectedModelSettings = createSelector(experimentOutput, selectSelectedModel, - (output, currentModel): ExperimentSettings => - output.settingsList && output.settingsList.find((setting) => currentModel && setting.id === currentModel.id)); +export const selectOutputSettings = createSelector(experimentOutput, state => state.settingsList); +export const selectSelectedModelSettings = createSelector(experimentOutput, selectModelId, selectSelectedProjectId, + (output, modelId, projectId): Partial => { + if (output.settingsList && modelId) { + return output.settingsList.find((setting) => setting.id === modelId) ?? output.settingsList.find((setting) => setting.id === projectId) ?? {}; + } else { + return null; + } + }); diff --git a/src/app/features/experiments/shared/experiment-shared.module.ts b/src/app/features/experiments/shared/experiment-shared.module.ts index 75cdf652..01551326 100644 --- a/src/app/features/experiments/shared/experiment-shared.module.ts +++ b/src/app/features/experiments/shared/experiment-shared.module.ts @@ -58,7 +58,6 @@ import {TableComponent} from '@common/shared/ui-components/data/table/table.comp import {MatSelectModule} from '@angular/material/select'; import {ButtonToggleComponent} from '@common/shared/ui-components/inputs/button-toggle/button-toggle.component'; import {GroupedCheckedFilterListComponent} from '@common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component'; -import {SelectableFilterListComponent} from '@common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component'; import {TableCardComponent} from '@common/shared/ui-components/data/table-card/table-card.component'; import {ToggleArchiveComponent} from '@common/shared/ui-components/buttons/toggle-archive/toggle-archive.component'; import {RefreshButtonComponent} from '@common/shared/components/refresh-button/refresh-button.component'; @@ -80,6 +79,10 @@ import {MatDialogActions, MatDialogClose} from '@angular/material/dialog'; import {IsRowSelectedPipe} from '@common/shared/ui-components/data/table/is-rwo-selected.pipe'; import {MiniTagsListComponent} from '@common/shared/ui-components/tags/user-tag/mini-tags-list/mini-tags-list.component'; import {TableCardFilterComponent} from '@common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component'; +import {SelectableGroupedFilterListComponent} from '@common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component'; +import {JsonIndentPipe} from '@common/experiments/dumb/experiment-execution-parameters/json-indent.pipe'; +import {MultiLineTooltipComponent} from '@common/shared/components/multi-line-tooltip/multi-line-tooltip.component'; +import {MatDivider} from '@angular/material/divider'; export const experimentSyncedKeys = [ 'view.projectColumnsSortOrder', @@ -178,7 +181,6 @@ const DECLARATIONS = [ MatSelectModule, ButtonToggleComponent, GroupedCheckedFilterListComponent, - SelectableFilterListComponent, TableCardComponent, ToggleArchiveComponent, RefreshButtonComponent, @@ -203,6 +205,10 @@ const DECLARATIONS = [ MiniTagsListComponent, TableCardFilterComponent, ReactiveFormsModule, + SelectableGroupedFilterListComponent, + JsonIndentPipe, + MultiLineTooltipComponent, + MatDivider, ], declarations : [...DECLARATIONS], providers : [ diff --git a/src/app/features/experiments/shared/experiments.utils.ts b/src/app/features/experiments/shared/experiments.utils.ts index 185a66fe..c480748f 100644 --- a/src/app/features/experiments/shared/experiments.utils.ts +++ b/src/app/features/experiments/shared/experiments.utils.ts @@ -1,18 +1,12 @@ -import {Model} from '../../../business-logic/model/models/model'; -import {ISelectedExperiment} from './experiment-info.model'; -import {isExample} from '../../../webapp-common/shared/utils/shared-utils'; +import {isExample} from '@common/shared/utils/shared-utils'; import {ExperimentTagsEnum} from '~/features/experiments/shared/experiments.const'; -export function areLabelsEqualss(modelLabels: Model['labels'], labels: Model['labels']) { - return true; -} - export function isDevelopment(entity): boolean { return false; } -export function getSystemTags(experiment: ISelectedExperiment) { +export function getSystemTags(experiment: {system_tags?: string[]}) { const ignoredTags: string[] = [ExperimentTagsEnum.Hidden, ExperimentTagsEnum.Development]; ignoredTags.push(ExperimentTagsEnum.Pipeline, ExperimentTagsEnum.Dataset); if (experiment?.system_tags?.includes(ExperimentTagsEnum.Dataset) || experiment?.system_tags?.includes(ExperimentTagsEnum.Pipeline)) { diff --git a/src/app/features/models/containers/model-menu-extended/model-menu-extended.component.ts b/src/app/features/models/containers/model-menu-extended/model-menu-extended.component.ts index c68c23a1..900d21aa 100644 --- a/src/app/features/models/containers/model-menu-extended/model-menu-extended.component.ts +++ b/src/app/features/models/containers/model-menu-extended/model-menu-extended.component.ts @@ -1,10 +1,11 @@ import {Component, signal} from '@angular/core'; -import {ModelMenuComponent} from '../../../../webapp-common/models/containers/model-menu/model-menu.component'; +import {ModelMenuComponent} from '@common/models/containers/model-menu/model-menu.component'; @Component({ selector: 'sm-model-menu-extended', templateUrl: '../../../../webapp-common/models/containers/model-menu/model-menu.component.html', - styleUrls: ['../../../../webapp-common/models/containers/model-menu/model-menu.component.scss'] + styleUrls: ['../../../../webapp-common/models/containers/model-menu/model-menu.component.scss'], + standalone: false }) export class ModelMenuExtendedComponent extends ModelMenuComponent { diff --git a/src/app/features/not-found/not-found/not-found.component.ts b/src/app/features/not-found/not-found/not-found.component.ts index 9a26ee0e..932b810d 100644 --- a/src/app/features/not-found/not-found/not-found.component.ts +++ b/src/app/features/not-found/not-found/not-found.component.ts @@ -1,9 +1,10 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'sm-not-found', - templateUrl: './not-found.component.html', - styleUrls: ['./not-found.component.scss'] + selector: 'sm-not-found', + templateUrl: './not-found.component.html', + styleUrls: ['./not-found.component.scss'], + standalone: false }) export class NotFoundComponent implements OnInit { diff --git a/src/app/features/projects/containers/project-card-menu-extended/project-card-menu-extended.component.ts b/src/app/features/projects/containers/project-card-menu-extended/project-card-menu-extended.component.ts index bacc1896..21a18088 100644 --- a/src/app/features/projects/containers/project-card-menu-extended/project-card-menu-extended.component.ts +++ b/src/app/features/projects/containers/project-card-menu-extended/project-card-menu-extended.component.ts @@ -1,13 +1,19 @@ import {Component} from '@angular/core'; import {ProjectCardMenuComponent} from '@common/shared/ui-components/panel/project-card-menu/project-card-menu.component'; +import {MenuItemComponent} from '@common/shared/ui-components/panel/menu-item/menu-item.component'; +import {MenuComponent} from '@common/shared/ui-components/panel/menu/menu.component'; @Component({ selector: 'sm-project-card-menu-extended', templateUrl: '../../../../webapp-common/shared/ui-components/panel/project-card-menu/project-card-menu.component.html', - styleUrls: ['../../../../webapp-common/shared/ui-components/panel/project-card-menu/project-card-menu.component.scss'] + styleUrls: ['../../../../webapp-common/shared/ui-components/panel/project-card-menu/project-card-menu.component.scss'], + imports: [ + MenuItemComponent, + MenuComponent, + ] }) -export class ProjectCardMenuExtendedComponent extends ProjectCardMenuComponent{ +export class ProjectCardMenuExtendedComponent extends ProjectCardMenuComponent { set contextMenu(data) {} get contextMenu() { return this; diff --git a/src/app/features/projects/shared/projects-shared.module.ts b/src/app/features/projects/shared/projects-shared.module.ts index 3779a0a5..5ec1843b 100644 --- a/src/app/features/projects/shared/projects-shared.module.ts +++ b/src/app/features/projects/shared/projects-shared.module.ts @@ -1,7 +1,6 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {ProjectCardMenuExtendedComponent} from '~/features/projects/containers/project-card-menu-extended/project-card-menu-extended.component'; import {ProjectCardMenuComponent} from '@common/shared/ui-components/panel/project-card-menu/project-card-menu.component'; import {PipelineCardMenuComponent} from '@common/pipelines/pipeline-card-menu/pipeline-card-menu.component'; import {ScrollingModule} from '@angular/cdk/scrolling'; @@ -36,11 +35,13 @@ import {DotsLoadMoreComponent} from '@common/shared/ui-components/indicators/dot import {MatTab, MatTabGroup} from '@angular/material/tabs'; import {MatIcon} from '@angular/material/icon'; import {MatIconButton} from '@angular/material/button'; +import {CommonSearchComponent} from '@common/common-search/containers/common-search/common-search.component'; +import {PushPipe} from '@ngrx/component'; const _declarations = [ - ProjectCardMenuExtendedComponent, - PipelineCardMenuComponent, + PipelinesEmptyStateComponent, NestedCardComponent, + PipelineCardMenuComponent, DatasetEmptyComponent, NestedProjectViewPageComponent, ProjectsHeaderComponent @@ -73,14 +74,16 @@ const _declarations = [ TooltipDirective, ButtonToggleComponent, ShowTooltipIfEllipsisDirective, + PushPipe, DotsLoadMoreComponent, MatTabGroup, MatTab, + MatIconButton, MatIcon, - MatIconButton + CommonSearchComponent ], - declarations: [..._declarations, PipelinesEmptyStateComponent], - exports: [..._declarations, PipelinesEmptyStateComponent] + declarations: [..._declarations], + exports: [..._declarations] }) export class ProjectsSharedModule { } diff --git a/src/app/features/serving/empty-state/serving-empty-state.component.html b/src/app/features/serving/empty-state/serving-empty-state.component.html index 2954f433..5098632f 100644 --- a/src/app/features/serving/empty-state/serving-empty-state.component.html +++ b/src/app/features/serving/empty-state/serving-empty-state.component.html @@ -1,8 +1,12 @@
- - MODEL ENDPOINTS WILL APPEAR HERE - - Monitor models deployed with clearml-serving - or the ClearML HttpRouter class - + + @if (isLoading()) { + NO MODEL ENDPOINTS CURRENTLY BEING SET UP + } @else { + NO ACTIVE MODEL ENDPOINTS + Monitor models deployed with + clearml-serving + or the ClearML HttpRouter class + + }
diff --git a/src/app/features/serving/empty-state/serving-empty-state.component.scss b/src/app/features/serving/empty-state/serving-empty-state.component.scss index 8615bd78..82ac8c5b 100644 --- a/src/app/features/serving/empty-state/serving-empty-state.component.scss +++ b/src/app/features/serving/empty-state/serving-empty-state.component.scss @@ -8,14 +8,11 @@ a[href]:hover { justify-content: center; gap: 24px; align-items: center; -} - -.al-icon { - color: var(--color-tint-14); + color: var(--color-empty-state); } .message { - font-size: 20px; + font-size: 16px; font-weight: 500; } diff --git a/src/app/features/serving/empty-state/serving-empty-state.component.ts b/src/app/features/serving/empty-state/serving-empty-state.component.ts index 690f0f78..d5d42525 100644 --- a/src/app/features/serving/empty-state/serving-empty-state.component.ts +++ b/src/app/features/serving/empty-state/serving-empty-state.component.ts @@ -1,17 +1,15 @@ -import { Component } from '@angular/core'; -import {RouterLink} from '@angular/router'; -import {MatIcon} from '@angular/material/icon'; +import {ChangeDetectionStrategy, Component, input} from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; @Component({ - selector: 'sm-serving-empty-state', - standalone: true, - imports: [ - RouterLink, - MatIcon - ], - templateUrl: './serving-empty-state.component.html', - styleUrl: './serving-empty-state.component.scss' + selector: 'sm-serving-empty-state', + imports: [ + MatIcon + ], + templateUrl: './serving-empty-state.component.html', + styleUrl: './serving-empty-state.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush }) export class ServingEmptyStateComponent { - + isLoading = input(false); } diff --git a/src/app/features/settings/containers/admin/admin-footer-actions/admin-footer-actions.component.ts b/src/app/features/settings/containers/admin/admin-footer-actions/admin-footer-actions.component.ts index 2d306ea3..e885ac04 100644 --- a/src/app/features/settings/containers/admin/admin-footer-actions/admin-footer-actions.component.ts +++ b/src/app/features/settings/containers/admin/admin-footer-actions/admin-footer-actions.component.ts @@ -3,8 +3,8 @@ import {Component} from '@angular/core'; @Component({ selector: 'sm-admin-footer-actions', templateUrl: './admin-footer-actions.component.html', - styleUrls: ['./admin-footer-actions.component.scss'] + styleUrls: ['./admin-footer-actions.component.scss'], + standalone: false }) export class AdminFooterActionsComponent { - constructor() { } } diff --git a/src/app/features/settings/containers/admin/create-credential-dialog/create-credential-dialog.component.ts b/src/app/features/settings/containers/admin/create-credential-dialog/create-credential-dialog.component.ts index ce5b6ede..983f0cd3 100644 --- a/src/app/features/settings/containers/admin/create-credential-dialog/create-credential-dialog.component.ts +++ b/src/app/features/settings/containers/admin/create-credential-dialog/create-credential-dialog.component.ts @@ -8,15 +8,14 @@ import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dial import {AdminDialogTemplateComponent} from '@common/settings/admin/admin-dialog-template/admin-dialog-template.component'; @Component({ - selector: 'sm-create-credential-dialog', - templateUrl: './create-credential-dialog.component.html', - styleUrls: ['./create-credential-dialog.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - DialogTemplateComponent, - AdminDialogTemplateComponent - ] + selector: 'sm-create-credential-dialog', + templateUrl: './create-credential-dialog.component.html', + styleUrls: ['./create-credential-dialog.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + DialogTemplateComponent, + AdminDialogTemplateComponent + ] }) export class CreateCredentialDialogComponent { private store = inject(Store); diff --git a/src/app/features/settings/containers/admin/usage-stats/usage-stats.component.ts b/src/app/features/settings/containers/admin/usage-stats/usage-stats.component.ts index a7d7031d..f747ebba 100644 --- a/src/app/features/settings/containers/admin/usage-stats/usage-stats.component.ts +++ b/src/app/features/settings/containers/admin/usage-stats/usage-stats.component.ts @@ -7,13 +7,12 @@ import {ConfigurationService} from '@common/shared/services/configuration.servic @Component({ - selector: 'sm-usage-stats', - templateUrl: './usage-stats.component.html', - styleUrls: ['./usage-stats.component.scss'], - imports: [ - MatSlideToggle - ], - standalone: true + selector: 'sm-usage-stats', + templateUrl: './usage-stats.component.html', + styleUrls: ['./usage-stats.component.scss'], + imports: [ + MatSlideToggle + ] }) export class UsageStatsComponent { private store = inject(Store); diff --git a/src/app/features/settings/containers/admin/user-credentials/user-credentials.component.html b/src/app/features/settings/containers/admin/user-credentials/user-credentials.component.html index a8746001..3c38c76a 100644 --- a/src/app/features/settings/containers/admin/user-credentials/user-credentials.component.html +++ b/src/app/features/settings/containers/admin/user-credentials/user-credentials.component.html @@ -1,6 +1,6 @@
- API credentials + API CREDENTIALS ; + public credentials$: Observable>; private newCredentialSub: Subscription; creatingCredentials = false; private user: GetCurrentUserResponseUserObject; diff --git a/src/app/features/settings/containers/admin/user-data/user-data.component.ts b/src/app/features/settings/containers/admin/user-data/user-data.component.ts index c259da5d..1dfbbb6d 100644 --- a/src/app/features/settings/containers/admin/user-data/user-data.component.ts +++ b/src/app/features/settings/containers/admin/user-data/user-data.component.ts @@ -3,7 +3,8 @@ import {Component, input} from '@angular/core'; @Component({ selector: 'sm-user-data', templateUrl: './user-data.component.html', - styleUrls: ['./user-data.component.scss'] + styleUrls: ['./user-data.component.scss'], + standalone: false }) export class UserDataComponent { diff --git a/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.html b/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.html index 961fb75b..ca2b2e3d 100644 --- a/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.html +++ b/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.html @@ -1,9 +1,7 @@ -
-
-
USER PREFERENCES
-
-
- - -
-
+
+
USER PREFERENCES
+
+
+ + +
diff --git a/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.scss b/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.scss index 9dbc6af8..79c50b09 100644 --- a/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.scss +++ b/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.scss @@ -1,21 +1,24 @@ -@import 'variables'; +@use '../layout/layout'; :host { - header { - padding: 20px 24px; - } + display: block; + height: 100%; + padding-bottom: 12px; .main { - padding: 0 24px; - } - - .section { - margin: 6px 0 24px; - padding-bottom: 12px; + display: grid; + grid-template-rows: auto minmax(0, 1fr); + height: calc(100% - 64px); + padding-left: 24px; } .title { - color: $white; + color: var(--color-on-primary-container); font-size: 16px; + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 24px; + height: layout.$project-header-height; } } diff --git a/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.ts b/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.ts index df4dc99f..74e21489 100644 --- a/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.ts +++ b/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.ts @@ -3,14 +3,13 @@ import {ProfilePreferencesComponent} from '@common/settings/admin/profile-prefer import {ProfileKeyStorageComponent} from '@common/settings/admin/profile-key-storage/profile-key-storage.component'; @Component({ - selector: 'sm-webapp-configuration', - standalone: true, - imports: [ - ProfilePreferencesComponent, - ProfileKeyStorageComponent, - ], - templateUrl: './webapp-configuration.component.html', - styleUrl: './webapp-configuration.component.scss' + selector: 'sm-webapp-configuration', + imports: [ + ProfilePreferencesComponent, + ProfileKeyStorageComponent, + ], + templateUrl: './webapp-configuration.component.html', + styleUrl: './webapp-configuration.component.scss' }) export class WebappConfigurationComponent { diff --git a/src/app/features/settings/settings-routing.module.ts b/src/app/features/settings/settings-routing.module.ts index b80fea07..674d261e 100644 --- a/src/app/features/settings/settings-routing.module.ts +++ b/src/app/features/settings/settings-routing.module.ts @@ -54,7 +54,7 @@ const routes: Routes = [ workspaceNeutral: true, route: '/settings/storage-credentials', staticBreadcrumb: [[settingsBreadcrumb, { - name: 'Storage Credentials', + name: 'Storage Cleanup', type: CrumbTypeEnum.SubFeature }]] } diff --git a/src/app/features/settings/settings.component.html b/src/app/features/settings/settings.component.html index b95d4a55..fc07de55 100644 --- a/src/app/features/settings/settings.component.html +++ b/src/app/features/settings/settings.component.html @@ -1,10 +1,10 @@ - Profile - Configuration - Workspace - Storage Credentials + Profile + Configuration + Workspace + Storage Cleanup diff --git a/src/app/features/settings/settings.component.ts b/src/app/features/settings/settings.component.ts index ab27f97d..0a4e50e9 100644 --- a/src/app/features/settings/settings.component.ts +++ b/src/app/features/settings/settings.component.ts @@ -3,7 +3,9 @@ import {Component} from '@angular/core'; @Component({ selector: 'sm-settings', templateUrl: './settings.component.html', - styleUrls: ['../../webapp-common/settings/settings.component.scss'] + styleUrls: ['../../webapp-common/settings/settings.component.scss'], + standalone: false }) export class SettingsComponent { + } diff --git a/src/app/features/settings/settings.module.ts b/src/app/features/settings/settings.module.ts index 96ba4b70..21dedcf4 100644 --- a/src/app/features/settings/settings.module.ts +++ b/src/app/features/settings/settings.module.ts @@ -50,10 +50,10 @@ import {settingsFeatureKey, settingsReducers} from '~/features/settings/settings @NgModule({ declarations: [ - SettingsComponent, - UserDataComponent, - UserCredentialsComponent, AdminFooterActionsComponent, + UserDataComponent, + SettingsComponent, + UserCredentialsComponent, AdminCredentialTableComponent, AdminFooterComponent, ProfileNameComponent, diff --git a/src/app/features/workers-and-queues/orchestration.component.ts b/src/app/features/workers-and-queues/orchestration.component.ts index f95d84f1..585cbc19 100644 --- a/src/app/features/workers-and-queues/orchestration.component.ts +++ b/src/app/features/workers-and-queues/orchestration.component.ts @@ -9,7 +9,8 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; @Component({ selector: 'sm-orchestration', templateUrl: './orchestration.component.html', - styleUrls: ['./orchestration.component.scss'] + styleUrls: ['./orchestration.component.scss'], + standalone: false }) export class OrchestrationComponent { private store = inject(Store); diff --git a/src/app/features/workers-and-queues/queues-menu-extended/queues-menu-extended.component.ts b/src/app/features/workers-and-queues/queues-menu-extended/queues-menu-extended.component.ts index b609d8e5..49af1eb7 100644 --- a/src/app/features/workers-and-queues/queues-menu-extended/queues-menu-extended.component.ts +++ b/src/app/features/workers-and-queues/queues-menu-extended/queues-menu-extended.component.ts @@ -1,10 +1,11 @@ import {Component} from '@angular/core'; -import {QueuesMenuComponent} from '../../../webapp-common/workers-and-queues/dumb/queues-menu/queues-menu.component'; +import {QueuesMenuComponent} from '@common/workers-and-queues/dumb/queues-menu/queues-menu.component'; @Component({ selector: 'sm-queues-menu-extended', templateUrl: '../../../webapp-common/workers-and-queues/dumb/queues-menu/queues-menu.component.html', - styleUrls: ['../../../webapp-common/workers-and-queues/dumb/queues-menu/queues-menu.component.scss'] + styleUrls: ['../../../webapp-common/workers-and-queues/dumb/queues-menu/queues-menu.component.scss'], + standalone: false }) export class QueuesMenuExtendedComponent extends QueuesMenuComponent{ set contextMenu(data) {} diff --git a/src/app/features/workers-and-queues/workers-and-queues-routing.module.ts b/src/app/features/workers-and-queues/workers-and-queues-routing.module.ts index 6e17bb7f..8a070e26 100644 --- a/src/app/features/workers-and-queues/workers-and-queues-routing.module.ts +++ b/src/app/features/workers-and-queues/workers-and-queues-routing.module.ts @@ -4,7 +4,8 @@ import {WorkersComponent} from '@common/workers-and-queues/containers/workers/wo import {QueuesComponent} from '@common/workers-and-queues/containers/queues/queues.component'; import {WorkersAndQueuesResolver} from '~/shared/resolvers/workers-and-queues.resolver'; import {CrumbTypeEnum} from '@common/layout/breadcrumbs/breadcrumbs.component'; -import {OrchestrationComponent} from "~/features/workers-and-queues/orchestration.component"; +import {OrchestrationComponent} from '~/features/workers-and-queues/orchestration.component'; +import {resetContextMenuGuard} from '@common/shared/guards/resetContextMenuGuard.guard'; const wQBreadcrumb = [[{ name: 'WORKERS AND QUEUES', @@ -14,6 +15,7 @@ export const routes: Routes = [ { path: '', component: OrchestrationComponent, + canDeactivate: [resetContextMenuGuard], resolve: { queuesManager: WorkersAndQueuesResolver }, diff --git a/src/app/features/workers-and-queues/workers-and-queues.module.ts b/src/app/features/workers-and-queues/workers-and-queues.module.ts index ec7264a9..1c070997 100644 --- a/src/app/features/workers-and-queues/workers-and-queues.module.ts +++ b/src/app/features/workers-and-queues/workers-and-queues.module.ts @@ -110,7 +110,6 @@ import {MatButton, MatIconButton} from '@angular/material/button'; QueuesMenuComponent, QueuesMenuExtendedComponent ], - }) export class WorkersAndQueuesModule { } diff --git a/src/app/layout/header/header-user-menu-actions/header-user-menu-actions.component.ts b/src/app/layout/header/header-user-menu-actions/header-user-menu-actions.component.ts index c1ed8085..c98ee0ee 100644 --- a/src/app/layout/header/header-user-menu-actions/header-user-menu-actions.component.ts +++ b/src/app/layout/header/header-user-menu-actions/header-user-menu-actions.component.ts @@ -1,11 +1,9 @@ import {Component} from '@angular/core'; @Component({ - selector: 'sm-header-user-menu-actions', - templateUrl: './header-user-menu-actions.component.html', - styleUrls: ['./header-user-menu-actions.component.scss'] + selector: 'sm-header-user-menu-actions', + templateUrl: './header-user-menu-actions.component.html', + styleUrls: ['./header-user-menu-actions.component.scss'], }) export class HeaderUserMenuActionsComponent { - - constructor() {} } diff --git a/src/app/layout/side-nav/side-nav.component.ts b/src/app/layout/side-nav/side-nav.component.ts index be727862..b4449267 100644 --- a/src/app/layout/side-nav/side-nav.component.ts +++ b/src/app/layout/side-nav/side-nav.component.ts @@ -20,7 +20,8 @@ import {MAT_TOOLTIP_DEFAULT_OPTIONS, MatTooltipDefaultOptions} from '@angular/ma provide: MAT_TOOLTIP_DEFAULT_OPTIONS, useValue: {showDelay: 0, position: 'right'} as MatTooltipDefaultOptions }, - ] + ], + standalone: false }) export class SideNavComponent { public store = inject(Store); diff --git a/src/app/shared/constants/non-common-consts.ts b/src/app/shared/constants/non-common-consts.ts index 7e1339e9..5de10458 100644 --- a/src/app/shared/constants/non-common-consts.ts +++ b/src/app/shared/constants/non-common-consts.ts @@ -32,7 +32,7 @@ export const EXPERIMENTS_STATUS_LABELS = { [TaskStatusEnum.Completed] : 'Completed', [TaskStatusEnum.Published] : 'Published', [TaskStatusEnum.Failed] : 'Failed', - [TaskStatusEnum.Stopped] : 'Completed', + [TaskStatusEnum.Stopped] : 'Aborted', [TaskStatusEnum.Closed] : 'Closed', [TaskTypeEnum.Testing] : 'Testing', [TaskTypeEnum.Training] : 'Training', diff --git a/src/app/webapp-common/angular-notifier/src/components/notifier-container.component.ts b/src/app/webapp-common/angular-notifier/src/components/notifier-container.component.ts index f7b4e1c4..e4c901ba 100644 --- a/src/app/webapp-common/angular-notifier/src/components/notifier-container.component.ts +++ b/src/app/webapp-common/angular-notifier/src/components/notifier-container.component.ts @@ -23,12 +23,13 @@ import {NotifierNotificationComponent} from './notifier-notification.component'; * strategy onPush, which means that we handle change detection manually in order to get the best performance. (#perfmatters) */ @Component({ - changeDetection: ChangeDetectionStrategy.OnPush, // (#perfmatters) - host: { - class: 'notifier__container' - }, - selector: 'notifier-container', - templateUrl: './notifier-container.component.html' + changeDetection: ChangeDetectionStrategy.OnPush, // (#perfmatters) + host: { + class: 'notifier__container' + }, + selector: 'notifier-container', + templateUrl: './notifier-container.component.html', + standalone: false }) export class NotifierContainerComponent implements OnDestroy, OnInit { diff --git a/src/app/webapp-common/angular-notifier/src/components/notifier-notification.component.ts b/src/app/webapp-common/angular-notifier/src/components/notifier-notification.component.ts index 4b226418..e6b39567 100644 --- a/src/app/webapp-common/angular-notifier/src/components/notifier-notification.component.ts +++ b/src/app/webapp-common/angular-notifier/src/components/notifier-notification.component.ts @@ -16,20 +16,21 @@ import {NotifierTimerService} from '../services/notifier-timer.service'; * mouse movements. */ @Component({ - changeDetection: ChangeDetectionStrategy.OnPush, // (#perfmatters) - host: { - '(click)': 'onNotificationClick()', - '(mouseout)': 'onNotificationMouseout()', - '(mouseover)': 'onNotificationMouseover()', - class: 'notifier__notification' - }, - providers: [ - // We provide the timer to the component's local injector, so that every notification components gets its own - // instance of the timer service, thus running their timers independently from each other - NotifierTimerService - ], - selector: 'notifier-notification', - templateUrl: './notifier-notification.component.html' + changeDetection: ChangeDetectionStrategy.OnPush, // (#perfmatters) + host: { + '(click)': 'onNotificationClick()', + '(mouseout)': 'onNotificationMouseout()', + '(mouseover)': 'onNotificationMouseover()', + class: 'notifier__notification' + }, + providers: [ + // We provide the timer to the component's local injector, so that every notification components gets its own + // instance of the timer service, thus running their timers independently from each other + NotifierTimerService + ], + selector: 'notifier-notification', + templateUrl: './notifier-notification.component.html', + standalone: false }) export class NotifierNotificationComponent implements AfterViewInit { diff --git a/src/app/webapp-common/angular-notifier/styles.scss b/src/app/webapp-common/angular-notifier/styles.scss index 41b3f2eb..74ee539d 100644 --- a/src/app/webapp-common/angular-notifier/styles.scss +++ b/src/app/webapp-common/angular-notifier/styles.scss @@ -8,14 +8,14 @@ // We do *NOT* use the partial syntax, and also explicitely write out the file type, so compiling works properly. // Core -@import "styles/core"; +@forward "styles/core"; // Themes -@import "styles/themes/theme-material"; +@forward "styles/themes/theme-material"; // Types -@import "styles/types/type-default"; -@import "styles/types/type-error"; -@import "styles/types/type-info"; -@import "styles/types/type-success"; -@import "styles/types/type-warning"; +@forward "styles/types/type-default"; +@forward "styles/types/type-error"; +@forward "styles/types/type-info"; +@forward "styles/types/type-success"; +@forward "styles/types/type-warning"; diff --git a/src/app/webapp-common/angular-notifier/styles/core.scss b/src/app/webapp-common/angular-notifier/styles/core.scss index db4b490f..d4e4cccd 100644 --- a/src/app/webapp-common/angular-notifier/styles/core.scss +++ b/src/app/webapp-common/angular-notifier/styles/core.scss @@ -5,6 +5,9 @@ .notifier { &__container { + ul { + margin: 0; + } * { box-sizing: border-box; diff --git a/src/app/webapp-common/angular-notifier/styles/themes/theme-material.scss b/src/app/webapp-common/angular-notifier/styles/themes/theme-material.scss index adac2689..5ace10c8 100644 --- a/src/app/webapp-common/angular-notifier/styles/themes/theme-material.scss +++ b/src/app/webapp-common/angular-notifier/styles/themes/theme-material.scss @@ -18,6 +18,9 @@ $notifier-shadow-color: rgba(0, 0, 0, .2) !default; &--warning { border-left-color: var(--color-warning); } + &--warn { + border-left-color: var(--color-warning); + } &--error { border-left-color: var(--color-failed); } diff --git a/src/app/webapp-common/assets/fonts/trains-icons.scss b/src/app/webapp-common/assets/fonts/trains-icons.scss index 493b67b1..d5ce68dd 100644 --- a/src/app/webapp-common/assets/fonts/trains-icons.scss +++ b/src/app/webapp-common/assets/fonts/trains-icons.scss @@ -1,9 +1,10 @@ -@import "../../styles/variables"; -@import "./variables"; +@use "sass:color"; +@use "src/app/webapp-common/styles/variables" as vars; +@use "src/app/webapp-common/assets/fonts/variables"; @font-face { - font-family: '#{$icomoon-font-family}'; - src: url('./#{$icomoon-font-family}.ttf?rh580d') format('truetype'); + font-family: '#{variables.$icomoon-font-family}'; + src: url('./#{variables.$icomoon-font-family}.ttf?hfr2ih') format('truetype'); font-weight: normal; font-style: normal; font-display: block; @@ -11,7 +12,7 @@ [class^="al-ico-"], [class*=" al-ico-"] { /* use !important to prevent issues with browser extensions that change fonts */ - font-family: '#{$icomoon-font-family}' !important; + font-family: '#{variables.$icomoon-font-family}' !important; speak: never; font-style: normal; font-weight: normal; @@ -24,144 +25,179 @@ -moz-osx-font-smoothing: grayscale; } +.al-ico-app-gateway { + &:before { + content: variables.$al-ico-app-gateway; + } +} +.al-ico-distance { + &:before { + content: variables.$al-ico-distance; + } +} +.al-ico-pin { + &:before { + content: variables.$al-ico-pin; + } +} +.al-ico-pin-off { + &:before { + content: variables.$al-ico-pin-off; + } +} +.al-ico-nearest { + &:before { + content: variables.$al-ico-nearest; + } +} +.al-ico-no-data-code { + &:before { + content: variables.$al-ico-no-data-code; + } +} +.al-ico-no-data-markdown { + &:before { + content: variables.$al-ico-no-data-markdown; + } +} .al-ico-enterprise-rocket { &:before { - content: $al-ico-enterprise-rocket; + content: variables.$al-ico-enterprise-rocket; } } .al-ico-no-data-table { &:before { - content: $al-ico-no-data-table; + content: variables.$al-ico-no-data-table; } } .al-ico-palette { &:before { - content: $al-ico-palette; + content: variables.$al-ico-palette; } } .al-ico-log { &:before { - content: $al-ico-log; + content: variables.$al-ico-log; } } .al-ico-debug-samples { &:before { - content: $al-ico-debug-samples; + content: variables.$al-ico-debug-samples; } } .al-ico-artifacts { &:before { - content: $al-ico-artifacts; + content: variables.$al-ico-artifacts; } } .al-ico-close-circle { &:before { - content: $al-ico-close-circle; + content: variables.$al-ico-close-circle; } } .al-ico-bullhorn { &:before { - content: $al-ico-bullhorn; + content: variables.$al-ico-bullhorn; } } .al-ico-view-horizontal { &:before { - content: $al-ico-view-horizontal; + content: variables.$al-ico-view-horizontal; } } .al-ico-model-endpoints { &:before { - content: $al-ico-model-endpoints; + content: variables.$al-ico-model-endpoints; } } .al-ico-vm { &:before { - content: $al-ico-vm; + content: variables.$al-ico-vm; } } .al-ico-retry { &:before { - content: $al-ico-retry; + content: variables.$al-ico-retry; } } .al-ico-link-off { &:before { - content: $al-ico-link-off; + content: variables.$al-ico-link-off; } } .al-ico-policy { &:before { - content: $al-ico-policy; + content: variables.$al-ico-policy; } } .al-ico-info-group { &:before { - content: $al-ico-info-group; + content: variables.$al-ico-info-group; } } .al-ico-advanced-filters { &:before { - content: $al-ico-advanced-filters; + content: variables.$al-ico-advanced-filters; } } .al-ico-triggers-scheduled { &:before { - content: $al-ico-triggers-scheduled; + content: variables.$al-ico-triggers-scheduled; } } .al-ico-queue { &:before { - content: $al-ico-queue; + content: variables.$al-ico-queue; } } .al-ico-link-plus { &:before { - content: $al-ico-link-plus; + content: variables.$al-ico-link-plus; } } .al-ico-drag-vertical { &:before { - content: $al-ico-drag-vertical; + content: variables.$al-ico-drag-vertical; } } .al-ico-drag-horizontal { &:before { - content: $al-ico-drag-horizontal; + content: variables.$al-ico-drag-horizontal; } } .al-ico-admin-support { &:before { - content: $al-ico-admin-support; + content: variables.$al-ico-admin-support; } } .al-ico-scatter-view { &:before { - content: $al-ico-scatter-view; + content: variables.$al-ico-scatter-view; } }.al-ico-scatter-view { &:before { - content: $al-ico-scatter-view; + content: variables.$al-ico-scatter-view; } } .al-ico-schedulers { &:before { - content: $al-ico-schedulers; + content: variables.$al-ico-schedulers; } } .al-ico-triggers { &:before { - content: $al-ico-triggers; + content: variables.$al-ico-triggers; } } .al-ico-autoscalers { &:before { - content: $al-ico-autoscalers; + content: variables.$al-ico-autoscalers; } } .al-ico-automation { &:before { - content: $al-ico-automation; + content: variables.$al-ico-automation; } } .al-ico-charts-view:before { @@ -172,795 +208,795 @@ } .al-ico-tune { &:before { - content: $al-ico-tune; + content: variables.$al-ico-tune; } } .al-ico-equal-outline { &:before { - content: $al-ico-equal-outline; + content: variables.$al-ico-equal-outline; } } .al-ico-maximize { &:before { - content: $al-ico-maximize; + content: variables.$al-ico-maximize; } } .al-ico-gpu-card { &:before { - content: $al-ico-gpu-card; + content: variables.$al-ico-gpu-card; } } .al-ico-legend { &:before { - content: $al-ico-legend; + content: variables.$al-ico-legend; } } .al-ico-model-filled { &:before { - content: $al-ico-model-filled; + content: variables.$al-ico-model-filled; } } .al-ico-type-report { &:before { - content: $al-ico-type-report; + content: variables.$al-ico-type-report; } } .al-ico-info-circle-outline { &:before { - content: $al-ico-info-circle-outline; + content: variables.$al-ico-info-circle-outline; } } .al-ico-ghost { &:before { - content: $al-ico-ghost; + content: variables.$al-ico-ghost; } } .al-ico-flat-view { &:before { - content: $al-ico-flat-view; + content: variables.$al-ico-flat-view; } } .al-ico-camera { &:before { - content: $al-ico-camera; + content: variables.$al-ico-camera; } } .al-ico-markdown { &:before { - content: $al-ico-markdown; + content: variables.$al-ico-markdown; } } .al-ico-hor-expand { &:before { - content: $al-ico-hor-expand; + content: variables.$al-ico-hor-expand; } } .al-ico-hor-minimize { &:before { - content: $al-ico-hor-minimize; + content: variables.$al-ico-hor-minimize; } } .al-ico-pdf { &:before { - content: $al-ico-pdf; + content: variables.$al-ico-pdf; } } .al-ico-reports { &:before { - content: $al-ico-reports; + content: variables.$al-ico-reports; } } .al-ico-gpu { &:before { - content: $al-ico-gpu; + content: variables.$al-ico-gpu; } } .al-ico-project-path { &:before { - content: $al-ico-project-path; + content: variables.$al-ico-project-path; } } .al-ico-tree-view { &:before { - content: $al-ico-tree-view; + content: variables.$al-ico-tree-view; } } .al-ico-sort-asc { &:before { - content: $al-ico-sort-asc; + content: variables.$al-ico-sort-asc; } } .al-ico-sort-desc { &:before { - content: $al-ico-sort-desc; + content: variables.$al-ico-sort-desc; } } .al-ico-grid-view { &:before { - content: $al-ico-grid-view; + content: variables.$al-ico-grid-view; } } .al-ico-connect { &:before { - content: $al-ico-connect; + content: variables.$al-ico-connect; } } .al-ico-disconnect { &:before { - content: $al-ico-disconnect; + content: variables.$al-ico-disconnect; } } .al-ico-trash-all { &:before { - content: $al-ico-trash-all; + content: variables.$al-ico-trash-all; } } .al-ico-drag { &:before { - content: $al-ico-drag; + content: variables.$al-ico-drag; } } .al-ico-py { &:before { - content: $al-ico-py; + content: variables.$al-ico-py; } } .al-ico-file { &:before { - content: $al-ico-file; + content: variables.$al-ico-file; } } .al-ico-txt { &:before { - content: $al-ico-txt; + content: variables.$al-ico-txt; } } .al-ico-pkl { &:before { - content: $al-ico-pkl; + content: variables.$al-ico-pkl; } } .al-ico-image { &:before { - content: $al-ico-image; + content: variables.$al-ico-image; } } .al-ico-zip { &:before { - content: $al-ico-zip; + content: variables.$al-ico-zip; } } .al-ico-code-file { &:before { - content: $al-ico-code-file; + content: variables.$al-ico-code-file; } } .al-ico-audio { &:before { - content: $al-ico-audio; + content: variables.$al-ico-audio; } } .al-ico-upload { &:before { - content: $al-ico-upload; + content: variables.$al-ico-upload; } } .al-ico-min-panel { &:before { - content: $al-ico-min-panel; + content: variables.$al-ico-min-panel; } } .al-ico-max-panel { &:before { - content: $al-ico-max-panel; + content: variables.$al-ico-max-panel; } } .al-ico-datasets { &:before { - content: $al-ico-datasets; + content: variables.$al-ico-datasets; } } .al-ico-t-logo-b { &:before { - content: $al-ico-t-logo-b; + content: variables.$al-ico-t-logo-b; } } .al-ico-bars-menu { &:before { - content: $al-ico-bars-menu; + content: variables.$al-ico-bars-menu; } } .al-ico-home { &:before { - content: $al-ico-home; + content: variables.$al-ico-home; } } .al-ico-projects { &:before { - content: $al-ico-projects; + content: variables.$al-ico-projects; } } .al-ico-queues { &:before { - content: $al-ico-queues; + content: variables.$al-ico-queues; } } .al-ico-annotator { &:before { - content: $al-ico-annotator; + content: variables.$al-ico-annotator; } } .al-ico-account { &:before { - content: $al-ico-account; + content: variables.$al-ico-account; } } .al-ico-compare { &:before { - content: $al-ico-compare; + content: variables.$al-ico-compare; } } .al-ico-archive { &:before { - content: $al-ico-archive; + content: variables.$al-ico-archive; } } .al-ico-cloud-head { &:before { - content: $al-ico-cloud-head; + content: variables.$al-ico-cloud-head; } } .al-ico-how-to { &:before { - content: $al-ico-how-to; + content: variables.$al-ico-how-to; } } .al-ico-compare-c { &:before { - content: $al-ico-compare-c; + content: variables.$al-ico-compare-c; } } .al-ico-published-title { &:before { - content: $al-ico-published-title; + content: variables.$al-ico-published-title; } } .al-ico-publish { &:before { - content: $al-ico-publish; + content: variables.$al-ico-publish; } } .al-ico-unpublish { &:before { - content: $al-ico-unpublish; + content: variables.$al-ico-unpublish; } } .al-ico-published { &:before { - content: $al-ico-published; + content: variables.$al-ico-published; } } .al-ico-info { &:before { - content: $al-ico-info; + content: variables.$al-ico-info; } } .al-ico-warn { &:before { - content: $al-ico-warn; + content: variables.$al-ico-warn; } } .al-ico-settings { &:before { - content: $al-ico-settings; + content: variables.$al-ico-settings; } } .al-ico-trash { &:before { - content: $al-ico-trash; + content: variables.$al-ico-trash; } } .al-ico-arrow-from-right { &:before { - content: $al-ico-arrow-from-right; + content: variables.$al-ico-arrow-from-right; } } .al-ico-arrow-from-left { &:before { - content: $al-ico-arrow-from-left; + content: variables.$al-ico-arrow-from-left; } } .al-ico-arrow-to-bottom { &:before { - content: $al-ico-arrow-to-bottom; + content: variables.$al-ico-arrow-to-bottom; } } .al-ico-arrow-to-top { &:before { - content: $al-ico-arrow-to-top; + content: variables.$al-ico-arrow-to-top; } } .al-ico-training { &:before { - content: $al-ico-training; + content: variables.$al-ico-training; } } .al-ico-test { &:before { - content: $al-ico-test; + content: variables.$al-ico-test; } } .al-ico-testing { &:before { - content: $al-ico-testing; + content: variables.$al-ico-testing; } } .al-ico-type-training { &:before { - content: $al-ico-type-training; + content: variables.$al-ico-type-training; } } .al-ico-type-testing { &:before { - content: $al-ico-type-testing; + content: variables.$al-ico-type-testing; } } .al-ico-type-data-processing { &:before { - content: $al-ico-type-data-processing; + content: variables.$al-ico-type-data-processing; } } .al-ico-type-qc { &:before { - content: $al-ico-type-qc; + content: variables.$al-ico-type-qc; } } .al-ico-type-service { &:before { - content: $al-ico-type-service; + content: variables.$al-ico-type-service; } } .al-ico-type-optimizer { &:before { - content: $al-ico-type-optimizer; + content: variables.$al-ico-type-optimizer; } } .al-ico-type-monitor { &:before { - content: $al-ico-type-monitor; + content: variables.$al-ico-type-monitor; } } .al-ico-type-inference { &:before { - content: $al-ico-type-inference; + content: variables.$al-ico-type-inference; } } .al-ico-type-application { &:before { - content: $al-ico-type-application; + content: variables.$al-ico-type-application; } } .al-ico-type-controller { &:before { - content: $al-ico-type-controller; + content: variables.$al-ico-type-controller; } } .al-ico-type-custom { &:before { - content: $al-ico-type-custom; + content: variables.$al-ico-type-custom; } } .al-ico-how-to1 { &:before { - content: $al-ico-how-to1; + content: variables.$al-ico-how-to1; } } .al-ico-model { &:before { - content: $al-ico-model; + content: variables.$al-ico-model; } } .al-ico-dialog-x { &:before { - content: $al-ico-dialog-x; + content: variables.$al-ico-dialog-x; } } .al-ico-temp-image { &:before { - content: $al-ico-temp-image; + content: variables.$al-ico-temp-image; } } .al-ico-temp-list-alt { &:before { - content: $al-ico-temp-list-alt; + content: variables.$al-ico-temp-list-alt; } } .al-ico-dog { &:before { - content: $al-ico-dog; + content: variables.$al-ico-dog; } } .al-ico-alert-purple { &:before { - content: $al-ico-alert-purple; + content: variables.$al-ico-alert-purple; } } .al-ico-back { &:before { - content: $al-ico-back; + content: variables.$al-ico-back; } } .al-ico-cat { &:before { - content: $al-ico-cat; + content: variables.$al-ico-cat; } } .al-ico-clone { &:before { - content: $al-ico-clone; + content: variables.$al-ico-clone; } } .al-ico-completed { &:before { - content: $al-ico-completed; + content: variables.$al-ico-completed; } } .al-ico-data-audit { &:before { - content: $al-ico-data-audit; + content: variables.$al-ico-data-audit; } } .al-ico-download-frames { &:before { - content: $al-ico-download-frames; + content: variables.$al-ico-download-frames; } } .al-ico-dropdown-arrow { &:before { - content: $al-ico-dropdown-arrow; + content: variables.$al-ico-dropdown-arrow; } } .al-ico-ellipse-icon { &:before { - content: $al-ico-ellipse-icon; + content: variables.$al-ico-ellipse-icon; } } .al-ico-filter { &:before { - content: $al-ico-filter; + content: variables.$al-ico-filter; } } .al-ico-fit { &:before { - content: $al-ico-fit; + content: variables.$al-ico-fit; } } .al-ico-id { &:before { - content: $al-ico-id; + content: variables.$al-ico-id; } } .al-ico-info-max { &:before { - content: $al-ico-info-max; + content: variables.$al-ico-info-max; } } .al-ico-info-min { &:before { - content: $al-ico-info-min; + content: variables.$al-ico-info-min; } } .al-ico-keypoint { &:before { - content: $al-ico-keypoint; + content: variables.$al-ico-keypoint; } } .al-ico-list-view { &:before { - content: $al-ico-list-view; + content: variables.$al-ico-list-view; } } .al-ico-minus { &:before { - content: $al-ico-minus; + content: variables.$al-ico-minus; } } .al-ico-previous { &:before { - content: $al-ico-previous; + content: variables.$al-ico-previous; } } .al-ico-next { &:before { - content: $al-ico-next; + content: variables.$al-ico-next; } } .al-ico-plus { &:before { - content: $al-ico-plus; + content: variables.$al-ico-plus; } } .al-ico-polygon { &:before { - content: $al-ico-polygon; + content: variables.$al-ico-polygon; } } .al-ico-pytorch-icon { &:before { - content: $al-ico-pytorch-icon; + content: variables.$al-ico-pytorch-icon; } } .al-ico-rectangle { &:before { - content: $al-ico-rectangle; + content: variables.$al-ico-rectangle; } } .al-ico-running { &:before { - content: $al-ico-running; + content: variables.$al-ico-running; } } .al-ico-setup { &:before { - content: $al-ico-setup; + content: variables.$al-ico-setup; } } .al-ico-undo { &:before { - content: $al-ico-undo; + content: variables.$al-ico-undo; } } .al-ico-zoom-1-to-1 { &:before { - content: $al-ico-zoom-1-to-1; + content: variables.$al-ico-zoom-1-to-1; } } .al-ico-zoom-in { &:before { - content: $al-ico-zoom-in; + content: variables.$al-ico-zoom-in; } } .al-ico-zoom-out { &:before { - content: $al-ico-zoom-out; + content: variables.$al-ico-zoom-out; } } .al-ico-search { &:before { - content: $al-ico-search; + content: variables.$al-ico-search; } } .al-ico-zoom-to-fit { &:before { - content: $al-ico-zoom-to-fit; + content: variables.$al-ico-zoom-to-fit; } } .al-ico-reset { &:before { - content: $al-ico-reset; + content: variables.$al-ico-reset; } } .al-ico-import { &:before { - content: $al-ico-import; + content: variables.$al-ico-import; } } .al-ico-export { &:before { - content: $al-ico-export; + content: variables.$al-ico-export; } } .al-ico-between { &:before { - content: $al-ico-between; + content: variables.$al-ico-between; } } .al-ico-next-batch { &:before { - content: $al-ico-next-batch; + content: variables.$al-ico-next-batch; } } .al-ico-prev-batch { &:before { - content: $al-ico-prev-batch; + content: variables.$al-ico-prev-batch; } } .al-ico-back-to-top { &:before { - content: $al-ico-back-to-top; + content: variables.$al-ico-back-to-top; } } .al-ico-redo { &:before { - content: $al-ico-redo; + content: variables.$al-ico-redo; } } .al-ico-download { &:before { - content: $al-ico-download; + content: variables.$al-ico-download; } } .al-ico-edit { &:before { - content: $al-ico-edit; + content: variables.$al-ico-edit; } } .al-ico-pending { &:before { - content: $al-ico-pending; + content: variables.$al-ico-pending; } } .al-ico-sqr-empty { &:before { - content: $al-ico-sqr-empty; + content: variables.$al-ico-sqr-empty; } } .al-ico-success { &:before { - content: $al-ico-success; + content: variables.$al-ico-success; } } .al-ico-alert-outline { &:before { - content: $al-ico-alert-outline; + content: variables.$al-ico-alert-outline; } } .al-ico-github { &:before { - content: $al-ico-github; + content: variables.$al-ico-github; } } .al-ico-description { &:before { - content: $al-ico-description; + content: variables.$al-ico-description; } } .al-ico-line-expand { &:before { - content: $al-ico-line-expand; + content: variables.$al-ico-line-expand; } } .al-ico-user-logout { &:before { - content: $al-ico-user-logout; + content: variables.$al-ico-user-logout; } } .al-ico-documentation { &:before { - content: $al-ico-documentation; + content: variables.$al-ico-documentation; } } .al-ico-frame-rule { &:before { - content: $al-ico-frame-rule; + content: variables.$al-ico-frame-rule; } } .al-ico-source-rule { &:before { - content: $al-ico-source-rule; + content: variables.$al-ico-source-rule; } } .al-ico-get-link-dialog { &:before { - content: $al-ico-get-link-dialog; + content: variables.$al-ico-get-link-dialog; } } .al-ico-iteration { &:before { - content: $al-ico-iteration; + content: variables.$al-ico-iteration; } } .al-ico-mapping { &:before { - content: $al-ico-mapping; + content: variables.$al-ico-mapping; } } .al-ico-labels { &:before { - content: $al-ico-labels; + content: variables.$al-ico-labels; } } .al-ico-augmentation { &:before { - content: $al-ico-augmentation; + content: variables.$al-ico-augmentation; } } .al-ico-filter-outlined { &:before { - content: $al-ico-filter-outlined; + content: variables.$al-ico-filter-outlined; } } .al-ico-input-data { &:before { - content: $al-ico-input-data; + content: variables.$al-ico-input-data; } } .al-ico-help-outlined { &:before { - content: $al-ico-help-outlined; + content: variables.$al-ico-help-outlined; } } .al-ico-email { &:before { - content: $al-ico-email; + content: variables.$al-ico-email; } } .al-ico-tips { &:before { - content: $al-ico-tips; + content: variables.$al-ico-tips; } } .al-ico-caret-right { &:before { - content: $al-ico-caret-right; + content: variables.$al-ico-caret-right; } } .al-ico-currently-active { &:before { - content: $al-ico-currently-active; + content: variables.$al-ico-currently-active; } } .al-ico-complete { &:before { - content: $al-ico-complete; + content: variables.$al-ico-complete; } } .al-ico-access-key { &:before { - content: $al-ico-access-key; + content: variables.$al-ico-access-key; } } .al-ico-alert { &:before { - content: $al-ico-alert; + content: variables.$al-ico-alert; } } .al-ico-users { &:before { - content: $al-ico-users; + content: variables.$al-ico-users; } } .al-ico-exit-archive { &:before { - content: $al-ico-exit-archive; + content: variables.$al-ico-exit-archive; } } .al-ico-calendar { &:before { - content: $al-ico-calendar; + content: variables.$al-ico-calendar; } } .al-ico-time { &:before { - content: $al-ico-time; + content: variables.$al-ico-time; } } .al-ico-add { &:before { - content: $al-ico-add; + content: variables.$al-ico-add; } } .al-ico-time-colon { &:before { - content: $al-ico-time-colon; + content: variables.$al-ico-time-colon; } } .al-ico-regex { &:before { - content: $al-ico-regex; + content: variables.$al-ico-regex; } } .al-ico-filter-on .path1 { &:before { - content: $al-ico-filter-on-path1; + content: variables.$al-ico-filter-on-path1; color: var(--color-tertiary); // don't overwrite // color: rgb(211, 255, 0); } } .al-ico-filter-on .path2 { &:before { - content: $al-ico-filter-on-path2; + content: variables.$al-ico-filter-on-path2; margin-left: -1em; color: var(--color-on-surface); // don't overwrite @@ -968,279 +1004,279 @@ } .al-ico-filter-off { &:before { - content: $al-ico-filter-off; + content: variables.$al-ico-filter-off; color: var(--color-outline); // don't overwrite } } .al-ico-sort-off { &:before { - content: $al-ico-sort-off; + content: variables.$al-ico-sort-off; //color: $blue-400; // don't overwrite } } .al-ico-sort-on-down .path1 { &:before { - content: $al-ico-sort-on-down-path1; + content: variables.$al-ico-sort-on-down-path1; //color: $blue-400; // don't overwrite } } .al-ico-sort-on-down .path2 { &:before { - content: $al-ico-sort-on-down-path2; + content: variables.$al-ico-sort-on-down-path2; margin-left: -1em; //color: $blue-200; // don't overwrite } } .al-ico-sort-on-up .path1 { &:before { - content: $al-ico-sort-on-up-path1; + content: variables.$al-ico-sort-on-up-path1; //color: $blue-400; // don't overwrite } } .al-ico-sort-on-up .path2 { &:before { - content: $al-ico-sort-on-up-path2; + content: variables.$al-ico-sort-on-up-path2; margin-left: -1em; //color: $blue-200; // don't overwrite } } .al-ico-arrow-left { &:before { - content: $al-ico-arrow-left; + content: variables.$al-ico-arrow-left; } } .al-ico-arrow-right { &:before { - content: $al-ico-arrow-right; + content: variables.$al-ico-arrow-right; } } .al-ico-step-backward { &:before { - content: $al-ico-step-backward; + content: variables.$al-ico-step-backward; } } .al-ico-step-forward { &:before { - content: $al-ico-step-forward; + content: variables.$al-ico-step-forward; } } .al-ico-backward { &:before { - content: $al-ico-backward; + content: variables.$al-ico-backward; } } .al-ico-forward { &:before { - content: $al-ico-forward; + content: variables.$al-ico-forward; } } .al-ico-copy-to-clipboard { &:before { - content: $al-ico-copy-to-clipboard; + content: variables.$al-ico-copy-to-clipboard; } } .al-ico-card-example { &:before { - content: $al-ico-card-example; + content: variables.$al-ico-card-example; } } .al-ico-bold { &:before { - content: $al-ico-bold; + content: variables.$al-ico-bold; } } .al-ico-italic { &:before { - content: $al-ico-italic; + content: variables.$al-ico-italic; } } .al-ico-heading { &:before { - content: $al-ico-heading; + content: variables.$al-ico-heading; } } .al-ico-quote { &:before { - content: $al-ico-quote; + content: variables.$al-ico-quote; } } .al-ico-link { &:before { - content: $al-ico-link; + content: variables.$al-ico-link; } } .al-ico-code { &:before { - content: $al-ico-code; + content: variables.$al-ico-code; } } .al-ico-list-bulleted { &:before { - content: $al-ico-list-bulleted; + content: variables.$al-ico-list-bulleted; } } .al-ico-list-numbered { &:before { - content: $al-ico-list-numbered; + content: variables.$al-ico-list-numbered; } } .al-ico-me { &:before { - content: $al-ico-me; + content: variables.$al-ico-me; } } .al-ico-team { &:before { - content: $al-ico-team; + content: variables.$al-ico-team; } } .al-ico-task-desc { &:before { - content: $al-ico-task-desc; + content: variables.$al-ico-task-desc; } } .al-ico-dots { &:before { - content: $al-ico-dots; + content: variables.$al-ico-dots; } } .al-ico-move-to { &:before { - content: $al-ico-move-to; + content: variables.$al-ico-move-to; } } .al-ico-abort { &:before { - content: $al-ico-abort; + content: variables.$al-ico-abort; } } .al-ico-extend { &:before { - content: $al-ico-extend; + content: variables.$al-ico-extend; } } .al-ico-reset-exp { &:before { - content: $al-ico-reset-exp; + content: variables.$al-ico-reset-exp; } } .al-ico-tag { &:before { - content: $al-ico-tag; + content: variables.$al-ico-tag; } } .al-ico-shared-item { &:before { - content: $al-ico-shared-item; + content: variables.$al-ico-shared-item; } } .al-ico-restore { &:before { - content: $al-ico-restore; + content: variables.$al-ico-restore; } } .al-ico-workers { &:before { - content: $al-ico-workers; + content: variables.$al-ico-workers; } } .al-ico-dots-v-menu { &:before { - content: $al-ico-dots-v-menu; + content: variables.$al-ico-dots-v-menu; } } .al-ico-d-menu-down { &:before { - content: $al-ico-d-menu-down; + content: variables.$al-ico-d-menu-down; } } .al-ico-d-menu-up { &:before { - content: $al-ico-d-menu-up; + content: variables.$al-ico-d-menu-up; } } .al-ico-slash { &:before { - content: $al-ico-slash; + content: variables.$al-ico-slash; } } .al-ico-info-circle { &:before { - content: $al-ico-info-circle; + content: variables.$al-ico-info-circle; } } .al-ico-annotate { &:before { - content: $al-ico-annotate; + content: variables.$al-ico-annotate; } } .al-ico-task-desc-outline { &:before { - content: $al-ico-task-desc-outline; + content: variables.$al-ico-task-desc-outline; } } .al-ico-manage-queue { &:before { - content: $al-ico-manage-queue; + content: variables.$al-ico-manage-queue; } } .al-ico-enqueue { &:before { - content: $al-ico-enqueue; + content: variables.$al-ico-enqueue; } } .al-ico-dequeue { &:before { - content: $al-ico-dequeue; + content: variables.$al-ico-dequeue; } } .al-ico-applications { &:before { - content: $al-ico-applications; + content: variables.$al-ico-applications; } } .al-ico-ico-chevron-up { &:before { - content: $al-ico-ico-chevron-up; + content: variables.$al-ico-ico-chevron-up; } } .al-ico-ico-chevron-down { &:before { - content: $al-ico-ico-chevron-down; + content: variables.$al-ico-ico-chevron-down; } } .al-ico-no-data-graph { &:before { - content: $al-ico-no-data-graph; + content: variables.$al-ico-no-data-graph; } } .al-ico-no-scatter-graph { &:before { - content: $al-ico-no-scatter-graph; + content: variables.$al-ico-no-scatter-graph; } } .al-ico-auto-refresh-play .path1 { &:before { - content: $al-ico-auto-refresh-play-path1; + content: variables.$al-ico-auto-refresh-play-path1; //color: $blue-300; // don't overwrite } } .al-ico-auto-refresh-play .path2 { &:before { - content: $al-ico-auto-refresh-play-path2; + content: variables.$al-ico-auto-refresh-play-path2; margin-left: -1em; color: var(--color-tertiary); // don't overwrite } } .al-ico-auto-refresh-pause .path1 { &:before { - content: $al-ico-auto-refresh-pause-path1; + content: variables.$al-ico-auto-refresh-pause-path1; //color: $blue-300; // don't overwrite } } .al-ico-auto-refresh-pause .path2 { &:before { - content: $al-ico-auto-refresh-pause-path2; + content: variables.$al-ico-auto-refresh-pause-path2; margin-left: -1em; color: var(--color-tertiary); // don't overwrite // color: rgb(211, 253, 0); @@ -1248,106 +1284,106 @@ } .al-ico-sqr-ok { &:before { - content: $al-ico-sqr-ok; + content: variables.$al-ico-sqr-ok; } } .al-ico-sqr-cancel { &:before { - content: $al-ico-sqr-cancel; + content: variables.$al-ico-sqr-cancel; } } .al-ico-queue-lg { &:before { - content: $al-ico-queue-lg; + content: variables.$al-ico-queue-lg; } } .al-ico-started-lg { &:before { - content: $al-ico-started-lg; + content: variables.$al-ico-started-lg; } } .al-ico-admin { &:before { - content: $al-ico-admin; + content: variables.$al-ico-admin; } } .al-ico-projects-outlined { &:before { - content: $al-ico-projects-outlined; + content: variables.$al-ico-projects-outlined; } } .al-ico-datasets-outlined { &:before { - content: $al-ico-datasets-outlined; + content: variables.$al-ico-datasets-outlined; } } .al-ico-hide { &:before { - content: $al-ico-hide; + content: variables.$al-ico-hide; } } .al-ico-show { &:before { - content: $al-ico-show; + content: variables.$al-ico-show; } } .al-ico-metadata { &:before { - content: $al-ico-metadata; + content: variables.$al-ico-metadata; } } .al-ico-filter-reset .path1 { &:before { - content: $al-ico-filter-reset-path1; + content: variables.$al-ico-filter-reset-path1; color: var(--color-primary); // don't overwrite } } .al-ico-filter-reset .path2 { &:before { - content: $al-ico-filter-reset-path2; + content: variables.$al-ico-filter-reset-path2; margin-left: -1em; - color: lighten($failed-red, 10%); // don't overwrite + color: color.adjust(vars.$failed-red, $lightness: 10%); // don't overwrite // color: rgb(237, 138, 131); } } .al-ico-version-label { &:before { - content: $al-ico-version-label; + content: variables.$al-ico-version-label; } } .al-ico-plugin { &:before { - content: $al-ico-plugin; + content: variables.$al-ico-plugin; } } .al-ico-abort-all { &:before { - content: $al-ico-abort-all; + content: variables.$al-ico-abort-all; } } .al-ico-refresh { &:before { - content: $al-ico-refresh; + content: variables.$al-ico-refresh; } } .al-ico-rocket { &:before { - content: $al-ico-rocket; + content: variables.$al-ico-rocket; } } .al-ico-logout { &:before { - content: $al-ico-logout; + content: variables.$al-ico-logout; } } .al-ico-settings-alert .path1 { &:before { - content: $al-ico-settings-alert-path1; + content: variables.$al-ico-settings-alert-path1; } } .al-ico-settings-alert .path2 { &:before { - content: $al-ico-settings-alert-path2; + content: variables.$al-ico-settings-alert-path2; margin-left: -1em; color: var(--color-tertiary); // don't overwrite // color: rgb(211, 255, 0); @@ -1355,192 +1391,192 @@ } .al-ico-platform { &:before { - content: $al-ico-platform; + content: variables.$al-ico-platform; } } .al-ico-creditcard { &:before { - content: $al-ico-creditcard; + content: variables.$al-ico-creditcard; } } .al-ico-star { &:before { - content: $al-ico-star; + content: variables.$al-ico-star; } } .al-ico-email-check { &:before { - content: $al-ico-email-check; + content: variables.$al-ico-email-check; } } .al-ico-slack { &:before { - content: $al-ico-slack; + content: variables.$al-ico-slack; } } .al-ico-youtube { &:before { - content: $al-ico-youtube; + content: variables.$al-ico-youtube; } } .al-ico-lock { &:before { - content: $al-ico-lock; + content: variables.$al-ico-lock; } } .al-ico-lock-open { &:before { - content: $al-ico-lock-open; + content: variables.$al-ico-lock-open; } } .al-ico-no-code { &:before { - content: $al-ico-no-code; + content: variables.$al-ico-no-code; } } .al-ico-calendar-checked { &:before { - content: $al-ico-calendar-checked; + content: variables.$al-ico-calendar-checked; } } .al-ico-no-source { &:before { - content: $al-ico-no-source; + content: variables.$al-ico-no-source; } } .al-ico-arrow-up { &:before { - content: $al-ico-arrow-up; + content: variables.$al-ico-arrow-up; } } .al-ico-arrow-down { &:before { - content: $al-ico-arrow-down; + content: variables.$al-ico-arrow-down; } } .al-ico-error-circle { &:before { - content: $al-ico-error-circle; + content: variables.$al-ico-error-circle; } } .al-ico-pipelines { &:before { - content: $al-ico-pipelines; + content: variables.$al-ico-pipelines; } } .al-ico-console { &:before { - content: $al-ico-console; + content: variables.$al-ico-console; } } .al-ico-link-arrow { &:before { - content: $al-ico-link-arrow; + content: variables.$al-ico-link-arrow; } } .al-ico-broken-file { &:before { - content: $al-ico-broken-file; + content: variables.$al-ico-broken-file; } } .al-ico-run { &:before { - content: $al-ico-run; + content: variables.$al-ico-run; } } .al-ico-table-view { &:before { - content: $al-ico-table-view; + content: variables.$al-ico-table-view; } } .al-ico-experiment-view { &:before { - content: $al-ico-experiment-view; + content: variables.$al-ico-experiment-view; } } .al-ico-code-square { &:before { - content: $al-ico-code-square; + content: variables.$al-ico-code-square; } } .al-ico-video { &:before { - content: $al-ico-video; + content: variables.$al-ico-video; } } .al-ico-less-than { &:before { - content: $al-ico-less-than; + content: variables.$al-ico-less-than; } } .al-ico-greater-than { &:before { - content: $al-ico-greater-than; + content: variables.$al-ico-greater-than; } } .al-ico-eye-outline { &:before { - content: $al-ico-eye-outline; + content: variables.$al-ico-eye-outline; } } .al-ico-csv { &:before { - content: $al-ico-csv; + content: variables.$al-ico-csv; } } .al-ico-status-draft { &:before { - content: $al-ico-status-draft; + content: variables.$al-ico-status-draft; } } .al-ico-status-published { &:before { - content: $al-ico-status-published; + content: variables.$al-ico-status-published; } } .al-ico-status-aborted-sec { &:before { - content: $al-ico-status-aborted-sec; + content: variables.$al-ico-status-aborted-sec; } } .al-ico-status-pending { &:before { - content: $al-ico-status-pending; + content: variables.$al-ico-status-pending; } } .al-ico-status-skipped { &:before { - content: $al-ico-status-skipped; + content: variables.$al-ico-status-skipped; } } .al-ico-status-cached { &:before { - content: $al-ico-status-cached; + content: variables.$al-ico-status-cached; } } .al-ico-status-executed { &:before { - content: $al-ico-status-executed; + content: variables.$al-ico-status-executed; } } .al-ico-status-running { &:before { - content: $al-ico-status-running; + content: variables.$al-ico-status-running; } } .al-ico-status-failed { &:before { - content: $al-ico-status-failed; + content: variables.$al-ico-status-failed; } } .al-ico-status-aborted { &:before { - content: $al-ico-status-aborted; + content: variables.$al-ico-status-aborted; } } .al-ico-status-completed { &:before { - content: $al-ico-status-completed; + content: variables.$al-ico-status-completed; } } diff --git a/src/app/webapp-common/assets/fonts/trains.ttf b/src/app/webapp-common/assets/fonts/trains.ttf index 1bf13a87..2ce87032 100644 Binary files a/src/app/webapp-common/assets/fonts/trains.ttf and b/src/app/webapp-common/assets/fonts/trains.ttf differ diff --git a/src/app/webapp-common/assets/fonts/variables.scss b/src/app/webapp-common/assets/fonts/variables.scss index 2773a989..f21874f5 100644 --- a/src/app/webapp-common/assets/fonts/variables.scss +++ b/src/app/webapp-common/assets/fonts/variables.scss @@ -1,301 +1,309 @@ +@use "sass:string"; $icomoon-font-family: "trains" !default; $icomoon-font-path: "fonts" !default; -$al-ico-enterprise-rocket: unquote('"\\ea19"'); -$al-ico-no-data-table: unquote('"\\ea18"'); -$al-ico-palette: unquote('"\\e900"'); -$al-ico-log: unquote('"\\ea16"'); -$al-ico-debug-samples: unquote('"\\ea15"'); -$al-ico-artifacts: unquote('"\\ea14"'); -$al-ico-close-circle: unquote('"\\ea13"'); -$al-ico-bullhorn: unquote('"\\ea12"'); -$al-ico-view-horizontal: unquote('"\\ea11"'); -$al-ico-model-endpoints: unquote('"\\ea08"'); -$al-ico-vm: unquote('"\\ea0c"'); -$al-ico-retry: unquote('"\\ea07"'); -$al-ico-link-off: unquote('"\\ea05"'); -$al-ico-policy: unquote('"\\e9d5"'); -$al-ico-info-group: unquote('"\\e944"'); -$al-ico-advanced-filters: unquote('"\\e911"'); -$al-ico-triggers-scheduled: unquote('"\\ea06"'); -$al-ico-queue: unquote('"\\ea01"'); -$al-ico-link-plus: unquote('"\\ea02"'); -$al-ico-drag-vertical: unquote('"\\ea03"'); -$al-ico-drag-horizontal: unquote('"\\ea04"'); -$al-ico-admin-support: unquote('"\\ea00"'); -$al-ico-scatter-view: unquote('"\\e9ff"'); -$al-ico-schedulers: unquote('"\\e9fb"'); -$al-ico-triggers: unquote('"\\e9fc"'); -$al-ico-autoscalers: unquote('"\\e9fd"'); -$al-ico-automation: unquote('"\\e9fe"'); -$al-ico-charts-view: unquote('"\\e9f9"'); -$al-ico-compact-view: unquote('"\\e9fa"'); -$al-ico-tune: unquote('"\\e9f8"'); -$al-ico-equal-outline: unquote('"\\e9f7"'); -$al-ico-maximize: unquote('"\\e9f6"'); -$al-ico-gpu-card: unquote('"\\e9f4"'); -$al-ico-legend: unquote('"\\e9f3"'); -$al-ico-model-filled: unquote('"\\e9f2"'); -$al-ico-type-report: unquote('"\\e9f1"'); -$al-ico-info-circle-outline: unquote('"\\e9f0"'); -$al-ico-ghost: unquote('"\\e9ef"'); -$al-ico-flat-view: unquote('"\\e9ee"'); -$al-ico-camera: unquote('"\\e9ed"'); -$al-ico-markdown: unquote('"\\e9ec"'); -$al-ico-hor-expand: unquote('"\\e9ea"'); -$al-ico-hor-minimize: unquote('"\\e9eb"'); -$al-ico-pdf: unquote('"\\e9e9"'); -$al-ico-reports: unquote('"\\e9e8"'); -$al-ico-gpu: unquote('"\\e9e7"'); -$al-ico-project-path: unquote('"\\e9e6"'); -$al-ico-tree-view: unquote('"\\e9e5"'); -$al-ico-sort-asc: unquote('"\\e9e3"'); -$al-ico-sort-desc: unquote('"\\e9e4"'); -$al-ico-grid-view: unquote('"\\e9e0"'); -$al-ico-connect: unquote('"\\e9de"'); -$al-ico-disconnect: unquote('"\\e9da"'); -$al-ico-trash-all: unquote('"\\e9d9"'); -$al-ico-drag: unquote('"\\e9d8"'); -$al-ico-py: unquote('"\\e9d7"'); -$al-ico-file: unquote('"\\e9d3"'); -$al-ico-txt: unquote('"\\e9d6"'); -$al-ico-pkl: unquote('"\\e9cd"'); -$al-ico-image: unquote('"\\e958"'); -$al-ico-zip: unquote('"\\e9ce"'); -$al-ico-code-file: unquote('"\\e9a4"'); -$al-ico-audio: unquote('"\\e9d0"'); -$al-ico-upload: unquote('"\\e9cc"'); -$al-ico-min-panel: unquote('"\\e9ca"'); -$al-ico-max-panel: unquote('"\\e9cb"'); -$al-ico-datasets: unquote('"\\e90b"'); -$al-ico-t-logo-b: unquote('"\\e908"'); -$al-ico-bars-menu: unquote('"\\e933"'); -$al-ico-home: unquote('"\\e909"'); -$al-ico-projects: unquote('"\\e90a"'); -$al-ico-queues: unquote('"\\e90c"'); -$al-ico-annotator: unquote('"\\e90d"'); -$al-ico-account: unquote('"\\e998"'); -$al-ico-compare: unquote('"\\e93f"'); -$al-ico-archive: unquote('"\\e92c"'); -$al-ico-cloud-head: unquote('"\\e9a6"'); -$al-ico-how-to: unquote('"\\e997"'); -$al-ico-compare-c: unquote('"\\e93a"'); -$al-ico-published-title: unquote('"\\e9d2"'); -$al-ico-publish: unquote('"\\e9cf"'); -$al-ico-unpublish: unquote('"\\ea0f"'); -$al-ico-published: unquote('"\\e9d1"'); -$al-ico-info: unquote('"\\e99b"'); -$al-ico-warn: unquote('"\\ea10"'); -$al-ico-settings: unquote('"\\e9e2"'); -$al-ico-trash: unquote('"\\ea0b"'); -$al-ico-arrow-from-right: unquote('"\\e92e"'); -$al-ico-arrow-from-left: unquote('"\\e92d"'); -$al-ico-arrow-to-bottom: unquote('"\\e92f"'); -$al-ico-arrow-to-top: unquote('"\\e930"'); -$al-ico-training: unquote('"\\e90e"'); -$al-ico-test: unquote('"\\ea09"'); -$al-ico-testing: unquote('"\\ea0a"'); -$al-ico-type-training: unquote('"\\ea33"'); -$al-ico-type-testing: unquote('"\\ea32"'); -$al-ico-type-data-processing: unquote('"\\ea2c"'); -$al-ico-type-qc: unquote('"\\ea30"'); -$al-ico-type-service: unquote('"\\ea31"'); -$al-ico-type-optimizer: unquote('"\\ea2f"'); -$al-ico-type-monitor: unquote('"\\ea2e"'); -$al-ico-type-inference: unquote('"\\ea2d"'); -$al-ico-type-application: unquote('"\\ea29"'); -$al-ico-type-controller: unquote('"\\ea2a"'); -$al-ico-type-custom: unquote('"\\ea2b"'); -$al-ico-how-to1: unquote('"\\e90f"'); -$al-ico-model: unquote('"\\e910"'); -$al-ico-dialog-x: unquote('"\\e980"'); -$al-ico-temp-image: unquote('"\\e912"'); -$al-ico-temp-list-alt: unquote('"\\e913"'); -$al-ico-dog: unquote('"\\e914"'); -$al-ico-alert-purple: unquote('"\\e927"'); -$al-ico-back: unquote('"\\e931"'); -$al-ico-cat: unquote('"\\e936"'); -$al-ico-clone: unquote('"\\e937"'); -$al-ico-completed: unquote('"\\e940"'); -$al-ico-data-audit: unquote('"\\e943"'); -$al-ico-download-frames: unquote('"\\e982"'); -$al-ico-dropdown-arrow: unquote('"\\e984"'); -$al-ico-ellipse-icon: unquote('"\\e986"'); -$al-ico-filter: unquote('"\\e992"'); -$al-ico-fit: unquote('"\\e995"'); -$al-ico-id: unquote('"\\e999"'); -$al-ico-info-max: unquote('"\\e99c"'); -$al-ico-info-min: unquote('"\\e99d"'); -$al-ico-keypoint: unquote('"\\e99f"'); -$al-ico-list-view: unquote('"\\e9a5"'); -$al-ico-minus: unquote('"\\e9a7"'); -$al-ico-previous: unquote('"\\e9bb"'); -$al-ico-next: unquote('"\\e9af"'); -$al-ico-plus: unquote('"\\e9b8"'); -$al-ico-polygon: unquote('"\\e9b9"'); -$al-ico-pytorch-icon: unquote('"\\e9d4"'); -$al-ico-rectangle: unquote('"\\e9db"'); -$al-ico-running: unquote('"\\e9df"'); -$al-ico-setup: unquote('"\\ea0d"'); -$al-ico-undo: unquote('"\\ea0e"'); -$al-ico-zoom-1-to-1: unquote('"\\ea25"'); -$al-ico-zoom-in: unquote('"\\ea26"'); -$al-ico-zoom-out: unquote('"\\ea27"'); -$al-ico-search: unquote('"\\e9e1"'); -$al-ico-zoom-to-fit: unquote('"\\ea28"'); -$al-ico-reset: unquote('"\\e9dd"'); -$al-ico-import: unquote('"\\e99e"'); -$al-ico-export: unquote('"\\e9b6"'); -$al-ico-between: unquote('"\\e934"'); -$al-ico-next-batch: unquote('"\\e9b0"'); -$al-ico-prev-batch: unquote('"\\e9ba"'); -$al-ico-back-to-top: unquote('"\\e932"'); -$al-ico-redo: unquote('"\\e9dc"'); -$al-ico-download: unquote('"\\e981"'); -$al-ico-edit: unquote('"\\e983"'); -$al-ico-pending: unquote('"\\e9b7"'); -$al-ico-sqr-empty: unquote('"\\e925"'); -$al-ico-success: unquote('"\\e9f5"'); -$al-ico-alert-outline: unquote('"\\e926"'); -$al-ico-github: unquote('"\\e915"'); -$al-ico-description: unquote('"\\e916"'); -$al-ico-line-expand: unquote('"\\e901"'); -$al-ico-user-logout: unquote('"\\e902"'); -$al-ico-documentation: unquote('"\\e919"'); -$al-ico-frame-rule: unquote('"\\e91a"'); -$al-ico-source-rule: unquote('"\\e91b"'); -$al-ico-get-link-dialog: unquote('"\\e91d"'); -$al-ico-iteration: unquote('"\\e91e"'); -$al-ico-mapping: unquote('"\\e91f"'); -$al-ico-labels: unquote('"\\e920"'); -$al-ico-augmentation: unquote('"\\e921"'); -$al-ico-filter-outlined: unquote('"\\e922"'); -$al-ico-input-data: unquote('"\\e923"'); -$al-ico-help-outlined: unquote('"\\e924"'); -$al-ico-email: unquote('"\\e928"'); -$al-ico-tips: unquote('"\\e929"'); -$al-ico-caret-right: unquote('"\\e92a"'); -$al-ico-currently-active: unquote('"\\e92b"'); -$al-ico-complete: unquote('"\\e92b"'); -$al-ico-access-key: unquote('"\\e935"'); -$al-ico-alert: unquote('"\\e9b3"'); -$al-ico-users: unquote('"\\e91c"'); -$al-ico-exit-archive: unquote('"\\e938"'); -$al-ico-calendar: unquote('"\\e939"'); -$al-ico-time: unquote('"\\e93b"'); -$al-ico-add: unquote('"\\e93c"'); -$al-ico-time-colon: unquote('"\\e93d"'); -$al-ico-regex: unquote('"\\e93e"'); -$al-ico-filter-on-path1: unquote('"\\e941"'); -$al-ico-filter-on-path2: unquote('"\\e942"'); -$al-ico-filter-off: unquote('"\\e945"'); -$al-ico-sort-off: unquote('"\\e946"'); -$al-ico-sort-on-down-path1: unquote('"\\e947"'); -$al-ico-sort-on-down-path2: unquote('"\\e948"'); -$al-ico-sort-on-up-path1: unquote('"\\e949"'); -$al-ico-sort-on-up-path2: unquote('"\\e94a"'); -$al-ico-arrow-left: unquote('"\\e94b"'); -$al-ico-arrow-right: unquote('"\\e94c"'); -$al-ico-step-backward: unquote('"\\e94d"'); -$al-ico-step-forward: unquote('"\\e94e"'); -$al-ico-backward: unquote('"\\e94f"'); -$al-ico-forward: unquote('"\\e950"'); -$al-ico-copy-to-clipboard: unquote('"\\e951"'); -$al-ico-card-example: unquote('"\\e952"'); -$al-ico-bold: unquote('"\\e953"'); -$al-ico-italic: unquote('"\\e954"'); -$al-ico-heading: unquote('"\\e955"'); -$al-ico-quote: unquote('"\\e956"'); -$al-ico-link: unquote('"\\e957"'); -$al-ico-code: unquote('"\\e959"'); -$al-ico-list-bulleted: unquote('"\\e95a"'); -$al-ico-list-numbered: unquote('"\\e95b"'); -$al-ico-me: unquote('"\\e95c"'); -$al-ico-team: unquote('"\\e95d"'); -$al-ico-task-desc: unquote('"\\e95e"'); -$al-ico-dots: unquote('"\\e95f"'); -$al-ico-move-to: unquote('"\\e960"'); -$al-ico-abort: unquote('"\\e961"'); -$al-ico-extend: unquote('"\\e962"'); -$al-ico-reset-exp: unquote('"\\e963"'); -$al-ico-tag: unquote('"\\e964"'); -$al-ico-shared-item: unquote('"\\e965"'); -$al-ico-restore: unquote('"\\e966"'); -$al-ico-workers: unquote('"\\e967"'); -$al-ico-dots-v-menu: unquote('"\\e96a"'); -$al-ico-d-menu-down: unquote('"\\e96b"'); -$al-ico-d-menu-up: unquote('"\\e96c"'); -$al-ico-slash: unquote('"\\e96d"'); -$al-ico-info-circle: unquote('"\\e96e"'); -$al-ico-annotate: unquote('"\\e96f"'); -$al-ico-task-desc-outline: unquote('"\\e970"'); -$al-ico-manage-queue: unquote('"\\e968"'); -$al-ico-enqueue: unquote('"\\e969"'); -$al-ico-dequeue: unquote('"\\e971"'); -$al-ico-applications: unquote('"\\e972"'); -$al-ico-ico-chevron-up: unquote('"\\e973"'); -$al-ico-ico-chevron-down: unquote('"\\e974"'); -$al-ico-no-data-graph: unquote('"\\e975"'); -$al-ico-no-scatter-graph: unquote('"\\e976"'); -$al-ico-auto-refresh-play-path1: unquote('"\\e977"'); -$al-ico-auto-refresh-play-path2: unquote('"\\e978"'); -$al-ico-auto-refresh-pause-path1: unquote('"\\e979"'); -$al-ico-auto-refresh-pause-path2: unquote('"\\e97a"'); -$al-ico-sqr-ok: unquote('"\\e97b"'); -$al-ico-sqr-cancel: unquote('"\\e97c"'); -$al-ico-queue-lg: unquote('"\\e97d"'); -$al-ico-started-lg: unquote('"\\e97e"'); -$al-ico-admin: unquote('"\\e97f"'); -$al-ico-projects-outlined: unquote('"\\e985"'); -$al-ico-datasets-outlined: unquote('"\\e987"'); -$al-ico-hide: unquote('"\\e988"'); -$al-ico-show: unquote('"\\e989"'); -$al-ico-metadata: unquote('"\\e98a"'); -$al-ico-filter-reset-path1: unquote('"\\e98b"'); -$al-ico-filter-reset-path2: unquote('"\\e98c"'); -$al-ico-version-label: unquote('"\\e98d"'); -$al-ico-plugin: unquote('"\\e98e"'); -$al-ico-abort-all: unquote('"\\e98f"'); -$al-ico-refresh: unquote('"\\e990"'); -$al-ico-rocket: unquote('"\\e991"'); -$al-ico-logout: unquote('"\\e993"'); -$al-ico-settings-alert-path1: unquote('"\\e994"'); -$al-ico-settings-alert-path2: unquote('"\\e996"'); -$al-ico-platform: unquote('"\\e99a"'); -$al-ico-creditcard: unquote('"\\e9a0"'); -$al-ico-star: unquote('"\\e9a1"'); -$al-ico-email-check: unquote('"\\e9a2"'); -$al-ico-slack: unquote('"\\e9a3"'); -$al-ico-youtube: unquote('"\\e9a8"'); -$al-ico-lock: unquote('"\\e9a9"'); -$al-ico-lock-open: unquote('"\\e9aa"'); -$al-ico-no-code: unquote('"\\e9ab"'); -$al-ico-calendar-checked: unquote('"\\e9ad"'); -$al-ico-no-source: unquote('"\\e9ae"'); -$al-ico-arrow-up: unquote('"\\e9b1"'); -$al-ico-arrow-down: unquote('"\\e9b2"'); -$al-ico-error-circle: unquote('"\\e9b4"'); -$al-ico-pipelines: unquote('"\\e9b5"'); -$al-ico-console: unquote('"\\e9bc"'); -$al-ico-link-arrow: unquote('"\\e9bf"'); -$al-ico-broken-file: unquote('"\\e9c0"'); -$al-ico-run: unquote('"\\e9c1"'); -$al-ico-table-view: unquote('"\\e9c2"'); -$al-ico-experiment-view: unquote('"\\e9c3"'); -$al-ico-code-square: unquote('"\\e9c4"'); -$al-ico-video: unquote('"\\e9c5"'); -$al-ico-less-than: unquote('"\\e9c6"'); -$al-ico-greater-than: unquote('"\\e9c7"'); -$al-ico-eye-outline: unquote('"\\e9c8"'); -$al-ico-csv: unquote('"\\e9c9"'); -$al-ico-status-draft: unquote('"\\e903"'); -$al-ico-status-published: unquote('"\\e906"'); -$al-ico-status-aborted-sec: unquote('"\\e918"'); -$al-ico-status-pending: unquote('"\\e904"'); -$al-ico-status-skipped: unquote('"\\e9bd"'); -$al-ico-status-cached: unquote('"\\e9be"'); -$al-ico-status-executed: unquote('"\\e9ac"'); -$al-ico-status-running: unquote('"\\e905"'); -$al-ico-status-failed: unquote('"\\e907"'); -$al-ico-status-aborted: unquote('"\\e917"'); -$al-ico-status-completed: unquote('"\\ea17"'); +$al-ico-app-gateway: string.unquote('"\\ea20"'); +$al-ico-distance: string.unquote('"\\ea1f"'); +$al-ico-pin: string.unquote('"\\ea1d"'); +$al-ico-pin-off: string.unquote('"\\ea1c"'); +$al-ico-nearest: string.unquote('"\\ea1e"'); +$al-ico-no-data-code: string.unquote('"\\ea1b"'); +$al-ico-no-data-markdown: string.unquote('"\\ea1a"'); +$al-ico-enterprise-rocket: string.unquote('"\\ea19"'); +$al-ico-no-data-table: string.unquote('"\\ea18"'); +$al-ico-palette: string.unquote('"\\e900"'); +$al-ico-log: string.unquote('"\\ea16"'); +$al-ico-debug-samples: string.unquote('"\\ea15"'); +$al-ico-artifacts: string.unquote('"\\ea14"'); +$al-ico-close-circle: string.unquote('"\\ea13"'); +$al-ico-bullhorn: string.unquote('"\\ea12"'); +$al-ico-view-horizontal: string.unquote('"\\ea11"'); +$al-ico-model-endpoints: string.unquote('"\\ea08"'); +$al-ico-vm: string.unquote('"\\ea0c"'); +$al-ico-retry: string.unquote('"\\ea07"'); +$al-ico-link-off: string.unquote('"\\ea05"'); +$al-ico-policy: string.unquote('"\\e9d5"'); +$al-ico-info-group: string.unquote('"\\e944"'); +$al-ico-advanced-filters: string.unquote('"\\e911"'); +$al-ico-triggers-scheduled: string.unquote('"\\ea06"'); +$al-ico-queue: string.unquote('"\\ea01"'); +$al-ico-link-plus: string.unquote('"\\ea02"'); +$al-ico-drag-vertical: string.unquote('"\\ea03"'); +$al-ico-drag-horizontal: string.unquote('"\\ea04"'); +$al-ico-admin-support: string.unquote('"\\ea00"'); +$al-ico-scatter-view: string.unquote('"\\e9ff"'); +$al-ico-schedulers: string.unquote('"\\e9fb"'); +$al-ico-triggers: string.unquote('"\\e9fc"'); +$al-ico-autoscalers: string.unquote('"\\e9fd"'); +$al-ico-automation: string.unquote('"\\e9fe"'); +$al-ico-charts-view: string.unquote('"\\e9f9"'); +$al-ico-compact-view: string.unquote('"\\e9fa"'); +$al-ico-tune: string.unquote('"\\e9f8"'); +$al-ico-equal-outline: string.unquote('"\\e9f7"'); +$al-ico-maximize: string.unquote('"\\e9f6"'); +$al-ico-gpu-card: string.unquote('"\\e9f4"'); +$al-ico-legend: string.unquote('"\\e9f3"'); +$al-ico-model-filled: string.unquote('"\\e9f2"'); +$al-ico-type-report: string.unquote('"\\e9f1"'); +$al-ico-info-circle-outline: string.unquote('"\\e9f0"'); +$al-ico-ghost: string.unquote('"\\e9ef"'); +$al-ico-flat-view: string.unquote('"\\e9ee"'); +$al-ico-camera: string.unquote('"\\e9ed"'); +$al-ico-markdown: string.unquote('"\\e9ec"'); +$al-ico-hor-expand: string.unquote('"\\e9ea"'); +$al-ico-hor-minimize: string.unquote('"\\e9eb"'); +$al-ico-pdf: string.unquote('"\\e9e9"'); +$al-ico-reports: string.unquote('"\\e9e8"'); +$al-ico-gpu: string.unquote('"\\e9e7"'); +$al-ico-project-path: string.unquote('"\\e9e6"'); +$al-ico-tree-view: string.unquote('"\\e9e5"'); +$al-ico-sort-asc: string.unquote('"\\e9e3"'); +$al-ico-sort-desc: string.unquote('"\\e9e4"'); +$al-ico-grid-view: string.unquote('"\\e9e0"'); +$al-ico-connect: string.unquote('"\\e9de"'); +$al-ico-disconnect: string.unquote('"\\e9da"'); +$al-ico-trash-all: string.unquote('"\\e9d9"'); +$al-ico-drag: string.unquote('"\\e9d8"'); +$al-ico-py: string.unquote('"\\e9d7"'); +$al-ico-file: string.unquote('"\\e9d3"'); +$al-ico-txt: string.unquote('"\\e9d6"'); +$al-ico-pkl: string.unquote('"\\e9cd"'); +$al-ico-image: string.unquote('"\\e958"'); +$al-ico-zip: string.unquote('"\\e9ce"'); +$al-ico-code-file: string.unquote('"\\e9a4"'); +$al-ico-audio: string.unquote('"\\e9d0"'); +$al-ico-upload: string.unquote('"\\e9cc"'); +$al-ico-min-panel: string.unquote('"\\e9ca"'); +$al-ico-max-panel: string.unquote('"\\e9cb"'); +$al-ico-datasets: string.unquote('"\\e90b"'); +$al-ico-t-logo-b: string.unquote('"\\e908"'); +$al-ico-bars-menu: string.unquote('"\\e933"'); +$al-ico-home: string.unquote('"\\e909"'); +$al-ico-projects: string.unquote('"\\e90a"'); +$al-ico-queues: string.unquote('"\\e90c"'); +$al-ico-annotator: string.unquote('"\\e90d"'); +$al-ico-account: string.unquote('"\\e998"'); +$al-ico-compare: string.unquote('"\\e93f"'); +$al-ico-archive: string.unquote('"\\e92c"'); +$al-ico-cloud-head: string.unquote('"\\e9a6"'); +$al-ico-how-to: string.unquote('"\\e997"'); +$al-ico-compare-c: string.unquote('"\\e93a"'); +$al-ico-published-title: string.unquote('"\\e9d2"'); +$al-ico-publish: string.unquote('"\\e9cf"'); +$al-ico-unpublish: string.unquote('"\\ea0f"'); +$al-ico-published: string.unquote('"\\e9d1"'); +$al-ico-info: string.unquote('"\\e99b"'); +$al-ico-warn: string.unquote('"\\ea10"'); +$al-ico-settings: string.unquote('"\\e9e2"'); +$al-ico-trash: string.unquote('"\\ea0b"'); +$al-ico-arrow-from-right: string.unquote('"\\e92e"'); +$al-ico-arrow-from-left: string.unquote('"\\e92d"'); +$al-ico-arrow-to-bottom: string.unquote('"\\e92f"'); +$al-ico-arrow-to-top: string.unquote('"\\e930"'); +$al-ico-training: string.unquote('"\\e90e"'); +$al-ico-test: string.unquote('"\\ea09"'); +$al-ico-testing: string.unquote('"\\ea0a"'); +$al-ico-type-training: string.unquote('"\\ea33"'); +$al-ico-type-testing: string.unquote('"\\ea32"'); +$al-ico-type-data-processing: string.unquote('"\\ea2c"'); +$al-ico-type-qc: string.unquote('"\\ea30"'); +$al-ico-type-service: string.unquote('"\\ea31"'); +$al-ico-type-optimizer: string.unquote('"\\ea2f"'); +$al-ico-type-monitor: string.unquote('"\\ea2e"'); +$al-ico-type-inference: string.unquote('"\\ea2d"'); +$al-ico-type-application: string.unquote('"\\ea29"'); +$al-ico-type-controller: string.unquote('"\\ea2a"'); +$al-ico-type-custom: string.unquote('"\\ea2b"'); +$al-ico-how-to1: string.unquote('"\\e90f"'); +$al-ico-model: string.unquote('"\\e910"'); +$al-ico-dialog-x: string.unquote('"\\e980"'); +$al-ico-temp-image: string.unquote('"\\e912"'); +$al-ico-temp-list-alt: string.unquote('"\\e913"'); +$al-ico-dog: string.unquote('"\\e914"'); +$al-ico-alert-purple: string.unquote('"\\e927"'); +$al-ico-back: string.unquote('"\\e931"'); +$al-ico-cat: string.unquote('"\\e936"'); +$al-ico-clone: string.unquote('"\\e937"'); +$al-ico-completed: string.unquote('"\\e940"'); +$al-ico-data-audit: string.unquote('"\\e943"'); +$al-ico-download-frames: string.unquote('"\\e982"'); +$al-ico-dropdown-arrow: string.unquote('"\\e984"'); +$al-ico-ellipse-icon: string.unquote('"\\e986"'); +$al-ico-filter: string.unquote('"\\e992"'); +$al-ico-fit: string.unquote('"\\e995"'); +$al-ico-id: string.unquote('"\\e999"'); +$al-ico-info-max: string.unquote('"\\e99c"'); +$al-ico-info-min: string.unquote('"\\e99d"'); +$al-ico-keypoint: string.unquote('"\\e99f"'); +$al-ico-list-view: string.unquote('"\\e9a5"'); +$al-ico-minus: string.unquote('"\\e9a7"'); +$al-ico-previous: string.unquote('"\\e9bb"'); +$al-ico-next: string.unquote('"\\e9af"'); +$al-ico-plus: string.unquote('"\\e9b8"'); +$al-ico-polygon: string.unquote('"\\e9b9"'); +$al-ico-pytorch-icon: string.unquote('"\\e9d4"'); +$al-ico-rectangle: string.unquote('"\\e9db"'); +$al-ico-running: string.unquote('"\\e9df"'); +$al-ico-setup: string.unquote('"\\ea0d"'); +$al-ico-undo: string.unquote('"\\ea0e"'); +$al-ico-zoom-1-to-1: string.unquote('"\\ea25"'); +$al-ico-zoom-in: string.unquote('"\\ea26"'); +$al-ico-zoom-out: string.unquote('"\\ea27"'); +$al-ico-search: string.unquote('"\\e9e1"'); +$al-ico-zoom-to-fit: string.unquote('"\\ea28"'); +$al-ico-reset: string.unquote('"\\e9dd"'); +$al-ico-import: string.unquote('"\\e99e"'); +$al-ico-export: string.unquote('"\\e9b6"'); +$al-ico-between: string.unquote('"\\e934"'); +$al-ico-next-batch: string.unquote('"\\e9b0"'); +$al-ico-prev-batch: string.unquote('"\\e9ba"'); +$al-ico-back-to-top: string.unquote('"\\e932"'); +$al-ico-redo: string.unquote('"\\e9dc"'); +$al-ico-download: string.unquote('"\\e981"'); +$al-ico-edit: string.unquote('"\\e983"'); +$al-ico-pending: string.unquote('"\\e9b7"'); +$al-ico-sqr-empty: string.unquote('"\\e925"'); +$al-ico-success: string.unquote('"\\e9f5"'); +$al-ico-alert-outline: string.unquote('"\\e926"'); +$al-ico-github: string.unquote('"\\e915"'); +$al-ico-description: string.unquote('"\\e916"'); +$al-ico-line-expand: string.unquote('"\\e901"'); +$al-ico-user-logout: string.unquote('"\\e902"'); +$al-ico-documentation: string.unquote('"\\e919"'); +$al-ico-frame-rule: string.unquote('"\\e91a"'); +$al-ico-source-rule: string.unquote('"\\e91b"'); +$al-ico-get-link-dialog: string.unquote('"\\e91d"'); +$al-ico-iteration: string.unquote('"\\e91e"'); +$al-ico-mapping: string.unquote('"\\e91f"'); +$al-ico-labels: string.unquote('"\\e920"'); +$al-ico-augmentation: string.unquote('"\\e921"'); +$al-ico-filter-outlined: string.unquote('"\\e922"'); +$al-ico-input-data: string.unquote('"\\e923"'); +$al-ico-help-outlined: string.unquote('"\\e924"'); +$al-ico-email: string.unquote('"\\e928"'); +$al-ico-tips: string.unquote('"\\e929"'); +$al-ico-caret-right: string.unquote('"\\e92a"'); +$al-ico-currently-active: string.unquote('"\\e92b"'); +$al-ico-complete: string.unquote('"\\e92b"'); +$al-ico-access-key: string.unquote('"\\e935"'); +$al-ico-alert: string.unquote('"\\e9b3"'); +$al-ico-users: string.unquote('"\\e91c"'); +$al-ico-exit-archive: string.unquote('"\\e938"'); +$al-ico-calendar: string.unquote('"\\e939"'); +$al-ico-time: string.unquote('"\\e93b"'); +$al-ico-add: string.unquote('"\\e93c"'); +$al-ico-time-colon: string.unquote('"\\e93d"'); +$al-ico-regex: string.unquote('"\\e93e"'); +$al-ico-filter-on-path1: string.unquote('"\\e941"'); +$al-ico-filter-on-path2: string.unquote('"\\e942"'); +$al-ico-filter-off: string.unquote('"\\e945"'); +$al-ico-sort-off: string.unquote('"\\e946"'); +$al-ico-sort-on-down-path1: string.unquote('"\\e947"'); +$al-ico-sort-on-down-path2: string.unquote('"\\e948"'); +$al-ico-sort-on-up-path1: string.unquote('"\\e949"'); +$al-ico-sort-on-up-path2: string.unquote('"\\e94a"'); +$al-ico-arrow-left: string.unquote('"\\e94b"'); +$al-ico-arrow-right: string.unquote('"\\e94c"'); +$al-ico-step-backward: string.unquote('"\\e94d"'); +$al-ico-step-forward: string.unquote('"\\e94e"'); +$al-ico-backward: string.unquote('"\\e94f"'); +$al-ico-forward: string.unquote('"\\e950"'); +$al-ico-copy-to-clipboard: string.unquote('"\\e951"'); +$al-ico-card-example: string.unquote('"\\e952"'); +$al-ico-bold: string.unquote('"\\e953"'); +$al-ico-italic: string.unquote('"\\e954"'); +$al-ico-heading: string.unquote('"\\e955"'); +$al-ico-quote: string.unquote('"\\e956"'); +$al-ico-link: string.unquote('"\\e957"'); +$al-ico-code: string.unquote('"\\e959"'); +$al-ico-list-bulleted: string.unquote('"\\e95a"'); +$al-ico-list-numbered: string.unquote('"\\e95b"'); +$al-ico-me: string.unquote('"\\e95c"'); +$al-ico-team: string.unquote('"\\e95d"'); +$al-ico-task-desc: string.unquote('"\\e95e"'); +$al-ico-dots: string.unquote('"\\e95f"'); +$al-ico-move-to: string.unquote('"\\e960"'); +$al-ico-abort: string.unquote('"\\e961"'); +$al-ico-extend: string.unquote('"\\e962"'); +$al-ico-reset-exp: string.unquote('"\\e963"'); +$al-ico-tag: string.unquote('"\\e964"'); +$al-ico-shared-item: string.unquote('"\\e965"'); +$al-ico-restore: string.unquote('"\\e966"'); +$al-ico-workers: string.unquote('"\\e967"'); +$al-ico-dots-v-menu: string.unquote('"\\e96a"'); +$al-ico-d-menu-down: string.unquote('"\\e96b"'); +$al-ico-d-menu-up: string.unquote('"\\e96c"'); +$al-ico-slash: string.unquote('"\\e96d"'); +$al-ico-info-circle: string.unquote('"\\e96e"'); +$al-ico-annotate: string.unquote('"\\e96f"'); +$al-ico-task-desc-outline: string.unquote('"\\e970"'); +$al-ico-manage-queue: string.unquote('"\\e968"'); +$al-ico-enqueue: string.unquote('"\\e969"'); +$al-ico-dequeue: string.unquote('"\\e971"'); +$al-ico-applications: string.unquote('"\\e972"'); +$al-ico-ico-chevron-up: string.unquote('"\\e973"'); +$al-ico-ico-chevron-down: string.unquote('"\\e974"'); +$al-ico-no-data-graph: string.unquote('"\\e975"'); +$al-ico-no-scatter-graph: string.unquote('"\\e976"'); +$al-ico-auto-refresh-play-path1: string.unquote('"\\e977"'); +$al-ico-auto-refresh-play-path2: string.unquote('"\\e978"'); +$al-ico-auto-refresh-pause-path1: string.unquote('"\\e979"'); +$al-ico-auto-refresh-pause-path2: string.unquote('"\\e97a"'); +$al-ico-sqr-ok: string.unquote('"\\e97b"'); +$al-ico-sqr-cancel: string.unquote('"\\e97c"'); +$al-ico-queue-lg: string.unquote('"\\e97d"'); +$al-ico-started-lg: string.unquote('"\\e97e"'); +$al-ico-admin: string.unquote('"\\e97f"'); +$al-ico-projects-outlined: string.unquote('"\\e985"'); +$al-ico-datasets-outlined: string.unquote('"\\e987"'); +$al-ico-hide: string.unquote('"\\e988"'); +$al-ico-show: string.unquote('"\\e989"'); +$al-ico-metadata: string.unquote('"\\e98a"'); +$al-ico-filter-reset-path1: string.unquote('"\\e98b"'); +$al-ico-filter-reset-path2: string.unquote('"\\e98c"'); +$al-ico-version-label: string.unquote('"\\e98d"'); +$al-ico-plugin: string.unquote('"\\e98e"'); +$al-ico-abort-all: string.unquote('"\\e98f"'); +$al-ico-refresh: string.unquote('"\\e990"'); +$al-ico-rocket: string.unquote('"\\e991"'); +$al-ico-logout: string.unquote('"\\e993"'); +$al-ico-settings-alert-path1: string.unquote('"\\e994"'); +$al-ico-settings-alert-path2: string.unquote('"\\e996"'); +$al-ico-platform: string.unquote('"\\e99a"'); +$al-ico-creditcard: string.unquote('"\\e9a0"'); +$al-ico-star: string.unquote('"\\e9a1"'); +$al-ico-email-check: string.unquote('"\\e9a2"'); +$al-ico-slack: string.unquote('"\\e9a3"'); +$al-ico-youtube: string.unquote('"\\e9a8"'); +$al-ico-lock: string.unquote('"\\e9a9"'); +$al-ico-lock-open: string.unquote('"\\e9aa"'); +$al-ico-no-code: string.unquote('"\\e9ab"'); +$al-ico-calendar-checked: string.unquote('"\\e9ad"'); +$al-ico-no-source: string.unquote('"\\e9ae"'); +$al-ico-arrow-up: string.unquote('"\\e9b1"'); +$al-ico-arrow-down: string.unquote('"\\e9b2"'); +$al-ico-error-circle: string.unquote('"\\e9b4"'); +$al-ico-pipelines: string.unquote('"\\e9b5"'); +$al-ico-console: string.unquote('"\\e9bc"'); +$al-ico-link-arrow: string.unquote('"\\e9bf"'); +$al-ico-broken-file: string.unquote('"\\e9c0"'); +$al-ico-run: string.unquote('"\\e9c1"'); +$al-ico-table-view: string.unquote('"\\e9c2"'); +$al-ico-experiment-view: string.unquote('"\\e9c3"'); +$al-ico-code-square: string.unquote('"\\e9c4"'); +$al-ico-video: string.unquote('"\\e9c5"'); +$al-ico-less-than: string.unquote('"\\e9c6"'); +$al-ico-greater-than: string.unquote('"\\e9c7"'); +$al-ico-eye-outline: string.unquote('"\\e9c8"'); +$al-ico-csv: string.unquote('"\\e9c9"'); +$al-ico-status-draft: string.unquote('"\\e903"'); +$al-ico-status-published: string.unquote('"\\e906"'); +$al-ico-status-aborted-sec: string.unquote('"\\e918"'); +$al-ico-status-pending: string.unquote('"\\e904"'); +$al-ico-status-skipped: string.unquote('"\\e9bd"'); +$al-ico-status-cached: string.unquote('"\\e9be"'); +$al-ico-status-executed: string.unquote('"\\e9ac"'); +$al-ico-status-running: string.unquote('"\\e905"'); +$al-ico-status-failed: string.unquote('"\\e907"'); +$al-ico-status-aborted: string.unquote('"\\e917"'); +$al-ico-status-completed: string.unquote('"\\ea17"'); diff --git a/src/app/webapp-common/assets/icons/ico-markdown.svg b/src/app/webapp-common/assets/icons/ico-markdown.svg deleted file mode 100644 index 399e25ce..00000000 --- a/src/app/webapp-common/assets/icons/ico-markdown.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/app/webapp-common/assets/icons/ico-queue-animate.svg b/src/app/webapp-common/assets/icons/ico-queue-animate.svg deleted file mode 100644 index 051b2772..00000000 --- a/src/app/webapp-common/assets/icons/ico-queue-animate.svg +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/app/webapp-common/assets/icons/ico-started-animate.svg b/src/app/webapp-common/assets/icons/ico-started-animate.svg deleted file mode 100644 index 0a5c0f7b..00000000 --- a/src/app/webapp-common/assets/icons/ico-started-animate.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/app/webapp-common/assets/icons/pytorch-ignite.svg b/src/app/webapp-common/assets/icons/pytorch-ignite.svg deleted file mode 100644 index f90ae77b..00000000 --- a/src/app/webapp-common/assets/icons/pytorch-ignite.svg +++ /dev/null @@ -1,3234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - allegro ai - - diff --git a/src/app/webapp-common/assets/marketing/apps-SSH-dark.png b/src/app/webapp-common/assets/marketing/apps-SSH-dark.png index b02da6e5..a9c30b31 100644 Binary files a/src/app/webapp-common/assets/marketing/apps-SSH-dark.png and b/src/app/webapp-common/assets/marketing/apps-SSH-dark.png differ diff --git a/src/app/webapp-common/assets/marketing/apps-SSH-light.png b/src/app/webapp-common/assets/marketing/apps-SSH-light.png index e443189d..d46c1ca3 100644 Binary files a/src/app/webapp-common/assets/marketing/apps-SSH-light.png and b/src/app/webapp-common/assets/marketing/apps-SSH-light.png differ diff --git a/src/app/webapp-common/assets/marketing/apps-autoscaler-dark.png b/src/app/webapp-common/assets/marketing/apps-autoscaler-dark.png index db4bbab0..6ab64814 100644 Binary files a/src/app/webapp-common/assets/marketing/apps-autoscaler-dark.png and b/src/app/webapp-common/assets/marketing/apps-autoscaler-dark.png differ diff --git a/src/app/webapp-common/assets/marketing/apps-autoscaler-light.png b/src/app/webapp-common/assets/marketing/apps-autoscaler-light.png index e96782f3..908a30e5 100644 Binary files a/src/app/webapp-common/assets/marketing/apps-autoscaler-light.png and b/src/app/webapp-common/assets/marketing/apps-autoscaler-light.png differ diff --git a/src/app/webapp-common/assets/marketing/apps-remote-dark.png b/src/app/webapp-common/assets/marketing/apps-remote-dark.png new file mode 100644 index 00000000..923c88be Binary files /dev/null and b/src/app/webapp-common/assets/marketing/apps-remote-dark.png differ diff --git a/src/app/webapp-common/assets/marketing/apps-remote-light.png b/src/app/webapp-common/assets/marketing/apps-remote-light.png new file mode 100644 index 00000000..69a3d5b7 Binary files /dev/null and b/src/app/webapp-common/assets/marketing/apps-remote-light.png differ diff --git a/src/app/webapp-common/assets/marketing/hpds-query-fhd-dark.png b/src/app/webapp-common/assets/marketing/hpds-query-fhd-dark.png index 92c742e1..eced5633 100644 Binary files a/src/app/webapp-common/assets/marketing/hpds-query-fhd-dark.png and b/src/app/webapp-common/assets/marketing/hpds-query-fhd-dark.png differ diff --git a/src/app/webapp-common/assets/marketing/hpds-query-fhd-light.png b/src/app/webapp-common/assets/marketing/hpds-query-fhd-light.png index 2c1ae891..6bb3879d 100644 Binary files a/src/app/webapp-common/assets/marketing/hpds-query-fhd-light.png and b/src/app/webapp-common/assets/marketing/hpds-query-fhd-light.png differ diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.html b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.html index 0bdd791f..e33cbdf3 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.html +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.html @@ -1,7 +1,7 @@ @if (activated) { @if (signIsNeeded$() === false) { @if (noPermissions$() === false) { - + @@ -22,6 +22,7 @@ [identifier]="'report-widget'" [width]="400" [xAxisType]="xaxis" + [moveLegendToTitle]="checkIfLegendToTitle(plotData)" [isCompare]="$any(plotData)?.plotParsed?.data?.[0]?.type !== 'parcoords'" [noMargins]="true" [hideMaximize]="hideMaximize" @@ -85,7 +86,7 @@ - + diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.ts b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.ts index 246c476a..8dfcfb57 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.ts +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.ts @@ -9,7 +9,7 @@ import { } from '@angular/core'; import {Store} from '@ngrx/store'; import {MatDialog} from '@angular/material/dialog'; -import {debounceTime, filter, map, switchMap, take} from 'rxjs/operators'; +import {filter, map, switchMap, take} from 'rxjs/operators'; import {Environment} from '../environments/base'; import {getParcoords, getPlot, getSample, getScalar, getSingleValues, reportsPlotlyReady} from './app.actions'; import {appFeature} from './app.reducer'; @@ -17,7 +17,7 @@ import {ExtFrame} from '@common/shared/single-graph/plotly-graph-base'; import {DebugSample} from '@common/shared/debug-sample/debug-sample.reducer'; import {getSignedUrl, setS3Credentials} from '@common/core/actions/common-auth.actions'; import {ConfigurationService} from '@common/shared/services/configuration.service'; -import {_mergeVariants, allowedMergedTypes, convertMultiPlots, createMultiSingleValuesChart, mergeMultiMetricsGroupedVariant, prepareGraph, prepareMultiPlots, tryParseJson} from '@common/tasks/tasks.utils'; +import {_mergeVariants, allowedMergedTypes, checkIfLegendToTitle, convertMultiPlots, createMultiSingleValuesChart, mergeMultiMetricsGroupedVariant, prepareGraph, prepareMultiPlots, tryParseJson} from '@common/tasks/tasks.utils'; import {selectSignedUrl} from '@common/core/reducers/common-auth-reducer'; import {loadExternalLibrary} from '@common/shared/utils/load-external-library'; import {ImageViewerComponent} from '@common/shared/debug-sample/image-viewer/image-viewer.component'; @@ -40,8 +40,6 @@ import { } from '@common/shared/single-value-summary-table/single-value-summary-table.component'; import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; import {SingleGraphStateModule} from '@common/shared/single-graph/single-graph-state.module'; -import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; -import {BreakpointObserver, BreakpointState} from '@angular/cdk/layout'; import {DOCUMENT} from '@angular/common'; @@ -52,27 +50,26 @@ export interface SelectedMetricVariant extends MetricVariantResult { } @Component({ - selector: 'sm-widget-root', - templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - SingleGraphStateModule, - SingleGraphModule, - DebugSampleModule, - ParallelCoordinatesGraphComponent, - SingleValueSummaryTableComponent - ] + selector: 'sm-widget-root', + templateUrl: './app.component.html', + styleUrls: ['./app.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + SingleGraphStateModule, + SingleGraphModule, + DebugSampleModule, + ParallelCoordinatesGraphComponent, + SingleValueSummaryTableComponent + ] }) export class AppComponent implements OnInit { private store = inject(Store); private configService = inject(ConfigurationService); private dialog = inject(MatDialog); private cdr = inject(ChangeDetectorRef); - private breakpointObserver = inject(BreakpointObserver); private renderer = inject(Renderer2); private readonly document = inject(DOCUMENT); + protected readonly checkIfLegendToTitle = checkIfLegendToTitle; protected title = 'report-widgets'; public plotData: ExtFrame; @@ -87,12 +84,12 @@ export class AppComponent implements OnInit { public hideMaximize: 'show' | 'hide' | 'disabled' = 'show'; protected signIsNeeded$ = this.store.selectSignal(appFeature.selectSignIsNeeded); protected noPermissions$ = this.store.selectSignal(appFeature.selectNoPermissions); - public isDarkTheme: boolean; + private tasksData = this.store.selectSignal(appFeature.selectTaskData); + public isDarkTheme = false; public externalTool = false; public parcoordsData: { experiments: ExtraTask[]; params: string[]; metrics: SelectedMetricVariant[] }; @ViewChild(SingleGraphComponent) 'singleGraph': SingleGraphComponent; public singleValueData: EventsGetTaskSingleValueMetricsResponseValues[]; - public webappLink: string; public readonly xaxis: ScalarKeyEnum; @HostListener('window:resize') @@ -106,7 +103,6 @@ export class AppComponent implements OnInit { }); this.searchParams = new URLSearchParams(window.location.search); this.type = this.searchParams.get('type') as WidgetTypes; - this.webappLink = this.buildSourceLink(this.searchParams, '*', null); this.singleGraphHeight = window.innerHeight; this.otherSearchParams = this.getOtherSearchParams(); this.xaxis = this.searchParams.get('xaxis') as ScalarKeyEnum; @@ -136,7 +132,7 @@ export class AppComponent implements OnInit { if (!(window.top as any).holdIframe) { this.activate(); } - } catch (e) { + } catch { this.externalTool = true; this.hideMaximize = 'hide'; console.log('no-access-to-parent-window'); @@ -180,7 +176,7 @@ export class AppComponent implements OnInit { if (window.top.document.body.parentElement.className) { this.isDarkTheme = window.top.document.body.parentElement.classList.contains('dark-mode'); } - } catch (e) { + } catch { this.isDarkTheme = this.searchParams.get('light') ? this.searchParams.get('light') === 'false' : !this.isDarkTheme; } this.renderer.addClass(this.document.documentElement, `${this.isDarkTheme ? 'dark' : 'light'}-mode`); @@ -219,15 +215,15 @@ export class AppComponent implements OnInit { take(1)) .subscribe((metricsPlots) => { this.plotLoaded = true; - if (this.searchParams.getAll('objects').length < 2) { + if (this.tasksData().sourceTasks.length < 2) { const merged = this.mergeVariants(metricsPlots as ReportsApiMultiplotsResponse); this.plotData = {...Object.values(merged)[0], ...Object.values(merged)[0].plotParsed}; } else { const {merged} = prepareMultiPlots(metricsPlots as ReportsApiMultiplotsResponse); const newGraphs = convertMultiPlots(merged); const originalObject = this.searchParams.get('objects'); - const series = this.searchParams.get('series'); - this.plotData = series ? Object.values(newGraphs)[0].find(a => (a.data[0] as any).seriesName === series) : + const series = this.searchParams.getAll('series'); + this.plotData = series?.length > 0 ? Object.values(newGraphs)[0].find(a => series.includes((a.data[0] as any).seriesName)) : Object.values(newGraphs)[0]?.find(a => originalObject === (a.task ?? a.data[0].task)) ?? Object.values(newGraphs)[0]?.[0]; } @@ -436,16 +432,23 @@ export class AppComponent implements OnInit { return {metric: lastMetric.metric, variant: lastMetric.variant}; } - private buildSourceLink(searchParams: URLSearchParams, project: string, tasks: string[]): string { + protected navigateToSource() { + const a = document.createElement('a'); + a.href = this.buildSourceLink(this.searchParams, '*'); + a.target = '_blank'; + a.click(); + } + + private buildSourceLink(searchParams: URLSearchParams, project: string): string { const isModels = searchParams.has('models') || this.searchParams.get('objectType') === 'model'; const objects = searchParams.getAll('objects'); const variants = searchParams.getAll('variants'); const metricsPath = searchParams.getAll('metrics'); let entityIds = objects.length > 0 ? objects : searchParams.getAll(isModels ? 'models' : 'tasks'); - if (entityIds.length === 0 && tasks?.length > 0) { - entityIds = tasks; + if (entityIds.length === 0 && this.tasksData().sourceTasks.length > 0) { + entityIds = this.tasksData().sourceTasks.slice(0,100); } - const isCompare = entityIds.length > 1; + const isCompare =this.tasksData().sourceTasks.length > 1; let url = `${window.location.origin.replace('4201', '4200')}/projects/${project ?? '*'}/`; if (isCompare) { url += `${isModels ? 'compare-models;ids=' : 'compare-tasks;ids='}${entityIds.filter(id => !!id).join(',')}/${ @@ -469,11 +472,11 @@ export class AppComponent implements OnInit { switch (type) { case 'single': case 'scalar': - return 'info-output/metrics/scalar'; + return 'output/metrics/scalar'; case 'plot': - return 'info-output/metrics/plots'; + return 'output/metrics/plots'; case 'sample': - return 'info-output/debugImages'; + return 'output/debugImages'; } } return ''; diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.effects.ts b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.effects.ts index 24fac04e..c9efc37e 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.effects.ts +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.effects.ts @@ -61,12 +61,13 @@ export class AppEffects { {headers: this.getHeaders(action.company)} )), mergeMap((res) => [ - setPlotData({data: res.data.plots as unknown as ReportsApiMultiplotsResponse}), setTaskData({ sourceProject: (res.data.tasks[0]?.project as any).id, sourceTasks: res.data.tasks.map(t => t.id), appId: (res.data.tasks[0] as any)?.application?.app_id?.id - })]), + }), + setPlotData({data: res.data.plots as unknown as ReportsApiMultiplotsResponse}) + ]), catchError(error => [requestFailed(error), ...(error.status === 403 ? [setNoPermissions()] : [])]) )); diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/styles/customizations/_index.scss b/src/app/webapp-common/clearml-applications/report-widgets/src/app/styles/customizations/_index.scss index 188f6191..8dc1a62f 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/styles/customizations/_index.scss +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/styles/customizations/_index.scss @@ -1,16 +1,18 @@ -@import "customizations/colors"; -@import "customizations/form-fields"; -@import "customizations/dialogs"; -@import "customizations/scrollbar"; -@import "customizations/tooltip"; -@import "customizations/slide-toggle"; +@forward "customizations/colors"; +@forward "customizations/form-fields"; +@forward "customizations/dialogs"; +@forward "customizations/scrollbar"; +@forward "customizations/tooltip"; +@forward "customizations/slide-toggle"; +@use "customizations/colors"; +@use "customizations/dialogs"; + body { color: var(--color-on-surface-variant); } @mixin components($theme) { - @include generate-colors($theme); - @include form-fields($theme); - @include dialogs($theme); + @include colors.generate-colors($theme); + @include dialogs.dialogs($theme); } diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/styles/styles.scss b/src/app/webapp-common/clearml-applications/report-widgets/src/app/styles/styles.scss index d6498eea..c000f69f 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/styles/styles.scss +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/styles/styles.scss @@ -1,22 +1,24 @@ @use '../../../../../../../../node_modules/@angular/material/index' as mat; +@use "../../../../../styles/variables"; -//@import "../assets/fonts/trains-icons.scss"; -//@import "reboot"; -//@import "minimal-bootstrap"; -//@import "layout"; -//@import "utilities"; -@import "themes"; -@import "./customizations"; -@import "../../../../../styles/icons"; //needs a clean from sass vars - +//@use "../assets/fonts/trains-icons.scss"; +//@use "reboot"; +//@use "minimal-bootstrap"; +//@use "layout"; +//@use "utilities"; +@use "themes"; +@use "./customizations"; +@forward "../../../../../styles/icons"; //needs a clean from sass vars :root { - @include mat.all-component-themes($theme); - @include components($theme); + @include mat.all-component-themes(themes.$theme); + @include mat.system-level-colors(themes.$theme); + @include customizations.components(themes.$theme); &.dark-mode { - @include mat.all-component-colors($dark-theme); - @include components($dark-theme); + @include mat.all-component-colors(themes.$dark-theme); + @include mat.system-level-colors(themes.$dark-theme); + @include customizations.components(themes.$dark-theme); } } @@ -26,7 +28,6 @@ $purple: #4d66ff; $white-primary-text: rgba(white, 0.87); $dark-primary-text: rgba(black, 0.87); -@import "../../../../../styles/variables"; * { margin: 0; @@ -38,6 +39,10 @@ html, body { height: 100%; overflow: hidden; --mat-select-trigger-text-size: 14px; + + &.dark-mode { + background-color: var(--color-surface-container-lowest); + } } body { diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/webapp-common b/src/app/webapp-common/clearml-applications/report-widgets/src/app/webapp-common deleted file mode 120000 index 11a54ed3..00000000 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/webapp-common +++ /dev/null @@ -1 +0,0 @@ -../../../../ \ No newline at end of file diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/webapp-common/webapp-common b/src/app/webapp-common/clearml-applications/report-widgets/src/app/webapp-common/webapp-common new file mode 120000 index 00000000..543872ea --- /dev/null +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/webapp-common/webapp-common @@ -0,0 +1 @@ +../../../../../assets/ \ No newline at end of file diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/environments/base.ts b/src/app/webapp-common/clearml-applications/report-widgets/src/environments/base.ts index 0c3900cb..fa09a63f 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/environments/base.ts +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/environments/base.ts @@ -25,7 +25,6 @@ export interface Environment { fileBaseUrl: string; displayedServerUrls?: {apiServer?: string; filesServer?: string}; alternativeFilesBaseUrl?: string; - demo: boolean; headerPrefix: string; version: string; userKey: string; @@ -76,7 +75,6 @@ export const BASE_ENV: Environment = { accountAdministration: true, production: true, cookieName: 'allegro_token', - demo: false, updateCheck: false, autoLogin: false, apiBaseUrl: null, diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/index.html b/src/app/webapp-common/clearml-applications/report-widgets/src/index.html index b8111055..5a85909c 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/index.html +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/index.html @@ -6,6 +6,18 @@ + diff --git a/src/app/webapp-common/common-search/containers/common-search/common-search.component.html b/src/app/webapp-common/common-search/containers/common-search/common-search.component.html index 42d84576..93d93a06 100644 --- a/src/app/webapp-common/common-search/containers/common-search/common-search.component.html +++ b/src/app/webapp-common/common-search/containers/common-search/common-search.component.html @@ -1,10 +1,15 @@ - +
+ +
+ } - + } -@if (searchActive) { - @if ((isSearching$ | ngrxPush)) { - - } @else { - - } -} diff --git a/src/app/webapp-common/common-search/containers/common-search/common-search.component.scss b/src/app/webapp-common/common-search/containers/common-search/common-search.component.scss index 20fb6df4..dc26f203 100644 --- a/src/app/webapp-common/common-search/containers/common-search/common-search.component.scss +++ b/src/app/webapp-common/common-search/containers/common-search/common-search.component.scss @@ -1,14 +1,28 @@ -@import "variables"; - :host { - position: absolute; - height: 32px; display: flex; align-items: center; - right: 110px; - // background-color: var(--color-surface-container-low); z-index: 1; - padding-left: 20px; + + .search-icon-container { + width: 284px; + position: absolute; + + .search-icon { + transition: left 0.35s ease-in-out; + left: 0; + z-index: 1; + + + &.open { + left: 247px; + } + + .al-ico-search { + color: var(--color-primary); + } + + } + } .search-container { width: 0; @@ -24,11 +38,11 @@ .regexp { position: absolute; - right: 8px; + right: 36px; &.active { - color: var(--color-on-secondary); - background-color: var(--color-secondary); + color: var(--color-on-primary); + background-color: var(--color-primary); } &.error { @@ -37,7 +51,7 @@ } .al-ico-error-circle { - right: 48px; + right: 60px; } .al-ico-dialog-x { diff --git a/src/app/webapp-common/common-search/containers/common-search/common-search.component.ts b/src/app/webapp-common/common-search/containers/common-search/common-search.component.ts index 90d9f8e3..e7433728 100644 --- a/src/app/webapp-common/common-search/containers/common-search/common-search.component.ts +++ b/src/app/webapp-common/common-search/containers/common-search/common-search.component.ts @@ -1,23 +1,23 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, ViewChild} from '@angular/core'; +import {ChangeDetectionStrategy, Component, inject, input, OnDestroy, viewChild} from '@angular/core'; import {ActivatedRoute, NavigationEnd, Router} from '@angular/router'; import {Store} from '@ngrx/store'; -import {setSearching, setSearchQuery} from '../../common-search.actions'; -import {SearchState, selectIsSearching, selectPlaceholder, selectSearchQuery} from '../../common-search.reducer'; -import {Observable} from 'rxjs'; -import {debounceTime, distinctUntilChanged, filter, tap} from 'rxjs/operators'; +import {resetSearch, setSearching, setSearchQuery} from '../../common-search.actions'; +import {selectIsSearching, selectPlaceholder, selectSearchQuery} from '../../common-search.reducer'; +import {Observable, timer} from 'rxjs'; +import {debounce, distinctUntilChanged, filter, tap} from 'rxjs/operators'; import {SearchComponent} from '@common/shared/ui-components/inputs/search/search.component'; import {PushPipe} from '@ngrx/component'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; import {MatIconButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; +import {takeUntilDestroyed, toObservable} from '@angular/core/rxjs-interop'; @Component({ selector: 'sm-common-search', templateUrl: './common-search.component.html', styleUrls: ['./common-search.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, imports: [ SearchComponent, PushPipe, @@ -27,22 +27,31 @@ import {MatIcon} from '@angular/material/icon'; MatIcon ] }) -export class CommonSearchComponent implements OnInit { - public searchQuery$: Observable; - public isSearching$: Observable; - public searchPlaceholder$: Observable; - public searchActive: boolean; +export class CommonSearchComponent implements OnDestroy { + private store = inject(Store); + private router = inject(Router); + private route = inject(ActivatedRoute); + public searchActive = input(false); - @ViewChild(SearchComponent) searchElem: SearchComponent; public regExp = false; private closeTimer: number; - minChars = 3; - public regexError: boolean; + protected minChars = 3; + protected regexError: boolean; + protected searchQuery$ = this.store.select(selectSearchQuery).pipe(tap(searchQuery => this.regExp = searchQuery?.regExp)); + protected isSearching = this.store.selectSignal(selectIsSearching); + protected searchPlaceholder = this.store.selectSignal(selectPlaceholder); + + protected searchElem = viewChild(SearchComponent); + private waitForRegex = false + protected showRegex$: Observable; + + constructor() { + this.showRegex$ = toObservable(this.isSearching).pipe(debounce((isSearching) => timer(isSearching ? 350 : 0))); - constructor(private store: Store, private router: Router, private route: ActivatedRoute, private cdr: ChangeDetectorRef) { this.router.events .pipe( + takeUntilDestroyed(), filter(event => event instanceof NavigationEnd), distinctUntilChanged((pe: NavigationEnd, ce: NavigationEnd) => { const pURL = new URLSearchParams(pe.url.split('?')?.[1]); @@ -60,12 +69,12 @@ export class CommonSearchComponent implements OnInit { if (query) { this.openSearch(); } else { - if (document.activeElement !== this.searchElem.searchBarInput.nativeElement) { - this.store.dispatch(setSearching({payload: false})) + if (document.activeElement !== this.searchElem()?.searchBarInput().nativeElement) { + this.store.dispatch(setSearching({payload: false})); } } - }) - if( this.route.snapshot.queryParams.q) { + }); + if (this.route.snapshot.queryParams.q) { const query = this.route.snapshot.queryParams?.q ?? ''; const qregex = this.route.snapshot.queryParams?.qreg ?? false; this.store.dispatch(setSearchQuery({ @@ -73,19 +82,12 @@ export class CommonSearchComponent implements OnInit { regExp: qregex, original: query })); - setTimeout( () => this.openSearch()); + setTimeout(() => this.openSearch()); } } - ngOnInit() { - this.searchQuery$ = this.store.select(selectSearchQuery).pipe(tap(searchQuery => this.regExp = searchQuery?.regExp)); - this.isSearching$ = this.store.select(selectIsSearching); - this.searchPlaceholder$ = this.store.select(selectPlaceholder).pipe(debounceTime(0)); - this.router.events.pipe(filter(event => event instanceof NavigationEnd)) - .subscribe(() => { - this.setSearchActive(); - }); - setTimeout(this.setSearchActive.bind(this)); + ngOnDestroy(): void { + this.store.dispatch(resetSearch()); } @@ -101,9 +103,10 @@ export class CommonSearchComponent implements OnInit { replaceUrl: true, queryParamsHandling: 'merge', queryParams: { - q: query || undefined + q: query || undefined, + qreg: this.regExp ? this.regExp : undefined } - }) + }); } catch (e) { this.regexError = e.message?.replace(/:.+:/, ':'); @@ -112,44 +115,37 @@ export class CommonSearchComponent implements OnInit { openSearch() { window.clearTimeout(this.closeTimer); - this.searchElem.searchBarInput.nativeElement.focus(); + this.searchElem().searchBarInput().nativeElement.focus(); this.store.dispatch(setSearching({payload: true})); } onSearchFocusOut() { - if (!this.searchElem.searchBarInput.nativeElement.value) { + window.clearTimeout(this.closeTimer); + if (!this.waitForRegex && !this.searchElem().searchBarInput().nativeElement.value) { this.closeTimer = window.setTimeout(() => this.store.dispatch(setSearching({payload: false})), 200); } } - private setSearchActive() { - let route = this.route.snapshot; - let showSearch = false; - while (route.firstChild) { - route = route.firstChild; - if (route.data.search !== undefined) { - showSearch = route.data.search; - } - } - this.searchActive = showSearch; - this.cdr.detectChanges(); - } clearSearch() { - this.searchElem.clear(); + this.searchElem().clear(); this.store.dispatch(setSearching({payload: false})); document.body.focus(); - setTimeout( () =>this.searchElem.searchBarInput.nativeElement.blur(), 100); + setTimeout(() => this.searchElem().searchBarInput().nativeElement.blur(), 100); } toggleRegExp() { this.regExp = !this.regExp; - this.router.navigate([], { - relativeTo: this.route, - replaceUrl: true, - queryParamsHandling: 'merge', - queryParams: { - qreg: this.regExp ? this.regExp : undefined} - }) + if (this.searchElem().searchBarInput().nativeElement.value) { + this.router.navigate([], { + relativeTo: this.route, + replaceUrl: true, + queryParamsHandling: 'merge', + queryParams: {qreg: this.regExp ? this.regExp : undefined} + }); + } + this.waitForRegex = true; + window.setTimeout(() => this.waitForRegex = false, 200); + this.searchElem().searchBarInput().nativeElement.focus(); } } diff --git a/src/app/webapp-common/core/actions/layout.actions.ts b/src/app/webapp-common/core/actions/layout.actions.ts index 19a16651..efa52b9a 100644 --- a/src/app/webapp-common/core/actions/layout.actions.ts +++ b/src/app/webapp-common/core/actions/layout.actions.ts @@ -75,7 +75,7 @@ export const systemThemeChanged = createAction( export const setForcedTheme = createAction( VIEW_PREFIX + '[set forced theme]', - props<{ theme: 'light' | 'dark'; default: 'light' | 'dark' }>() + props<{ theme: 'light' | 'dark'; default?: 'light' | 'dark' }>() ); export const setThemeColors = createAction( diff --git a/src/app/webapp-common/core/actions/projects.actions.ts b/src/app/webapp-common/core/actions/projects.actions.ts index 33a87fd6..d3bad88c 100644 --- a/src/app/webapp-common/core/actions/projects.actions.ts +++ b/src/app/webapp-common/core/actions/projects.actions.ts @@ -58,6 +58,11 @@ export const setSelectedProject = createAction( props<{ project: Project }>() ); +export const setSelectedProjectSimple = createAction( + PROJECTS_PREFIX + 'SET_SELECTED_PROJECT_SIMPLE', + props<{ project: Project }>() +); + export const setProjectAncestors = createAction( PROJECTS_PREFIX + 'SET_PROJECT_ANCESTORS', props<{ projects: Project[] }>() diff --git a/src/app/webapp-common/core/effects/common-auth.effects.ts b/src/app/webapp-common/core/effects/common-auth.effects.ts index b8eb3c54..ca66e981 100644 --- a/src/app/webapp-common/core/effects/common-auth.effects.ts +++ b/src/app/webapp-common/core/effects/common-auth.effects.ts @@ -28,7 +28,7 @@ import {isGoogleCloudUrl, SignResponse} from '@common/settings/admin/base-admin- import {isFileserverUrl} from '~/shared/utils/url'; import {selectRouterQueryParams} from '@common/core/reducers/router-reducer'; import {concatLatestFrom} from '@ngrx/operators'; -import {selectExtraCredentials} from '~/core/reducers/auth.reducers'; +import {selectCompanyPreSignServices, selectExtraCredentials} from '~/core/reducers/auth.reducers'; import {ErrorService} from '@common/shared/services/error.service'; @Injectable() @@ -183,13 +183,15 @@ export class CommonAuthEffects { mergeMap(([action, prevSigns]) => forkJoin(action.sign.map(req => of(action).pipe( - concatLatestFrom(() => - this.store.select(selectSignedUrl(req.url)) - ), - switchMap(([, signedUrl]) => (!signedUrl?.expires || signedUrl.expires < (new Date()).getTime() || - (isFileserverUrl(req.url) && req.config?.disableCache) || - (req.config?.error && isGoogleCloudUrl(req.url) && !signedUrl.signed.includes('X-Amz-Signature')) - ) ? this.adminService.signUrlIfNeeded(req.url, req.config, prevSigns[req.url]) : of({type: 'none'})), + concatLatestFrom(() => [ + this.store.select(selectSignedUrl(req.url)), + this.store.select(selectCompanyPreSignServices) + ]), + switchMap(([, signedUrl, preSignService]) => (!signedUrl?.expires || signedUrl.expires < (new Date()).getTime() || + (isFileserverUrl(req.url) && req.config?.disableCache) || + (req.config?.error && isGoogleCloudUrl(req.url) && !signedUrl.signed.includes('X-Amz-Signature')) || + preSignService.length > 0 + ) ? this.adminService.signUrlIfNeeded(req.url, req.config, prevSigns[req.url]) : of({type: 'none'})), map(res => ({res, orgUrl: req.url})) ) )).pipe( @@ -250,9 +252,9 @@ export class CommonAuthEffects { .pipe( concatLatestFrom(() => this.store.select(selectS3BucketCredentialsBucketCredentials)), switchMap(([data, bucketCredentials]) => { - const actions = [...this.signAfterPopup]; - this.signAfterPopup = []; + let actions = []; if (data) { + actions = [...this.signAfterPopup]; if (!data.success) { const emptyCredentials = bucketCredentials.find((cred => cred?.Bucket === data.Bucket)) === undefined; const dontAskAgainForBucketName = emptyCredentials ? '' : data.Bucket + data.Endpoint; @@ -260,6 +262,7 @@ export class CommonAuthEffects { } return [authActions.saveS3Credentials({newCredential: data}), ...actions]; } + this.signAfterPopup = []; return actions; }), finalize(() => action?.credentials?.Bucket && delete this.openPopup[action.credentials.Bucket]) diff --git a/src/app/webapp-common/core/reducers/projects.reducer.ts b/src/app/webapp-common/core/reducers/projects.reducer.ts index fa66f3d1..1886f8f0 100644 --- a/src/app/webapp-common/core/reducers/projects.reducer.ts +++ b/src/app/webapp-common/core/reducers/projects.reducer.ts @@ -49,11 +49,11 @@ export interface RootProjects { projectTags: string[]; companyTags: string[]; systemTags: string[]; - tagsColors: { [tag: string]: TagColor }; + tagsColors: Record; tagsFilterByProject: boolean; - graphVariant: { [project: string]: ISmCol[] }; + graphVariant: Record; graphData: ScatterPlotPoint[]; - hiddenStates: { [state: string]: boolean }; + hiddenStates: Record; lastUpdate: string; users: User[]; allUsers: User[]; @@ -61,9 +61,9 @@ export interface RootProjects { showHidden: boolean; hideExamples: boolean; blockUserScript: boolean; - mainPageTagsFilter: { [Feature: string]: { tags: string[]; filterMatchMode: string } }; + mainPageTagsFilter: Record; mainPageTagsFilterMatchMode: string; - defaultNestedModeForFeature: { [feature: string]: boolean }; + defaultNestedModeForFeature: Record; selectedSubFeature: IBreadcrumbsLink; tablesFilterProjectsOptions: Partial[]; projectsOptionsScrollId: string; @@ -116,7 +116,7 @@ export const selectProjectTags = createSelector(projects, state => state.project export const selectMainPageTagsFilter = createSelector(projects, selectProjectType,(state, projectType) => projectType? state.mainPageTagsFilter[projectType]?.tags : []); export const selectMainPageTagsFilterMatchMode = createSelector(projects, selectProjectType, (state, projectType) => projectType? state.mainPageTagsFilter[projectType]?.filterMatchMode : null); export const selectCompanyTags = createSelector(projects, state => state.companyTags); -// eslint-disable-next-line @typescript-eslint/naming-convention + export const selectProjectSystemTags = createSelector(projects, state => getSystemTags({system_tags: state.systemTags} as ITableExperiment)); export const selectTagsColors = createSelector(projects, state => state?.tagsColors); export const selectLastUpdate = createSelector(projects, state => state.lastUpdate); @@ -138,7 +138,7 @@ export const selectSelectedProjectUsers = createSelector(selectSelectedProjectId (projectId, projectUsers, allUsers) => projectId === '*' ? allUsers : projectUsers); export const selectTablesFilterProjectsOptions = createSelector(projects, state => state.tablesFilterProjectsOptions); export const selectMyProjects = createSelector(selectTablesFilterProjectsOptions, - projects => projects?.filter(project => project?.company?.id) + projects => projects? projects?.filter(project => project?.company?.id): null ); export const selectReadOnlyProjects = createSelector(selectTablesFilterProjectsOptions, @@ -162,6 +162,10 @@ export const projectsReducer = createReducer( selectedProject: action.project, extraUsers: [] })), + on(projectsActions.setSelectedProjectSimple, (state, action): RootProjects => ({ + ...state, + selectedProject: action.project + })), on(projectsActions.setProjectAncestors, (state, action): RootProjects => ({ ...state, projectAncestors: action.projects @@ -256,7 +260,7 @@ export const projectsReducer = createReducer( on(projectsActions.setTablesFilterProjectsOptions, (state, action): RootProjects => ({ ...state, tablesFilterProjectsOptions: action.loadMore ? uniqBy((state.tablesFilterProjectsOptions || []).concat(action.projects), 'id') : uniqBy(action.projects, 'id'), - projectsOptionsScrollId: action.scrollId +projectsOptionsScrollId: action.scrollId })), on(projectsActions.getTablesFilterProjectsOptions, (state, action): RootProjects => ({...state, ...(!action.loadMore && {tablesFilterProjectsOptions: null, projectsOptionsScrollId: null})})), ); diff --git a/src/app/webapp-common/core/reducers/view.reducer.ts b/src/app/webapp-common/core/reducers/view.reducer.ts index a769326d..6102298b 100644 --- a/src/app/webapp-common/core/reducers/view.reducer.ts +++ b/src/app/webapp-common/core/reducers/view.reducer.ts @@ -157,7 +157,11 @@ export const viewReducers = [ on(layoutActions.visibilityChanged, (state, action): ViewState => ({...state, applicationVisible: action.visible})), on(layoutActions.userThemeChanged, (state, action): ViewState => ({...state, theme: action.theme})), on(layoutActions.systemThemeChanged, (state, action): ViewState => ({...state, systemTheme: action.theme})), - on(layoutActions.setForcedTheme, (state, action): ViewState => ({...state, forcedTheme: action.theme, defaultTheme: action.theme})), + on(layoutActions.setForcedTheme, (state, action): ViewState => ({ + ...state, + forcedTheme: action.theme, + ...(action.default && {defaultTheme: action.theme}) + })), on(layoutActions.setThemeColors, (state, action): ViewState => ({...state, themeColors: action.colors})), on(layoutActions.setScaleFactor, (state, action): ViewState => ({...state, scaleFactor: action.scale})), on(layoutActions.firstLogin, (state, action): ViewState => ({ @@ -203,7 +207,7 @@ export const viewReducers = [ neverShowChangesAgain: action.version })), on(setBreadcrumbs, (state, action): ViewState => ({ - ...state, breadcrumbs: action.breadcrumbs, ...(action.workspaceNeutral !== undefined && {workspaceNeutral: action.workspaceNeutral}) + ...state, breadcrumbs: action.breadcrumbs, workspaceNeutral: action.workspaceNeutral !== undefined ? action.workspaceNeutral: false })), on(headerActions.reset, (state): ViewState => ({ ...state, headerMenuActiveFeature: initViewState.headerMenuActiveFeature, headerMenu: initViewState.headerMenu diff --git a/src/app/webapp-common/dashboard-search/dashboard-search.actions.ts b/src/app/webapp-common/dashboard-search/dashboard-search.actions.ts index 4e5a4a8c..2e72d5b5 100644 --- a/src/app/webapp-common/dashboard-search/dashboard-search.actions.ts +++ b/src/app/webapp-common/dashboard-search/dashboard-search.actions.ts @@ -68,7 +68,7 @@ export const searchExperiments = createAction( export const setExperimentsResults = createAction( SEARCH_PREFIX + 'SET_EXPERIMENTS', - props<{ experiments: Task[]; scrollId: string }>() + props<{ tasks: Task[]; scrollId: string }>() ); export const searchModels = createAction( diff --git a/src/app/webapp-common/dashboard-search/dashboard-search.effects.ts b/src/app/webapp-common/dashboard-search/dashboard-search.effects.ts index 63ad804c..088d64d1 100644 --- a/src/app/webapp-common/dashboard-search/dashboard-search.effects.ts +++ b/src/app/webapp-common/dashboard-search/dashboard-search.effects.ts @@ -117,7 +117,7 @@ export class DashboardSearchEffects { this.store.select(selectActiveSearch), this.store.select(selectSearchTerm) ]), - mergeMap(([, active, term]) => { + switchMap(([, active, term]) => { const actionsToFire = []; if (!active) { // actionsToFire.push(searchClear()); @@ -181,7 +181,7 @@ export class DashboardSearchEffects { order_by: orderBy, /* eslint-enable @typescript-eslint/naming-convention */ }).pipe( - mergeMap(res => [setProjectsResults({ + switchMap(res => [setProjectsResults({ projects: res.projects, scrollId: res.scroll_id }), deactivateLoader(action.type)]), @@ -315,7 +315,7 @@ export class DashboardSearchEffects { /* eslint-enable @typescript-eslint/naming-convention */ }).pipe( mergeMap(res => [setExperimentsResults({ - experiments: res.tasks, + tasks: res.tasks, scrollId: res.scroll_id }), deactivateLoader(action.type)]), catchError(error => [deactivateLoader(action.type), requestFailed(error)]))) diff --git a/src/app/webapp-common/dashboard-search/dashboard-search.reducer.ts b/src/app/webapp-common/dashboard-search/dashboard-search.reducer.ts index c8605a8b..94f87e72 100644 --- a/src/app/webapp-common/dashboard-search/dashboard-search.reducer.ts +++ b/src/app/webapp-common/dashboard-search/dashboard-search.reducer.ts @@ -19,7 +19,7 @@ import {setFilterByUser} from '@common/core/actions/users.actions'; export interface DashboardSearchState { projects: Project[]; - experiments: Task[]; + tasks: Task[]; models: Model[]; pipelines: Project[]; reports: IReport[]; @@ -40,7 +40,7 @@ export const searchInitialState: DashboardSearchState = { pipelines: [], openDatasets: [], users: [], - experiments: [], + tasks: [], models: [], reports: [], resultsCount: null, @@ -78,7 +78,7 @@ export const dashboardSearchReducers = [ })), on(setExperimentsResults, (state, action): DashboardSearchState => ({ ...state, - experiments: action.scrollId === state.scrollIds?.[activeSearchLink.experiments] ? state.experiments.concat(action.experiments) : action.experiments, + tasks: action.scrollId === state.scrollIds?.[activeSearchLink.experiments] ? state.tasks.concat(action.tasks) : action.tasks, scrollIds: {...state.scrollIds, [activeSearchLink.experiments]: action.scrollId} })), on(setModelsResults, (state, action): DashboardSearchState => ({ @@ -98,6 +98,8 @@ export const dashboardSearchReducers = [ [activeSearchLink.experiments]: [], [activeSearchLink.pipelines]: [], [activeSearchLink.projects]: [], + [activeSearchLink.openDatasets]: [], + [activeSearchLink.reports]: [], })), on(searchClear, (state): DashboardSearchState => ({...state, ...searchInitialState})), ] as ReducerTypes[]; @@ -109,7 +111,7 @@ export const dashboardSearchReducer = createReducer( export const selectSearch = createFeatureSelector('search'); export const selectProjectsResults = createSelector(selectSearch, (state: DashboardSearchState): Array => state.projects); -export const selectExperimentsResults = createSelector(selectSearch, (state: DashboardSearchState): Array => state.experiments); +export const selectExperimentsResults = createSelector(selectSearch, (state: DashboardSearchState): Array => state.tasks); export const selectModelsResults = createSelector(selectSearch, (state: DashboardSearchState): Array => state.models); export const selectReportsResults = createSelector(selectSearch, (state: DashboardSearchState): Array => state.reports); export const selectPipelinesResults = createSelector(selectSearch, (state: DashboardSearchState): Array => state.pipelines); diff --git a/src/app/webapp-common/dashboard-search/global-search-dialog/global-search-dialog.component.html b/src/app/webapp-common/dashboard-search/global-search-dialog/global-search-dialog.component.html new file mode 100644 index 00000000..6c530006 --- /dev/null +++ b/src/app/webapp-common/dashboard-search/global-search-dialog/global-search-dialog.component.html @@ -0,0 +1,31 @@ + +
+
+
+ + @if (regexError) { + + } + + + +
+ +
+ diff --git a/src/app/webapp-common/dashboard-search/global-search-dialog/global-search-dialog.component.scss b/src/app/webapp-common/dashboard-search/global-search-dialog/global-search-dialog.component.scss new file mode 100644 index 00000000..5e8de10f --- /dev/null +++ b/src/app/webapp-common/dashboard-search/global-search-dialog/global-search-dialog.component.scss @@ -0,0 +1,29 @@ + + +:host { + .content{ + padding-top: 24px; + } + .search-container{ + display: grid; + grid-auto-columns: minmax(0, 1fr); + grid-auto-flow: column; + sm-show-only-user-work{ + margin-left: 12px; + } + } + .regexp { + position: absolute; + right: 8px; + + &.active { + color: var(--color-on-primary); + background-color: var(--color-primary); + } + + &.error { + width: 20px; + right: 36px; + } + } +} diff --git a/src/app/webapp-common/dashboard-search/global-search-dialog/global-search-dialog.component.spec.ts b/src/app/webapp-common/dashboard-search/global-search-dialog/global-search-dialog.component.spec.ts new file mode 100644 index 00000000..e0f6e54f --- /dev/null +++ b/src/app/webapp-common/dashboard-search/global-search-dialog/global-search-dialog.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { GlobalSearchDialogComponent } from './global-search-dialog.component'; + +describe('GlobalSearchDialogComponent', () => { + let component: GlobalSearchDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [GlobalSearchDialogComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(GlobalSearchDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/webapp-common/dashboard-search/global-search-dialog/global-search-dialog.component.ts b/src/app/webapp-common/dashboard-search/global-search-dialog/global-search-dialog.component.ts new file mode 100644 index 00000000..beca3650 --- /dev/null +++ b/src/app/webapp-common/dashboard-search/global-search-dialog/global-search-dialog.component.ts @@ -0,0 +1,132 @@ +import {ChangeDetectorRef, Component, inject, OnDestroy} from '@angular/core'; +import {SearchComponent} from '@common/shared/ui-components/inputs/search/search.component'; +import {DashboardSearchModule} from '~/features/dashboard-search/dashboard-search.module'; +import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dialog-template/dialog-template.component'; +import {Store} from '@ngrx/store'; +import {searchSetTerm} from '@common/dashboard-search/dashboard-search.actions'; +import {ActivatedRoute, NavigationEnd, Router} from '@angular/router'; +import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; +import {MatIcon} from '@angular/material/icon'; +import {MatIconButton} from '@angular/material/button'; +import {PushPipe} from '@ngrx/component'; +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {distinctUntilChanged, filter} from 'rxjs/operators'; +import {selectSearchTerm} from '@common/dashboard-search/dashboard-search.reducer'; +import {Observable} from 'rxjs'; +import {ShowOnlyUserWorkComponent} from '@common/shared/components/show-only-user-work/show-only-user-work.component'; +import {MatDialogRef} from '@angular/material/dialog'; + +@Component({ + selector: 'sm-global-search-dialog', + imports: [ + SearchComponent, + DashboardSearchModule, + DialogTemplateComponent, + ClickStopPropagationDirective, + MatIcon, + MatIconButton, + PushPipe, + TooltipDirective, + ShowOnlyUserWorkComponent + ], + templateUrl: './global-search-dialog.component.html', + styleUrl: './global-search-dialog.component.scss' +}) +export class GlobalSearchDialogComponent implements OnDestroy { + + private store = inject(Store); + private router = inject(Router); + private route = inject(ActivatedRoute); + public regExp = false; + public regexError: boolean; + protected dialogRef = inject>(MatDialogRef); + + + public searchQuery$: Observable<{ query: string; regExp?: boolean; original?: string }>; + private itemSelected = false; + + constructor() { + this.searchQuery$ = this.store.select(selectSearchTerm); + this.router.events + .pipe( + filter(event => event instanceof NavigationEnd), + distinctUntilChanged((pe: NavigationEnd, ce: NavigationEnd) => { + const pURL = new URLSearchParams(pe.url.split('?')?.[1]); + const cURL = new URLSearchParams(ce.url.split('?')?.[1]); + return pURL.get('gq') === cURL.get('gq') && pURL.get('gqreg') === cURL.get('gqreg'); + }) + ).subscribe(() => { + const query = this.route.snapshot.queryParams?.gq ?? ''; + const qregex = this.route.snapshot.queryParams?.gqreg === 'true'; + this.regExp = qregex; + this.store.dispatch(searchSetTerm({ + query: qregex ? query : query.trim(), + regExp: qregex, + })); + }); + if (this.route.snapshot.queryParams.gq) { + const query = this.route.snapshot.queryParams?.gq ?? ''; + const qregex = this.route.snapshot.queryParams?.gqreg ?? false; + this.store.dispatch(searchSetTerm({ + query: qregex ? query : query.trim(), + regExp: qregex, + })); + } + } + + ngOnDestroy(): void { + if (!this.itemSelected) { + this.router.navigate([], { + relativeTo: this.route, + replaceUrl: true, + queryParamsHandling: 'merge', + queryParams: { + gq: undefined, + gqreg: undefined, + tab: undefined + } + }); + } + } + + + public search(query: string) { + try { + if (this.regExp) { + new RegExp(query); + } + this.regexError = null; + this.router.navigate([], { + relativeTo: this.route, + replaceUrl: true, + queryParamsHandling: 'merge', + queryParams: { + gq: query || undefined + } + }); + + } catch (e) { + this.regexError = e.message?.replace(/:.+:/, ':'); + } + } + + toggleRegExp() { + this.regExp = !this.regExp; + if(!this.regExp) { + this.regexError = null; + } + this.router.navigate([], { + relativeTo: this.route, + replaceUrl: true, + queryParamsHandling: 'merge', + queryParams: { + gqreg: this.regExp ? this.regExp : undefined + } + }); + } + + closeDialog() { + this.itemSelected = true; + this.dialogRef.close(); + } +} diff --git a/src/app/webapp-common/dashboard/containers/dashboard-experiments/dashboard-experiments.component.scss b/src/app/webapp-common/dashboard/containers/dashboard-experiments/dashboard-experiments.component.scss index e37d359c..5ae5636c 100644 --- a/src/app/webapp-common/dashboard/containers/dashboard-experiments/dashboard-experiments.component.scss +++ b/src/app/webapp-common/dashboard/containers/dashboard-experiments/dashboard-experiments.component.scss @@ -1,4 +1,4 @@ -@import "mixins/common"; +@use "mixins/common"; :host { .recent-header { @@ -15,6 +15,6 @@ } .recent-title { - @include recent-title(); + @include common.recent-title(); } } diff --git a/src/app/webapp-common/dashboard/containers/dashboard-experiments/dashboard-experiments.component.ts b/src/app/webapp-common/dashboard/containers/dashboard-experiments/dashboard-experiments.component.ts index bc54f03d..39bfe326 100644 --- a/src/app/webapp-common/dashboard/containers/dashboard-experiments/dashboard-experiments.component.ts +++ b/src/app/webapp-common/dashboard/containers/dashboard-experiments/dashboard-experiments.component.ts @@ -4,10 +4,11 @@ import {IRecentTask} from '../../common-dashboard.reducer'; import {ITask} from '~/business-logic/model/al-task'; @Component({ - selector: 'sm-dashboard-experiments', - templateUrl: './dashboard-experiments.component.html', - styleUrls: ['./dashboard-experiments.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-dashboard-experiments', + templateUrl: './dashboard-experiments.component.html', + styleUrls: ['./dashboard-experiments.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class DashboardExperimentsComponent { private router = inject(Router); diff --git a/src/app/webapp-common/dashboard/containers/dashboard-projects/dashboard-projects.component.scss b/src/app/webapp-common/dashboard/containers/dashboard-projects/dashboard-projects.component.scss index 3fbd5411..31a94d02 100644 --- a/src/app/webapp-common/dashboard/containers/dashboard-projects/dashboard-projects.component.scss +++ b/src/app/webapp-common/dashboard/containers/dashboard-projects/dashboard-projects.component.scss @@ -1,4 +1,4 @@ -@import "mixins/common"; +@use "mixins/common"; .view-all { font-size: 12px; @@ -16,8 +16,8 @@ .sm-card-list-header { grid-column: 1 / -1; padding: 0; - height: unset; + height: 38px; } .recent-title { - @include recent-title(); + @include common.recent-title(); } diff --git a/src/app/webapp-common/dashboard/containers/dashboard-projects/dashboard-projects.component.ts b/src/app/webapp-common/dashboard/containers/dashboard-projects/dashboard-projects.component.ts index 9d227a27..83230fff 100644 --- a/src/app/webapp-common/dashboard/containers/dashboard-projects/dashboard-projects.component.ts +++ b/src/app/webapp-common/dashboard/containers/dashboard-projects/dashboard-projects.component.ts @@ -14,9 +14,10 @@ import {CARDS_IN_ROW} from '../../common-dashboard.const'; import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; @Component({ - selector : 'sm-dashboard-projects', - templateUrl: './dashboard-projects.component.html', - styleUrls : ['./dashboard-projects.component.scss'] + selector: 'sm-dashboard-projects', + templateUrl: './dashboard-projects.component.html', + styleUrls: ['./dashboard-projects.component.scss'], + standalone: false }) export class DashboardProjectsComponent { private store = inject(Store); diff --git a/src/app/webapp-common/dashboard/containers/dashboard-reports/dashboard-reports.component.html b/src/app/webapp-common/dashboard/containers/dashboard-reports/dashboard-reports.component.html index 5287cc7a..c831ad91 100644 --- a/src/app/webapp-common/dashboard/containers/dashboard-reports/dashboard-reports.component.html +++ b/src/app/webapp-common/dashboard/containers/dashboard-reports/dashboard-reports.component.html @@ -23,7 +23,6 @@ } @if (recentList().length < cardsInRow) { } diff --git a/src/app/webapp-common/dashboard/containers/dashboard-reports/dashboard-reports.component.scss b/src/app/webapp-common/dashboard/containers/dashboard-reports/dashboard-reports.component.scss index 61291874..7531a358 100644 --- a/src/app/webapp-common/dashboard/containers/dashboard-reports/dashboard-reports.component.scss +++ b/src/app/webapp-common/dashboard/containers/dashboard-reports/dashboard-reports.component.scss @@ -1,4 +1,4 @@ -@import "mixins/common"; +@use "mixins/common"; .view-all { margin-left: 12px; @@ -18,5 +18,5 @@ height: unset; } .recent-title { - @include recent-title(); + @include common.recent-title(); } diff --git a/src/app/webapp-common/dashboard/containers/dashboard-reports/dashboard-reports.component.ts b/src/app/webapp-common/dashboard/containers/dashboard-reports/dashboard-reports.component.ts index aa730602..dbb092d0 100644 --- a/src/app/webapp-common/dashboard/containers/dashboard-reports/dashboard-reports.component.ts +++ b/src/app/webapp-common/dashboard/containers/dashboard-reports/dashboard-reports.component.ts @@ -15,18 +15,17 @@ import {createReport} from '@common/reports/reports.actions'; import {selectDefaultNestedModeForFeature} from '@common/core/reducers/projects.reducer'; @Component({ - selector: 'sm-dashboard-reports', - standalone: true, - imports: [ - ReportCardComponent, - PlusCardComponent, - MatIcon, - MatButton, - MatAnchor, - RouterLink - ], - templateUrl: './dashboard-reports.component.html', - styleUrl: './dashboard-reports.component.scss' + selector: 'sm-dashboard-reports', + imports: [ + ReportCardComponent, + PlusCardComponent, + MatIcon, + MatButton, + MatAnchor, + RouterLink + ], + templateUrl: './dashboard-reports.component.html', + styleUrl: './dashboard-reports.component.scss' }) export class DashboardReportsComponent { private store = inject(Store); diff --git a/src/app/webapp-common/dashboard/dashboard-search.component.base.ts b/src/app/webapp-common/dashboard/dashboard-search.component.base.ts index fa01221e..7ebf4834 100644 --- a/src/app/webapp-common/dashboard/dashboard-search.component.base.ts +++ b/src/app/webapp-common/dashboard/dashboard-search.component.base.ts @@ -1,11 +1,14 @@ -import {initSearch, resetSearch} from '../common-search/common-search.actions'; -import {distinctUntilChanged, distinctUntilKeyChanged, filter} from 'rxjs/operators'; +import {debounceTime, distinctUntilChanged, distinctUntilKeyChanged, filter} from 'rxjs/operators'; import {Model} from '~/business-logic/model/models/model'; -import {clearSearchResults, getCurrentPageResults, searchClear, searchDeactivate, searchSetTerm, searchStart} from '../dashboard-search/dashboard-search.actions'; +import { + clearSearchResults, + getCurrentPageResults, + searchClear, + searchStart +} from '../dashboard-search/dashboard-search.actions'; import {IRecentTask} from './common-dashboard.reducer'; import {ITask} from '~/business-logic/model/al-task'; import {combineLatest, Subscription} from 'rxjs'; -import {selectSearchQuery} from '../common-search/common-search.reducer'; import {Store} from '@ngrx/store'; import { selectDatasetsResults, @@ -21,24 +24,32 @@ import { import {Project} from '~/business-logic/model/projects/project'; import {setSelectedProjectId} from '../core/actions/projects.actions'; import {isExample} from '../shared/utils/shared-utils'; -import {activeLinksList, ActiveSearchLink, activeSearchLink} from '~/features/dashboard-search/dashboard-search.consts'; -import {ChangeDetectorRef, Component, inject, OnDestroy, OnInit} from '@angular/core'; +import {activeLinksList, ActiveSearchLink} from '~/features/dashboard-search/dashboard-search.consts'; +import {ChangeDetectorRef, Component, inject, OnDestroy, OnInit, output} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {IReport} from '@common/reports/reports.consts'; -import {isEqual} from 'lodash-es'; import {selectShowOnlyUserWork} from '@common/core/reducers/users-reducer'; +import {isEqual} from 'lodash-es'; @Component({ - selector: 'sm-dashboard-search-base', - template: '', + selector: 'sm-dashboard-search-base', + template: '', + standalone: false }) export abstract class DashboardSearchBaseComponent implements OnInit, OnDestroy{ protected store = inject(Store); protected router = inject(Router); protected route = inject(ActivatedRoute); protected cdr = inject(ChangeDetectorRef); + readonly navigationOptions: { + replaceUrl: true, + queryParamsHandling: 'merge', + queryParams: { + gq: undefined, + gqreg: undefined, + tab: undefined + }} - protected searchQuery$ = this.store.select(selectSearchQuery); protected modelsResults$ = this.store.select(selectModelsResults); protected reportsResults$ = this.store.select(selectReportsResults); protected pipelinesResults$ = this.store.select(selectPipelinesResults); @@ -48,9 +59,12 @@ export abstract class DashboardSearchBaseComponent implements OnInit, OnDestroy{ protected searchTerm$ = this.store.select(selectSearchTerm); protected resultsCount$ = this.store.select(selectResultsCount); public activeLink = 'projects' as ActiveSearchLink; - private searchSubs; private scrollIds: Map; private subs = new Subscription(); + itemSelected = output(); + searchStarted: boolean; + private firstSearch= true; + constructor() { this.syncAppSearch(); @@ -60,110 +74,105 @@ export abstract class DashboardSearchBaseComponent implements OnInit, OnDestroy{ this.subs.add(this.resultsCount$.pipe( filter(resultsCount => !!resultsCount), distinctUntilChanged() - ).subscribe((resultsCount) => this.setFirstActiveLink(resultsCount))); + ).subscribe((resultsCount) => { + this.setFirstActiveLink(resultsCount)})); this.subs.add(this.route.queryParams.pipe(distinctUntilKeyChanged('tab')) .subscribe(params => { if (params.tab && activeLinksList.find( link => link.name === params.tab)) { this.activeLink = params.tab; - this.activeLinkChanged(this.activeLink) + window.setTimeout(() => this.activeLinkChanged(this.activeLink)); this.cdr.markForCheck(); } })); - - this.subs.add(this.searchQuery$.pipe( - distinctUntilChanged((previous, current) => isEqual(previous, current))) - .subscribe(query => { - this.store.dispatch(searchSetTerm(query)); - })); } ngOnDestroy(): void { - this.store.dispatch(searchClear()); - this.searchTermChanged(''); - this.stopSyncSearch(); this.subs.unsubscribe(); - this.searchSubs.unsubscribe(); + this.store.dispatch(searchClear()); } - stopSyncSearch() { - this.store.dispatch(resetSearch()); - this.searchSubs.unsubscribe(); - } syncAppSearch() { - this.store.dispatch(initSearch({payload: 'Search for all'})); - - this.searchSubs = combineLatest([ + this.subs.add( combineLatest([ this.searchTerm$, this.store.select(selectShowOnlyUserWork), - ]) - .subscribe(([query]) => this.searchTermChanged(query?.query, query?.regExp)); - - this.searchSubs.add(this.store.select(selectSearchScrollIds).subscribe(scrollIds => this.scrollIds = scrollIds)); + ]).pipe( + distinctUntilChanged((pre, next)=> (isEqual(pre[0], next[0]) && pre[1]===next[1])), + debounceTime(400)) + .subscribe(([query]) => { + this.searchTermChanged(query?.query, query?.regExp)})); + this.subs.add(this.store.select(selectSearchScrollIds).subscribe(scrollIds => this.scrollIds = scrollIds)); } public modelSelected(model: Model) { // TODO ADD task.id to route const projectId = model.project ? model.project : '*'; - this.router.navigateByUrl('projects/' + projectId + '/models/' + model.id); + this.router.navigateByUrl('projects/' + projectId + '/models/' + model.id, this.navigationOptions); + this.itemSelected.emit() } public searchTermChanged(term: string, regExp?: boolean) { + this.searchStarted = true; if (term && term.length > 0) { - this.store.dispatch(searchStart({query:term, regExp})); + this.store.dispatch(clearSearchResults()); + this.store.dispatch(searchStart({query: term, regExp})); } else { - this.activeLink = activeSearchLink.projects; - this.store.dispatch(searchDeactivate()); + this.store.dispatch(searchClear()) } } public projectCardClicked(project: Project) { - this.router.navigateByUrl(`projects/${project.id}`); + this.router.navigateByUrl(`projects/${project.id}`, this.navigationOptions); this.store.dispatch(setSelectedProjectId({projectId: project.id, example: isExample(project)})); + this.itemSelected.emit(); + } pipelineSelected(project: Project) { - this.router.navigateByUrl(`pipelines/${project.id}/tasks`); + this.router.navigateByUrl(`pipelines/${project.id}/tasks`, this.navigationOptions); this.store.dispatch(setSelectedProjectId({projectId: project.id, example: isExample(project)})); + this.itemSelected.emit(); } reportSelected(report: IReport) { this.router.navigate(['reports',(report.project as any).id, report.id]); + this.itemSelected.emit(); } public openDatasetCardClicked(project: Project) { - this.router.navigateByUrl(`datasets/simple/${project.id}/tasks`); + this.router.navigateByUrl(`datasets/simple/${project.id}/tasks`, this.navigationOptions); this.store.dispatch(setSelectedProjectId({projectId: project.id, example: isExample(project)})); + this.itemSelected.emit(); } public taskSelected(task: IRecentTask | ITask) { - // TODO ADD task.id to route const projectId = task.project ? task.project.id : '*'; - return this.router.navigateByUrl('projects/' + projectId + '/tasks/' + task.id); + this.router.navigateByUrl('projects/' + projectId + '/tasks/' + task.id, this.navigationOptions); + this.itemSelected.emit(); } public activeLinkChanged(activeLink) { - if (!this.scrollIds?.[activeLink]) { + if (this.searchStarted===false && !this.scrollIds?.[activeLink]) { this.store.dispatch(getCurrentPageResults({activeLink})); } } setFirstActiveLink(resultsCount) { + this.router.navigate([], {queryParams: {tab: this.activeLink}, queryParamsHandling: 'merge', replaceUrl: true}) if (resultsCount[this.activeLink] > 0) { - this.router.navigate([], {queryParams: {tab: this.activeLink}, queryParamsHandling: 'merge', replaceUrl: true}) this.store.dispatch(getCurrentPageResults({activeLink: this.activeLink})); - } else { + } else { const firstTabIndex = activeLinksList.findIndex(activeLink => resultsCount[activeLink.name] > 0); - if (firstTabIndex > -1) { + if (firstTabIndex > -1 && this.firstSearch) { this.router.navigate([], {queryParams: {tab: activeLinksList[firstTabIndex].name}, queryParamsHandling: 'merge'}) - this.store.dispatch(getCurrentPageResults({activeLink: activeLinksList[firstTabIndex].name as ActiveSearchLink})); } else { - this.store.dispatch(clearSearchResults()); - } - } + this.store.dispatch(clearSearchResults()); + }} + this.searchStarted = false; + this.firstSearch = false; } loadMore() { @@ -173,4 +182,5 @@ export abstract class DashboardSearchBaseComponent implements OnInit, OnDestroy{ changeActiveLink(tab: string) { this.router.navigate([], {queryParams: {tab}, queryParamsHandling: 'merge'}) } + } diff --git a/src/app/webapp-common/dashboard/dumb/recent-experiment-table/recent-experiment-table.component.ts b/src/app/webapp-common/dashboard/dumb/recent-experiment-table/recent-experiment-table.component.ts index a73fce80..e7d230cc 100644 --- a/src/app/webapp-common/dashboard/dumb/recent-experiment-table/recent-experiment-table.component.ts +++ b/src/app/webapp-common/dashboard/dumb/recent-experiment-table/recent-experiment-table.component.ts @@ -5,9 +5,10 @@ import {ISmCol} from '../../../shared/ui-components/data/table/table.consts'; import {TIME_FORMAT_STRING} from '../../../constants'; @Component({ - selector : 'sm-recent-tasks-table', - templateUrl: './recent-experiment-table.component.html', - styleUrls : ['./recent-experiment-table.component.scss'] + selector: 'sm-recent-tasks-table', + templateUrl: './recent-experiment-table.component.html', + styleUrls: ['./recent-experiment-table.component.scss'], + standalone: false }) export class RecentExperimentTableComponent { diff --git a/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.ts b/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.ts index 1bcb277a..5a25a7a2 100644 --- a/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.ts +++ b/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.ts @@ -20,9 +20,10 @@ export interface VersionItem extends DagModelItem { } @Component({ - selector: 'sm-dataset-version-step', - templateUrl: './dataset-version-step.component.html', - styleUrls: ['../../pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.scss', './dataset-version-step.component.scss'] + selector: 'sm-dataset-version-step', + templateUrl: './dataset-version-step.component.html', + styleUrls: ['../../pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.scss', './dataset-version-step.component.scss'], + standalone: false }) export class DatasetVersionStepComponent { protected readonly fileSizeConfigStorage = fileSizeConfigStorage; diff --git a/src/app/webapp-common/dataset-version/dataset-version.module.ts b/src/app/webapp-common/dataset-version/dataset-version.module.ts index 69fb3a4f..c79336bb 100644 --- a/src/app/webapp-common/dataset-version/dataset-version.module.ts +++ b/src/app/webapp-common/dataset-version/dataset-version.module.ts @@ -46,6 +46,7 @@ import {MatButton, MatIconButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; import {IdBadgeComponent} from '@common/shared/components/id-badge/id-badge.component'; import {OpenDatasetVersionContentComponent} from '@common/dataset-version/open-dataset-version-content/open-dataset-version-content.component'; +import {ExperimentOutputLogComponent} from '@common/experiments/containers/experiment-output-log/experiment-output-log.component'; @@ -104,7 +105,8 @@ export const routes: Routes = [ MatButton, IdBadgeComponent, OpenDatasetVersionPreviewComponent, - OpenDatasetVersionContentComponent + OpenDatasetVersionContentComponent, + ExperimentOutputLogComponent ] }) export class DatasetVersionModule { } diff --git a/src/app/webapp-common/dataset-version/open-dataset-version-content/open-dataset-version-content.component.scss b/src/app/webapp-common/dataset-version/open-dataset-version-content/open-dataset-version-content.component.scss index a16a2aa6..9e8937bd 100644 --- a/src/app/webapp-common/dataset-version/open-dataset-version-content/open-dataset-version-content.component.scss +++ b/src/app/webapp-common/dataset-version/open-dataset-version-content/open-dataset-version-content.component.scss @@ -1,5 +1,4 @@ -@import 'variables'; -@import "../../../webapp-common/assets/fonts/variables.scss"; +@use "../../../webapp-common/assets/fonts/variables.scss" as fonts; :host { display: block; @@ -14,9 +13,9 @@ ::ng-deep sm-table { [filetype]::before { - content: $al-ico-file; // fallback icon (file) + content: fonts.$al-ico-file; // fallback icon (file) color: #596c71; - font-family: #{$icomoon-font-family}; + font-family: #{fonts.$icomoon-font-family}; font-size: 24px; margin-right: 12px; vertical-align: middle; @@ -32,7 +31,7 @@ [filetype="jpg"]::before, [filetype="jpeg"]::before, [filetype="gif"]::before { - content: $al-ico-image; + content: fonts.$al-ico-image; color: #3a7777; } @@ -41,7 +40,7 @@ [filetype="mov"]::before, [filetype="wmv"]::before, [filetype="avi"]::before { - content: $al-ico-video; + content: fonts.$al-ico-video; color: #846300; } @@ -49,40 +48,40 @@ [filetype="mp3"]::before, [filetype="aac"]::before, [filetype="wav"]::before { - content: $al-ico-audio; + content: fonts.$al-ico-audio; color: #833e65; } [filetype="csv"]::before { - content: $al-ico-csv; + content: fonts.$al-ico-csv; color: #145f82; } [filetype="txt"]::before { - content: $al-ico-txt; + content: fonts.$al-ico-txt; color: #803d3d; } [filetype="zip"]::before, [filetype="gz"]::before { - content: $al-ico-zip; + content: fonts.$al-ico-zip; color: #615555; } [filetype="pkl"]::before { - content: $al-ico-pkl; + content: fonts.$al-ico-pkl; color: #48507f; } [filetype="py"]::before { - content: $al-ico-py; + content: fonts.$al-ico-py; color: #d1902e; } [filetype="html"]::before, [filetype="yaml"]::before, [filetype="json"]::before { - content: $al-ico-code-file; + content: fonts.$al-ico-code-file; color: #a35151; } } diff --git a/src/app/webapp-common/dataset-version/open-dataset-version-content/open-dataset-version-content.component.ts b/src/app/webapp-common/dataset-version/open-dataset-version-content/open-dataset-version-content.component.ts index 44021db2..9ab1e3f8 100644 --- a/src/app/webapp-common/dataset-version/open-dataset-version-content/open-dataset-version-content.component.ts +++ b/src/app/webapp-common/dataset-version/open-dataset-version-content/open-dataset-version-content.component.ts @@ -21,23 +21,22 @@ interface RowData extends Row { } @Component({ - selector: 'sm-open-dataset-version-content', - templateUrl: './open-dataset-version-content.component.html', - styleUrls: ['./open-dataset-version-content.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - MatMenu, - HesitateDirective, - ClipboardModule, - MatMenuTrigger, - MatIcon, - TableComponent, - TooltipDirective, - ShowTooltipIfEllipsisDirective, - MatIconButton, - PrimeTemplate - ] + selector: 'sm-open-dataset-version-content', + templateUrl: './open-dataset-version-content.component.html', + styleUrls: ['./open-dataset-version-content.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatMenu, + HesitateDirective, + ClipboardModule, + MatMenuTrigger, + MatIcon, + TableComponent, + TooltipDirective, + ShowTooltipIfEllipsisDirective, + MatIconButton, + PrimeTemplate + ] }) export class OpenDatasetVersionContentComponent { private readonly ref = inject(ElementRef); diff --git a/src/app/webapp-common/dataset-version/open-dataset-version-details/open-dataset-version-details.component.html b/src/app/webapp-common/dataset-version/open-dataset-version-details/open-dataset-version-details.component.html index fb3c37c3..3c4eca32 100644 --- a/src/app/webapp-common/dataset-version/open-dataset-version-details/open-dataset-version-details.component.html +++ b/src/app/webapp-common/dataset-version/open-dataset-version-details/open-dataset-version-details.component.html @@ -1,4 +1,4 @@ - +
VERSION INFO
 @@ -15,25 +15,6 @@
ID
-
-
Parent
-
- @if (entity()?.parent?.id) { - -
- {{entity()?.parent?.name}}@if (entity()?.parent?.id) { - - } -
- - } @else { - - - } -
-
Size
{{($any(entity()?.runtime?.ds_total_size) | filesize : fileSizeConfigStorage) || '-'}}(original)
@@ -66,7 +47,7 @@
{{entity()?.runtime?.ds_change_remove ?? '-'}}
-
Size
+
Size Difference
@if (entity()?.runtime?.ds_change_size) {
- @if (plots.plotsList !== undefined && plots.plotsList.length < 1 && debugImages.debugImages !== null && !debugImages.debugImages?.[selected().id]?.data) { + @if (plots.plotsList !== undefined && plots.plotsListLength < 1 && debugImages.debugImages !== null && !debugImages.debugImages?.[selected()?.id]?.data) {
No preview to show
}
diff --git a/src/app/webapp-common/dataset-version/open-dataset-version-preview/open-dataset-version-preview.component.ts b/src/app/webapp-common/dataset-version/open-dataset-version-preview/open-dataset-version-preview.component.ts index 802a7620..29ceb141 100644 --- a/src/app/webapp-common/dataset-version/open-dataset-version-preview/open-dataset-version-preview.component.ts +++ b/src/app/webapp-common/dataset-version/open-dataset-version-preview/open-dataset-version-preview.component.ts @@ -3,15 +3,14 @@ import {DebugImagesModule} from '@common/debug-images/debug-images.module'; import {ExperimentSharedModule} from '~/features/experiments/shared/experiment-shared.module'; @Component({ - selector: 'sm-open-dataset-version-preview', - templateUrl: './open-dataset-version-preview.component.html', - styleUrls: ['./open-dataset-version-preview.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - ExperimentSharedModule, - DebugImagesModule -], - standalone: true + selector: 'sm-open-dataset-version-preview', + templateUrl: './open-dataset-version-preview.component.html', + styleUrls: ['./open-dataset-version-preview.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + ExperimentSharedModule, + DebugImagesModule + ] }) export class OpenDatasetVersionPreviewComponent { selected = input.required<{id: string}>(); diff --git a/src/app/webapp-common/dataset-version/open-dataset-versions/open-dataset-versions.component.html b/src/app/webapp-common/dataset-version/open-dataset-versions/open-dataset-versions.component.html index eb63beb2..366b62bc 100644 --- a/src/app/webapp-common/dataset-version/open-dataset-versions/open-dataset-versions.component.html +++ b/src/app/webapp-common/dataset-version/open-dataset-versions/open-dataset-versions.component.html @@ -1,7 +1,7 @@
-
-
- Use ClearML Data from CLI or in your Python code.
- Run these code snippets for a quick example (Requires ClearML 1.7 or above).
- For more details see the documentation -
-
+

+ Use ClearML Data from CLI or in your Python code.
+ Run these code snippets for a quick example (Requires ClearML 1.7 or above).
+ For more details see the documentation +

diff --git a/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.scss b/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.scss index be393a68..5d42d2d7 100644 --- a/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.scss +++ b/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.scss @@ -14,6 +14,10 @@ display: flex; flex: 1; flex-direction: column; + p { + color: var(--color-on-surface); + text-align: left; + } sm-code-editor { display: block; @@ -21,6 +25,7 @@ height: 470px; border-radius: 6px; overflow: hidden; + border: 1px solid var(--color-outline-variant); } } diff --git a/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.ts b/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.ts index fcb5f015..cad1c382 100644 --- a/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.ts +++ b/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.ts @@ -1,12 +1,16 @@ -import {ChangeDetectionStrategy, Component, computed, input, model, signal} from '@angular/core'; +import {ChangeDetectionStrategy, Component, computed, inject, input, signal} from '@angular/core'; +import {ConfigurationService} from '@common/shared/services/configuration.service'; @Component({ - selector: 'sm-dataset-empty', - templateUrl: './dataset-empty.component.html', - styleUrls: ['./dataset-empty.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, + selector: 'sm-dataset-empty', + templateUrl: './dataset-empty.component.html', + styleUrls: ['./dataset-empty.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class DatasetEmptyComponent { + protected readonly confService = inject(ConfigurationService); + initDatasetCLICode = `curl -o Affairs.csv https://vincentarelbundock.github.io/Rdatasets/csv/AER/Affairs.csv clearml-data create --project DatasetProject --name HelloDataset diff --git a/src/app/webapp-common/datasets/nested-open-datasets-page/nested-open-datasets-page.component.html b/src/app/webapp-common/datasets/nested-open-datasets-page/nested-open-datasets-page.component.html index 6d3218b0..ea2c329f 100644 --- a/src/app/webapp-common/datasets/nested-open-datasets-page/nested-open-datasets-page.component.html +++ b/src/app/webapp-common/datasets/nested-open-datasets-page/nested-open-datasets-page.component.html @@ -24,7 +24,7 @@
- +
NO DATASETS TO SHOW
Run your first dataset to see it displayed here diff --git a/src/app/webapp-common/datasets/nested-open-datasets-page/nested-open-datasets-page.component.ts b/src/app/webapp-common/datasets/nested-open-datasets-page/nested-open-datasets-page.component.ts index 72cba3a7..bbd83be2 100644 --- a/src/app/webapp-common/datasets/nested-open-datasets-page/nested-open-datasets-page.component.ts +++ b/src/app/webapp-common/datasets/nested-open-datasets-page/nested-open-datasets-page.component.ts @@ -2,7 +2,6 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {ProjectTypeEnum} from '@common/nested-project-view/nested-project-view-page/nested-project-view-page.component'; import {CircleTypeEnum} from '~/shared/constants/non-common-consts'; import {ProjectsSharedModule} from '~/features/projects/shared/projects-shared.module'; -import { AsyncPipe } from '@angular/common'; import {CommonProjectsPageComponent} from '@common/projects/containers/projects-page/common-projects-page.component'; import {DatasetEmptyComponent} from '@common/datasets/dataset-empty/dataset-empty.component'; import { @@ -28,20 +27,18 @@ import {MatIcon} from '@angular/material/icon'; import {MatButton} from '@angular/material/button'; @Component({ - selector: 'sm-nested-open-datasets-page', - templateUrl: './nested-open-datasets-page.component.html', - styleUrls: ['../../../webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.scss'], - imports: [ - ProjectsSharedModule, - AsyncPipe, - CircleCounterComponent, - ClickStopPropagationDirective, - TagListComponent, - PushPipe, - MatIcon, - MatButton - ], - standalone: true + selector: 'sm-nested-open-datasets-page', + templateUrl: './nested-open-datasets-page.component.html', + styleUrls: ['../../../webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.scss'], + imports: [ + ProjectsSharedModule, + CircleCounterComponent, + ClickStopPropagationDirective, + TagListComponent, + PushPipe, + MatIcon, + MatButton + ] }) export class NestedOpenDatasetsPageComponent extends CommonProjectsPageComponent implements OnInit, OnDestroy { entityTypeEnum = ProjectTypeEnum; diff --git a/src/app/webapp-common/datasets/open-dataset-card/open-dataset-card.component.html b/src/app/webapp-common/datasets/open-dataset-card/open-dataset-card.component.html index e4334b1c..201f2710 100644 --- a/src/app/webapp-common/datasets/open-dataset-card/open-dataset-card.component.html +++ b/src/app/webapp-common/datasets/open-dataset-card/open-dataset-card.component.html @@ -29,7 +29,7 @@ > } - @if (!hideMenu) { + @if (!hideMenu()) {
- @if (!hideMenu) { + @if (!hideMenu()) { - @if (((projectsList$ | ngrxPush)?.length !== 0 && (!allExamples || (showExamples$ | ngrxPush)))|| searching) { - @for (project of projectsList$ | ngrxPush; track trackById($index, project); let last = $last) { + @for (project of projectsList$ | ngrxPush; track project.id + $index; let last = $last) {
- +
NO DATASETS TO SHOW
Run your first dataset to see it displayed here diff --git a/src/app/webapp-common/datasets/open-datasets/open-datasets.component.scss b/src/app/webapp-common/datasets/open-datasets/open-datasets.component.scss index e3fd6e33..5846befa 100644 --- a/src/app/webapp-common/datasets/open-datasets/open-datasets.component.scss +++ b/src/app/webapp-common/datasets/open-datasets/open-datasets.component.scss @@ -1,5 +1,5 @@ -@import "variables"; -@import "mixins/empty"; +@use "variables"; +@use "mixins/empty"; :host { .sm-card-list-layout { @@ -15,7 +15,7 @@ overflow-x: hidden; sm-projects-header { - height: $nav-bar-height; + height: variables.$nav-bar-height; grid-column: 1 / -1; position: sticky; top: 0; @@ -23,5 +23,5 @@ background-color: var(--color-surface); margin-bottom: -12px; } - @include empty-card-mixin(); + @include empty.empty-card-mixin(); } diff --git a/src/app/webapp-common/datasets/open-datasets/open-datasets.component.ts b/src/app/webapp-common/datasets/open-datasets/open-datasets.component.ts index f9b13e02..b37bf7a6 100644 --- a/src/app/webapp-common/datasets/open-datasets/open-datasets.component.ts +++ b/src/app/webapp-common/datasets/open-datasets/open-datasets.component.ts @@ -14,9 +14,10 @@ import {withLatestFrom} from 'rxjs/operators'; import {selectDefaultNestedModeForFeature} from '@common/core/reducers/projects.reducer'; @Component({ - selector: 'sm-open-datasets', - templateUrl: './open-datasets.component.html', - styleUrls: ['./open-datasets.component.scss'] + selector: 'sm-open-datasets', + templateUrl: './open-datasets.component.html', + styleUrls: ['./open-datasets.component.scss'], + standalone: false }) export class OpenDatasetsComponent extends PipelinesPageComponent implements OnInit { diff --git a/src/app/webapp-common/debug-images/debug-images-effects.ts b/src/app/webapp-common/debug-images/debug-images-effects.ts index 52a4fc45..d163cce7 100644 --- a/src/app/webapp-common/debug-images/debug-images-effects.ts +++ b/src/app/webapp-common/debug-images/debug-images-effects.ts @@ -3,7 +3,7 @@ import {Actions, createEffect, ofType} from '@ngrx/effects'; import {concatLatestFrom} from '@ngrx/operators'; import {catchError, mergeMap, map, switchMap, filter} from 'rxjs/operators'; import * as debugActions from './debug-images-actions'; -import {activeLoader, deactivateLoader} from '../core/actions/layout.actions'; +import {activeLoader, addMessage, deactivateLoader} from '../core/actions/layout.actions'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; import {ApiEventsService} from '~/business-logic/api-services/events.service'; import {requestFailed} from '../core/actions/http.actions'; @@ -15,6 +15,7 @@ import {EventsGetTaskMetricsResponse} from '~/business-logic/model/events/events import {COMPARE_DEBUG_IMAGES_ONLY_FIELDS} from '../experiments-compare/experiments-compare.constants'; import {selectActiveWorkspaceReady} from '~/core/reducers/view.reducer'; import {setBeginningOfTime} from '@common/shared/debug-sample/debug-sample.actions'; +import {MESSAGES_SEVERITY} from '@common/constants'; export const ALL_IMAGES = '-- All --'; @@ -123,7 +124,11 @@ export class DebugImagesEffects { switchMap((action) => this.apiTasks.tasksGetAllEx({id: action.tasks, only_fields: COMPARE_DEBUG_IMAGES_ONLY_FIELDS}) .pipe( mergeMap(res => [debugActions.setExperimentsNames({tasks: res.tasks}), deactivateLoader(action.type)]), - catchError(error => [requestFailed(error), deactivateLoader(action.type)]) + catchError(error => [ + requestFailed(error), + deactivateLoader(action.type), + addMessage(MESSAGES_SEVERITY.WARN, `Fetch debug samples failed`) + ]) ) ) )); @@ -148,7 +153,11 @@ export class DebugImagesEffects { deactivateLoader(debugActions.getDebugImagesMetrics.type), deactivateLoader(debugActions.refreshDebugImagesMetrics.type), ]), - catchError(error => [requestFailed(error), deactivateLoader(action.type)]) + catchError(error => [ + requestFailed(error), + deactivateLoader(action.type), + addMessage(MESSAGES_SEVERITY.WARN, `Fetch debug samples failed`) + ]) ) ) )); diff --git a/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.html b/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.html index 6e307aa9..d067e080 100644 --- a/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.html +++ b/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.html @@ -3,7 +3,6 @@ class="images-section" togglePosition="before" [expanded]="$first" - (afterExpand)="resize()" [class.short-list]="iteration.events.length <= ref.nativeElement.clientWidth / 200" > @if (!isDatasetVersionPreview) { diff --git a/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.scss b/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.scss index 06fe4c47..b21dc12c 100644 --- a/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.scss +++ b/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.scss @@ -1,4 +1,4 @@ -@import "variables"; +@use "variables"; :host { display: block; @@ -73,7 +73,7 @@ .mat-expansion-panel-header-title { margin: 10px 0; - font-family: $font-family-base, sans-serif; + font-family: variables.$font-family-base, sans-serif; color: var(--color-on-surface-variant); diff --git a/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.ts b/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.ts index 7d3c0929..46db629b 100644 --- a/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.ts +++ b/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.ts @@ -1,17 +1,16 @@ -import {Component, ElementRef, inject, Input, Output, viewChildren} from '@angular/core'; +import {Component, ElementRef, inject, Input, Output} from '@angular/core'; import {EventEmitter} from '@angular/core'; import {ThemeEnum} from '@common/constants'; import {DebugSampleEvent, Iteration} from '@common/debug-images/debug-images-types'; -import {VirtualGridComponent} from '@common/shared/components/virtual-grid/virtual-grid.component'; @Component({ - selector: 'sm-debug-images-view', - templateUrl: './debug-images-view.component.html', - styleUrls: ['./debug-images-view.component.scss'] + selector: 'sm-debug-images-view', + templateUrl: './debug-images-view.component.html', + styleUrls: ['./debug-images-view.component.scss'], + standalone: false }) export class DebugImagesViewComponent { protected ref = inject>(ElementRef); - public themeEnum = ThemeEnum; public trackFrame = item => `${item?.key} ${item?.timestamp}`; @@ -25,14 +24,7 @@ export class DebugImagesViewComponent { @Output() createEmbedCode = new EventEmitter<{metrics?: string[]; variants?: string[]; domRect: DOMRect}>(); @Output() urlError = new EventEmitter<{ frame: DebugSampleEvent; experimentId: string }>(); - private gridList = viewChildren(VirtualGridComponent); - - public imageUrlError(data: { frame: DebugSampleEvent; experimentId: string }) { this.urlError.emit(data); } - - resize() { - this.gridList().forEach(grid => grid.resize(2)) - } } diff --git a/src/app/webapp-common/debug-images/debug-images.component.html b/src/app/webapp-common/debug-images/debug-images.component.html index e0a1adeb..12eb2883 100644 --- a/src/app/webapp-common/debug-images/debug-images.component.html +++ b/src/app/webapp-common/debug-images/debug-images.component.html @@ -1,3 +1,4 @@ +@if (optionalMetricsDic() !== null) {
@for (experimentId of experimentIds() | slice : 0 : LIMITED_VIEW_LIMIT; track experimentId) {
@@ -55,7 +56,7 @@
}
- @if (shouldShowNoImagesForExperiment(experimentId)) { + @if (optionalMetricsDic()?.[experimentId]?.length === 0 && shouldShowNoImagesForExperiment(experimentId)) {

NO DEBUG SAMPLES

@@ -84,4 +85,4 @@
}
- +} diff --git a/src/app/webapp-common/debug-images/debug-images.component.scss b/src/app/webapp-common/debug-images/debug-images.component.scss index 6582b390..bfd9d079 100644 --- a/src/app/webapp-common/debug-images/debug-images.component.scss +++ b/src/app/webapp-common/debug-images/debug-images.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { display: block; height: 100%; @@ -100,16 +98,16 @@ sm-debug-images-view { transform: translateY(-50%) translateX(-50%); display: block; line-height: 1.2; - color: var(--color-on-surface-variant); + color: var(--color-empty-state); h4 { font-weight: 500; + font-size: 16px; transform: translate(0, -36px); } .al-icon { width: 160px; height: auto; font-size: 160px; - color: var(--color-tint-14); } } diff --git a/src/app/webapp-common/debug-images/debug-images.component.ts b/src/app/webapp-common/debug-images/debug-images.component.ts index 1244b5a1..e98090f5 100644 --- a/src/app/webapp-common/debug-images/debug-images.component.ts +++ b/src/app/webapp-common/debug-images/debug-images.component.ts @@ -1,9 +1,18 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, - Component, DestroyRef, + Component, + computed, + DestroyRef, + effect, ElementRef, - viewChildren, inject, input, output, effect, computed, signal, untracked + inject, + input, + linkedSignal, + output, + signal, + untracked, + viewChildren } from '@angular/core'; import {MatDialog} from '@angular/material/dialog'; import {RefreshService} from '@common/core/services/refresh.service'; @@ -38,16 +47,17 @@ import { } from './debug-images-reducer'; import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; import {DebugImagesViewComponent} from '@common/debug-images/debug-images-view/debug-images-view.component'; -import {selectSplitSize} from '@common/experiments/reducers'; import {DebugImagesResponseIterations} from '~/business-logic/model/events/debugImagesResponseIterations'; import {MetricsImageEvent} from '~/business-logic/model/events/metricsImageEvent'; import {injectRouteData} from 'ngxtension/inject-route-data'; +import {selectSelectedExperimentFromRouter} from '@common/experiments/reducers'; @Component({ - selector: 'sm-debug-images', - templateUrl: './debug-images.component.html', - styleUrls: ['./debug-images.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, + selector: 'sm-debug-images', + templateUrl: './debug-images.component.html', + styleUrls: ['./debug-images.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class DebugImagesComponent { private store = inject(Store); @@ -92,6 +102,7 @@ export class DebugImagesComponent { protected selectedExperiment = this.store.selectSignal(selectSelectedExperiment); + protected selectedExperimentFromRouter = this.store.selectSignal(selectSelectedExperimentFromRouter); protected tasks = this.store.selectSignal(selectTaskNames); protected timeIsNow = this.store.selectSignal(selectTimeIsNow); protected beginningOfTime = this.store.selectSignal(selectBeginningOfTime); @@ -105,8 +116,8 @@ export class DebugImagesComponent { public selectedMetrics = signal>({}); readonly allImages = ALL_IMAGES; - private selectedMetric = signal(null); - protected optionalMetricsDic = computed>(() => this.optionalMetrics().reduce((acc, experimentMetrics) => { + protected selectedMetric = signal(null); + protected optionalMetricsDic = linkedSignal>(() => this.optionalMetrics().reduce((acc, experimentMetrics) => { acc[experimentMetrics.task] = experimentMetrics.metrics; return acc; }, {})); @@ -118,13 +129,19 @@ export class DebugImagesComponent { constructor() { this.destroyRef.onDestroy(() => this.store.dispatch(resetDebugImages())); + effect(() => { + if (this.selectedExperimentFromRouter()) { + this.optionalMetricsDic.set(null); + } + }); + effect(() => { // open dataset case (selected as input) if (this.selected() && this.selected().id !== this.previousSelectedId) { this.previousSelectedId = this.selected().id; untracked(() => this.selectMetric({value: this.allImages}, this.selected().id)) } - }, {allowSignalWrites: true}); + }); if (this.multipleExperiments()) { effect(() => { @@ -142,25 +159,20 @@ export class DebugImagesComponent { this.store.dispatch(fetchExperiments({tasks: this.ids().slice(0, LIMITED_VIEW_LIMIT)})); this.previousIds = this.ids(); } - }, {allowSignalWrites: true}); + }); } else { effect(() => { if (this.selectedExperiment() && (!this.disableStatusRefreshFilter() || this.previousExperimentId === undefined) && this.selectedExperiment()?.id !== this.previousExperimentId) { const id = this.selectedExperiment().id; this.previousExperimentId = id; + this.optionalMetricsDic.set(null); this.selectedMetric.set(null); if (this.metricForTask()) { this.selectedMetrics.update(metrics => ({...metrics, [id]: this.metricForTask()[id]})); } this.store.dispatch(getDebugImagesMetrics({tasks: this.experimentIds()})); } - }, {allowSignalWrites: true}); - - if (this.minimized()) { - this.store.select(selectSplitSize) - .pipe(takeUntilDestroyed()) - .subscribe(() => this.sampleViews().forEach(view => view.resize())); - } + }); } combineLatest([ @@ -210,7 +222,7 @@ export class DebugImagesComponent { this.selectedMetrics.update(metrics => ({...metrics, [key]: debugImages[key]?.metric})); } }); - this.changeDetection.markForCheck(); + this.changeDetection.detectChanges(); }); this.refresh.tick @@ -221,6 +233,7 @@ export class DebugImagesComponent { .subscribe(auto => { if (this.multipleExperiments()) { this.store.dispatch(debugActions.refreshDebugImagesMetrics({tasks: this.experimentIds(), autoRefresh: auto})); + this.store.dispatch(debugActions.fetchExperiments({tasks: this.ids().slice(0, LIMITED_VIEW_LIMIT)})); } this.store.dispatch(debugActions.getDebugImagesMetrics({tasks: this.experimentIds(), autoRefresh: true})); this.experimentIds().forEach(experimentId => { diff --git a/src/app/webapp-common/enterprise-visibility/data-management/data-management.component.html b/src/app/webapp-common/enterprise-visibility/data-management/data-management.component.html index 84198fff..dadc7789 100644 --- a/src/app/webapp-common/enterprise-visibility/data-management/data-management.component.html +++ b/src/app/webapp-common/enterprise-visibility/data-management/data-management.component.html @@ -4,63 +4,67 @@
+
+ Versioning media +

Data Versioning

Git-like meta-data based dataset versioning ensuring traceable, reproducible AI development.
- Versioning media
- query
-

Data selection

- Robust and flexible query interface facilitating data exploration and training data quality control. +

Data Selection and Exploration

+ Robust, flexible query interface with integrated vector similarity search, facilitating data exploration and training data quality control. +
+
+ query
+
+ Statistics +

Data insight

On-demand exploration of dataset qualities at both sample and annotation level.
- Statistics
- Annotation

UI annotation editor

Browse any data sample, explore and edit annotations and meta-data.
+
+ Annotation +
diff --git a/src/app/webapp-common/enterprise-visibility/data-management/data-management.component.ts b/src/app/webapp-common/enterprise-visibility/data-management/data-management.component.ts index d1aac725..b9f31946 100644 --- a/src/app/webapp-common/enterprise-visibility/data-management/data-management.component.ts +++ b/src/app/webapp-common/enterprise-visibility/data-management/data-management.component.ts @@ -4,14 +4,13 @@ import {NgOptimizedImage} from '@angular/common'; import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-data-management', - standalone: true, - imports: [ - NgOptimizedImage, - MatIcon - ], - templateUrl: './data-management.component.html', - styleUrl: '../pages.scss' + selector: 'sm-data-management', + imports: [ + NgOptimizedImage, + MatIcon + ], + templateUrl: './data-management.component.html', + styleUrl: '../pages.scss' }) export class DataManagementComponent extends PageBaseComponent { } diff --git a/src/app/webapp-common/enterprise-visibility/enterprise/enterprise.component.ts b/src/app/webapp-common/enterprise-visibility/enterprise/enterprise.component.ts index 9023a940..e05e6c18 100644 --- a/src/app/webapp-common/enterprise-visibility/enterprise/enterprise.component.ts +++ b/src/app/webapp-common/enterprise-visibility/enterprise/enterprise.component.ts @@ -2,22 +2,19 @@ import { Component } from '@angular/core'; import {MatSidenavModule} from '@angular/material/sidenav'; import {MatListItem, MatNavList} from '@angular/material/list'; import {RouterLink, RouterLinkActive, RouterOutlet} from '@angular/router'; -import { MatIcon } from '@angular/material/icon'; @Component({ - selector: 'sm-enterprise', - standalone: true, - imports: [ - MatSidenavModule, - MatListItem, - RouterOutlet, - RouterLinkActive, - RouterLink, - MatNavList, - MatIcon - ], - templateUrl: './enterprise.component.html', - styleUrls: ['../../settings/settings.component.scss', './enterprise.component.scss'] + selector: 'sm-enterprise', + imports: [ + MatSidenavModule, + MatListItem, + RouterOutlet, + RouterLinkActive, + RouterLink, + MatNavList, + ], + templateUrl: './enterprise.component.html', + styleUrls: ['../../settings/settings.component.scss', './enterprise.component.scss'] }) export class EnterpriseComponent { diff --git a/src/app/webapp-common/enterprise-visibility/genai/genai.component.html b/src/app/webapp-common/enterprise-visibility/genai/genai.component.html index f4d97539..e1146f1a 100644 --- a/src/app/webapp-common/enterprise-visibility/genai/genai.component.html +++ b/src/app/webapp-common/enterprise-visibility/genai/genai.component.html @@ -6,27 +6,29 @@

Model endpoint deployment

- Deploy scalable multi-model endpoints with configurable multi-GPU specification and GPU/CPU offloading + Deploy scalable multi-model endpoints with configurable multi-GPU specification and GPU/CPU offloading. +
+
+ Model deployment
- Model deployment
- gradio streamlit +
+ gradio streamlit +

Easy ML/UI

A UI launcher transforms any Gradio/Streamlit code into securely available web application. @@ -38,25 +40,27 @@

LLM Chat

Securely deploy a UI chat client for any LLM.
- query +
+ query +
- custom apps +
+ custom apps +

No-code app builder

Add custom apps to your ClearML deployment to make AI accessible across your organization. diff --git a/src/app/webapp-common/enterprise-visibility/genai/genai.component.ts b/src/app/webapp-common/enterprise-visibility/genai/genai.component.ts index 1aff8843..c8d8684b 100644 --- a/src/app/webapp-common/enterprise-visibility/genai/genai.component.ts +++ b/src/app/webapp-common/enterprise-visibility/genai/genai.component.ts @@ -4,14 +4,13 @@ import {PageBaseComponent} from '@common/enterprise-visibility/page-base.compone import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-genai', - standalone: true, - imports: [ - NgOptimizedImage, - MatIcon - ], - templateUrl: './genai.component.html', - styleUrl: '../pages.scss' + selector: 'sm-genai', + imports: [ + NgOptimizedImage, + MatIcon + ], + templateUrl: './genai.component.html', + styleUrl: '../pages.scss' }) export class GenaiComponent extends PageBaseComponent { } diff --git a/src/app/webapp-common/enterprise-visibility/interactive-sessions/interactive-sessions.component.html b/src/app/webapp-common/enterprise-visibility/interactive-sessions/interactive-sessions.component.html index 43015802..4522c2fa 100644 --- a/src/app/webapp-common/enterprise-visibility/interactive-sessions/interactive-sessions.component.html +++ b/src/app/webapp-common/enterprise-visibility/interactive-sessions/interactive-sessions.component.html @@ -3,30 +3,48 @@ Launch customized, ready-to-use development environments: VSCode, Jupyter or any other workload directly from the ClearML UI.
+
+
+ remote desktop +
+
+

VM Remote Desktop

+ Launch a full development environment on a remote machine complete with secure, browser based, full remote desktop access. Store, sync, and restore workspaces across sessions. +
+
+

SSH

Launch a full development environment on a remote machine complete with a detached interactive SSH session. Store, sync, and restore interactive workspaces across sessions.
+
SSH + [ngSrc]="'app/webapp-common/assets/marketing/apps-SSH-' + theme() + '.png'" + #image1 + width="640" + height="360" + alt="SSH" + > +
- jupyter +
+ jupyter +

Jupyter

Launch a Jupyter Lab environment on any remote machine complete with secure, authenticated access. Store, sync, and restore interactive workspaces across sessions. @@ -36,17 +54,19 @@

VSCode

- Launch a VSCode environment on any remote machine complete with secure, authenticated access. Store, sync, and restore interactive workspaces across sessions.. + Launch a VSCode environment on any remote machine complete with secure, authenticated access. Store, sync, and restore interactive workspaces across sessions. +
+
+ vscode
- vscode
+
CONTACT CLEARML diff --git a/src/app/webapp-common/enterprise-visibility/interactive-sessions/interactive-sessions.component.ts b/src/app/webapp-common/enterprise-visibility/interactive-sessions/interactive-sessions.component.ts index b790e4c2..66ea7d2c 100644 --- a/src/app/webapp-common/enterprise-visibility/interactive-sessions/interactive-sessions.component.ts +++ b/src/app/webapp-common/enterprise-visibility/interactive-sessions/interactive-sessions.component.ts @@ -4,14 +4,13 @@ import {PageBaseComponent} from '@common/enterprise-visibility/page-base.compone import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-interactive-sessions', - standalone: true, - imports: [ - NgOptimizedImage, - MatIcon - ], - templateUrl: './interactive-sessions.component.html', - styleUrl: '../pages.scss' + selector: 'sm-interactive-sessions', + imports: [ + NgOptimizedImage, + MatIcon + ], + templateUrl: './interactive-sessions.component.html', + styleUrl: '../pages.scss' }) export class InteractiveSessionsComponent extends PageBaseComponent { } diff --git a/src/app/webapp-common/enterprise-visibility/page-base.component.ts b/src/app/webapp-common/enterprise-visibility/page-base.component.ts index d59767ef..11390b51 100644 --- a/src/app/webapp-common/enterprise-visibility/page-base.component.ts +++ b/src/app/webapp-common/enterprise-visibility/page-base.component.ts @@ -12,12 +12,12 @@ export abstract class PageBaseComponent { protected theme = this.store.selectSignal(selectThemeMode); imageClicked(image: HTMLImageElement) { - if (image.classList.contains('full-screen')) { - image.classList.remove('full-screen'); - image.parentElement.classList.remove('full-screen') + if (image.closest('.image').classList.contains('full-screen')) { + image.closest('.image').classList.remove('full-screen'); + image.closest('.mat-drawer-content').classList.remove('position-static'); } else { - image.classList.add('full-screen'); - image.parentElement.classList.add('full-screen'); + image.closest('.image').classList.add('full-screen'); + image.closest('.mat-drawer-content').classList.add('position-static'); } } } diff --git a/src/app/webapp-common/enterprise-visibility/pages.scss b/src/app/webapp-common/enterprise-visibility/pages.scss index 004adf5f..6bd8c44c 100644 --- a/src/app/webapp-common/enterprise-visibility/pages.scss +++ b/src/app/webapp-common/enterprise-visibility/pages.scss @@ -1,4 +1,5 @@ -@import "src/app/webapp-common/assets/fonts/variables"; +@use "sass:color"; +@use "src/app/webapp-common/assets/fonts/variables" as fonts; :host { display: block; @@ -6,6 +7,7 @@ container-type: inline-size; container-name: section; overflow: auto; + width: 100%; @container section (max-width: 1200px) { .section { @@ -19,10 +21,6 @@ "details" "image"; } - img { - width: 100%; - height: auto; - } } .details { text-align: center; @@ -42,7 +40,7 @@ h1 { h2 { color: var(--color-primary); font-size: 32px; - line-height: 42px; + line-height: 38px; margin: 0 0 12px 0; font-weight: normal; } @@ -72,23 +70,10 @@ h2 { &:nth-of-type(even) { grid-template-areas: "image details"; - background-color: color-mix(in srgb, var(--color-surface-container-low), transparent 20%); - } - - img { - grid-area: image; - margin: 0 auto; - border: 1px solid var(--color-outline-variant); - border-radius: 6px; - cursor: pointer; - &:hover { - border-color: var(--color-outline); - } + background-color: var(--color-tint-5); } } - - .details { grid-area: details; display: flex; @@ -99,35 +84,62 @@ h2 { padding: 24px 0; } -.full-screen { - position: fixed; - width: calc(100% - 400px); - right: 24px; - height: unset; - top: 90px; - aspect-ratio: 16 / 9; - z-index: 9; - box-shadow: 0 0 5px 6px var(--color-surface-container-high); - transition: 0.3s ease-in-out; +.image { + grid-area: image; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; + + img { + border: 1px solid var(--color-outline-variant); + border-radius: 6px; + box-shadow: 0 0 12px rgba(0, 0, 0, 0.1); + transition: border 0.3s; + &:hover { + border-color: var(--color-outline); + } + } } -.full-screen::before { - content: $al-ico-dialog-x; - font-family: "trains"; - cursor: pointer; - position: absolute; - top: -4px; - right: -4px; - z-index: 10; - background: var(--color-surface-container-high); - width: 32px; - height: 32px; - line-height: 32px; - font-size: 18px; - pointer-events: none; - text-align: center; - border-radius:100%; - border: 1px solid var(--color-outline); +.full-screen { + position: fixed; + right: 0; + left: 0; + top: 0; + bottom: 0; + z-index: 9; + padding: 0 24px; + background-color: rgba(0, 0, 0, 0.32); + transition: background-color 0.3s ease-in-out; + &:before { + content: fonts.$al-ico-dialog-x; + display: flex; + align-items: center; + justify-content: center; + font-family: fonts.$icomoon-font-family; + cursor: pointer; + position: fixed; + top: 12px; + right: 12px; + z-index: 10; + width: 32px; + height: 32px; + font-size: 20px; + border-radius:100%; + color: var(--color-primary); + background: var(--color-surface-container-high); + border: 1px solid var(--color-outline); + } + + img { + width: auto; + max-width: 100%; + height: auto; + max-height: calc(100vh - 100px); + box-shadow: none; + border-color: var(--color-outline-variant); + } } .cta { @@ -149,7 +161,7 @@ h2 { transition: box-shadow 0.3s; &:hover { color: white; - background-color: darken(#a335d5, 10%); + background-color: #{color.adjust(#a335d5, $lightness: 10%)}; text-decoration: none; } &:focus { diff --git a/src/app/webapp-common/enterprise-visibility/resource-management/resource-management.component.html b/src/app/webapp-common/enterprise-visibility/resource-management/resource-management.component.html index b6c385ab..2c7316c2 100644 --- a/src/app/webapp-common/enterprise-visibility/resource-management/resource-management.component.html +++ b/src/app/webapp-common/enterprise-visibility/resource-management/resource-management.component.html @@ -8,25 +8,27 @@

Cluster Dashboard

Gain complete visibility into your AI cluster with a detailed dashboard and activity log. Identify infrastructure utilization by resource group, compute type, and worker.
- resource dashboard +
+ Resource Dashboard +
- resource configuration +
+ resource configuration +

Resource Allocation & Policy Management

Easily create, manage, and monitor multiple resource pools with granular configurations up to GPU fractions for prioritizing compute utilization across your different teams and users. @@ -35,28 +37,30 @@
-

Quota management

+

Quota Management

Exert granular control over your compute resource allocation by user, team, or project using quotas, priorities, hierarchies, and logic for over-quota situations.
- resource policies +
+ resource policies +
- autoscalers +
+ autoscalers +

Cloud Autoscalers

Autoscalers for AWS, Azure, and GCP dynamically adjust compute resources based on real-time workload demands, within defined cost limits, optimizing resource utilization and minimizing cloud costs. diff --git a/src/app/webapp-common/enterprise-visibility/resource-management/resource-management.component.ts b/src/app/webapp-common/enterprise-visibility/resource-management/resource-management.component.ts index fba977ee..e3704776 100644 --- a/src/app/webapp-common/enterprise-visibility/resource-management/resource-management.component.ts +++ b/src/app/webapp-common/enterprise-visibility/resource-management/resource-management.component.ts @@ -4,14 +4,13 @@ import {PageBaseComponent} from '@common/enterprise-visibility/page-base.compone import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-resource-management', - standalone: true, - imports: [ - NgOptimizedImage, - MatIcon - ], - templateUrl: './resource-management.component.html', - styleUrl: '../pages.scss' + selector: 'sm-resource-management', + imports: [ + NgOptimizedImage, + MatIcon + ], + templateUrl: './resource-management.component.html', + styleUrl: '../pages.scss' }) export class ResourceManagementComponent extends PageBaseComponent { } diff --git a/src/app/webapp-common/enterprise-visibility/security/security.component.html b/src/app/webapp-common/enterprise-visibility/security/security.component.html index bd7e79bc..495dbf49 100644 --- a/src/app/webapp-common/enterprise-visibility/security/security.component.html +++ b/src/app/webapp-common/enterprise-visibility/security/security.component.html @@ -8,57 +8,60 @@

Configuration Vaults

Admin set values can extend or override user configurations making it easy to propagate required configuration as well as controlling security sensitive keys.
- vaults +
+ vaults +
- Service accounts +
+ Service accounts +
-

Service accounts

+

Service Accounts

Streamline automation by providing automated processes and applications with secure and manageable ClearML API access without requiring individual user credentials.
-
-

Access controls

+

Access Controls

Set granular access permission to any ClearML resource, ensuring collaborative data security by defining who can access projects your organization, datasets, models and execution queues.
- RBAC +
+ RBAC +
- Idp sso +
+ Idp sso +
-

Identity providers

+

Identity Providers

Integrate with your organization’s SAML/OIDC identity provider for streamlined user authentication and access control.
diff --git a/src/app/webapp-common/enterprise-visibility/security/security.component.ts b/src/app/webapp-common/enterprise-visibility/security/security.component.ts index 813e36db..19a1b49e 100644 --- a/src/app/webapp-common/enterprise-visibility/security/security.component.ts +++ b/src/app/webapp-common/enterprise-visibility/security/security.component.ts @@ -4,14 +4,13 @@ import {PageBaseComponent} from '@common/enterprise-visibility/page-base.compone import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-security', - standalone: true, - imports: [ - NgOptimizedImage, - MatIcon - ], - templateUrl: './security.component.html', - styleUrl: '../pages.scss' + selector: 'sm-security', + imports: [ + NgOptimizedImage, + MatIcon + ], + templateUrl: './security.component.html', + styleUrl: '../pages.scss' }) export class SecurityComponent extends PageBaseComponent { } diff --git a/src/app/webapp-common/experiments-compare/containers/compare-scatter-plot/compare-scatter-plot.component.ts b/src/app/webapp-common/experiments-compare/containers/compare-scatter-plot/compare-scatter-plot.component.ts index 0c56e122..9f2c459a 100644 --- a/src/app/webapp-common/experiments-compare/containers/compare-scatter-plot/compare-scatter-plot.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/compare-scatter-plot/compare-scatter-plot.component.ts @@ -12,9 +12,10 @@ import {MetricVariantToPathPipe} from '@common/shared/pipes/metric-variant-to-pa @Component({ - selector: 'sm-compare-scatter-plot', - templateUrl: './compare-scatter-plot.component.html', - styleUrls: ['./compare-scatter-plot.component.scss'] + selector: 'sm-compare-scatter-plot', + templateUrl: './compare-scatter-plot.component.html', + styleUrls: ['./compare-scatter-plot.component.scss'], + standalone: false }) export class CompareScatterPlotComponent implements OnChanges { public metricVariantToPathPipe = new MetricVariantToPathPipe; diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.scss b/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.scss index 5449fd73..3b79d6ba 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.scss @@ -1,5 +1,3 @@ -@import "../experiment-compare-base.component"; - :host { display: block; height: 100%; diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.ts index bb89afaf..e4b6dadf 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.ts @@ -14,8 +14,9 @@ import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; @Component({ selector: 'sm-experiment-compare-details', templateUrl: './experiment-compare-details.component.html', - styleUrls: ['./experiment-compare-details.component.scss', '../../cdk-drag.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + styleUrls: ['../experiment-compare-base.component.scss', '../../cdk-drag.scss', './experiment-compare-details.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ExperimentCompareDetailsComponent extends ExperimentCompareBase implements OnInit, AfterViewInit { public showEllipsis= true; @@ -43,7 +44,7 @@ export class ExperimentCompareDetailsComponent extends ExperimentCompareBase imp this.originalExperiments = experiments.reduce((acc, exp) => { acc[exp.id] = isDetailsConverted(exp) ? this.originalExperiments[exp.id] : exp; return acc; - }, {} as { [id: string]: ConfigurationItem }); + }, {} as Record); experiments = Object.values(this.originalExperiments).map(experiment => convertExperimentsArrays(experiment, this.originalExperiments[experiments[0].id], experiments)); experiments = convertConfigurationFromExperiments(experiments, this.originalExperiments); experiments = convertNetworkDesignFromExperiments(experiments, this.originalExperiments); @@ -55,7 +56,7 @@ export class ExperimentCompareDetailsComponent extends ExperimentCompareBase imp }); } - buildCompareTree(experiments: Array, hasDataFeature?: boolean): ExperimentCompareTree { + buildCompareTree(experiments: IExperimentDetail[], hasDataFeature?: boolean): ExperimentCompareTree { const mergedExperiment = getAllKeysEmptyObject(experiments); return experiments .reduce((acc, cur) => { diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.html b/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.html index 90732dbb..14cb3209 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.html +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.html @@ -23,7 +23,7 @@ }
Additional data point information
- +

NO DATA TO SHOW

-
Please select parameters & metrics
+
Please select hyperparameters & metrics
} } diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.scss b/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.scss index ad7001aa..3324e22c 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.scss @@ -1,4 +1,4 @@ -@import "variables"; +@use "variables"; :host { display: flex; @@ -149,7 +149,7 @@ &__item { display: flex; align-items: center; - font-family: $font-family-base, sans-serif; + font-family: variables.$font-family-base, sans-serif; font-size: 12px; height: 32px; color: var(--color-on-surface-variant); @@ -186,21 +186,16 @@ } .no-data { + color: var(--color-empty-state); h4 { + font-size: 16px; font-weight: 500; } - .al-icon { - color: var(--color-tint-14); + .sub-title { + color: var(--color-on-surface); } } -.al-ico-no-data-graph { - font-size: 140px; - width: 140px; - height: auto; - color: rgba(0, 0, 0, 0.1); -} - sm-grouped-checked-filter-list { margin: 0 0 0 24px; } diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.ts index 6282f447..2b89bfeb 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.ts @@ -44,9 +44,10 @@ import {MetricVariantToPathPipe} from '@common/shared/pipes/metric-variant-to-pa @Component({ - selector: 'sm-experiment-compare-hyper-params-graph', - templateUrl: './experiment-compare-hyper-params-graph.component.html', - styleUrls: ['./experiment-compare-hyper-params-graph.component.scss'] + selector: 'sm-experiment-compare-hyper-params-graph', + templateUrl: './experiment-compare-hyper-params-graph.component.html', + styleUrls: ['./experiment-compare-hyper-params-graph.component.scss'], + standalone: false }) export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDestroy { private subs = new Subscription(); diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.html b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.html index ff32f8dd..8ee87573 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.html +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.html @@ -6,11 +6,14 @@ class="drawer-settings-bar" [verticalLayout]="true" [smoothWeight]="settings.smoothWeight" + [smoothSigma]="settings.smoothSigma" [smoothType]="settings.smoothType" [xAxisType]="settings.xAxisType" [groupBy]="settings.groupBy" [groupByOptions]="groupByOptions" + [clearable]="null" (changeWeight)="changeSmoothness($event)" + (changeSigma)="changeSigma($event)" (toggleSettings)="toggleSettingsBar()" (changeXAxisType)="changeXAxisType($event)" (changeGroupBy)="changeGroupBy($event)" @@ -31,28 +34,35 @@
- + @if (showSettingsBar() && minimized) { + + } ; - public metrics$ = this.store.select(selectCompareTasksScalarCharts) + protected metrics$ = this.store.select(selectCompareTasksScalarCharts) .pipe( filter(metrics => !!metrics), distinctUntilChanged() ); + protected settings$ = this.store.select(selectSelectedExperimentSettings); + protected splitSize$ = this.store.select(selectSplitSize); + protected hoverMode$ = this.store.select(selectScalarsHoverMode).pipe( + filter(h => !!h), + distinctUntilChanged()); + protected singleValues$ = this.store.select(selectMultiSingleValues); + protected routerParams$ = this.store.select(selectRouterParams).pipe( + filter(params => params.ids !== undefined), + distinctUntilChanged() + ); + protected showSettingsBar = this.store.selectSignal(selectShowCompareScalarSettings); public searchTerm$: Observable; private subs = new Subscription(); public graphList: GroupedList = {}; - private taskIds: Array; - public graphs: { [key: string]: ExtFrame[] }; + private taskIds: string[]; + public graphs: Record; private metrics: GroupedList; groupByOptions = [ { @@ -71,28 +110,25 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy ]; @ViewChild(ExperimentGraphsComponent) graphsComponent: ExperimentGraphsComponent; - public hoverMode$: Observable; private entityType: EntityTypeEnum; public modelsFeature: boolean; - private singleValues$: Observable; public singleValues: ExtFrame; - private settings$: Observable; public settings: ExperimentCompareSettings = {} as ExperimentCompareSettings; private initialSettings = { groupBy: 'none', smoothWeight: 0, + smoothSigma: 2, smoothType: smoothTypeEnum.exponential, xAxisType: ScalarKeyEnum.Iter, selectedMetricsScalar: [] }; private originalSettings: ExperimentCompareSettings; public minimized = false; - public splitSize$: Observable; - public showSettingsBar$ = this.store.select(selectShowCompareScalarSettings); private selectedVariants: MetricVariants[]; - private originMetrics: Array; - private previousTaskIds: Array; + private originMetrics: MetricVariantResult[]; + private previousTaskIds: string[]; private firstTime = true; + private previousSelectedMetricsCols: MetricVariantResult[] = []; @HostListener('window:beforeunload', ['$event']) unloadHandler() { this.saveSettingsState(); @@ -103,20 +139,10 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy private changeDetection: ChangeDetectorRef, private route: ActivatedRoute, private refresh: RefreshService, - private reportEmbed: ReportCodeEmbedService, + private reportEmbed: ReportCodeEmbedService ) { this.modelsFeature = this.route.snapshot?.parent.data?.setAllProject; - this.settings$ = this.store.select(selectSelectedExperimentSettings); this.searchTerm$ = this.store.select(selectExperimentMetricsSearchTerm); - this.splitSize$ = this.store.select(selectSplitSize); - this.hoverMode$ = this.store.select(selectScalarsHoverMode).pipe( - filter(h => !!h), - distinctUntilChanged()); - this.singleValues$ = this.store.select(selectMultiSingleValues); - this.routerParams$ = this.store.select(selectRouterParams).pipe( - filter(params => params.ids !== undefined), - distinctUntilChanged() - ); } ngOnInit() { @@ -125,7 +151,7 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy this.subs.add(combineLatest([this.metrics$, this.singleValues$]) .subscribe(([metricsWrapped, singleValues]) => { - const metrics = metricsWrapped.metrics || {}; + const metrics = metricsWrapped?.metrics || {}; if (singleValues) { const visibles = this.graphsComponent?.singleValueGraph().at(0)?.chart.data.reduce((curr, data) => { @@ -148,7 +174,7 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy const previousTaskIds = this.taskIds; this.taskIds = params.ids.split(',').sort().filter(id => !!id); this.store.dispatch(setSelectedExperiments({selectedExperiments: this.taskIds})); - if ((metrics.length === 0 || (metrics.length > 0 && previousTaskIds !== undefined) || !isEqual(selectedExperiments, this.taskIds))) { + if ((metrics === null || metrics.length === 0 || (metrics.length > 0 && previousTaskIds !== undefined) || !isEqual(selectedExperiments, this.taskIds))) { this.store.dispatch(getCustomMetricsPerType({ids: this.taskIds, metricsType: EventTypeEnum.TrainingStatsScalar, isModel: this.entityType === EntityTypeEnum.model})); } } @@ -167,7 +193,7 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy acc[currMetric] = [curr.variantName]; } return acc; - }, {} as { [metric: string]: string[] }); + }, {} as Record); const newSelectedMetricsScalar = selectedMetrics.filter(m => !m.hidden).map(m => m.metricName + m.variantName); const VariantWasAdded = newSelectedMetricsScalar?.length > this.settings.selectedMetricsScalar?.length; @@ -213,7 +239,7 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy metrics.filter(metric => this.settings.selectedMetricsScalar.includes(metric.metric + metric.variant)) : metrics.filter(metric => this.settings.selectedMetricsScalar.includes(metric.metric) || this.settings.selectedMetricsScalar.includes(metric.metric + metric.variant)); if (this.settings.groupBy === 'none') { - this.settings = this.selectAllChildren() + this.settings = this.selectAllChildren(); } this.settings.selectedMetricsScalar = Array.from(new Set([ ...this.settings.selectedMetricsScalar, @@ -234,8 +260,12 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy } this.selectedVariants = this.buildMetricVariants(selectedMetricsCols); } - this.selectedVariants?.length > 0 && this.store.dispatch(getMultiScalarCharts({taskIds: this.taskIds, entity: this.entityType, metrics: this.selectedVariants, xAxisType: this.settings.xAxisType})); - this.selectedVariants?.length > 0 && this.store.dispatch(getMultiSingleScalars({taskIds: this.taskIds, entity: this.entityType, metrics: this.selectedVariants})); + if (this.selectedVariants?.length > 0) { + this.store.dispatch(getMultiScalarCharts({taskIds: this.taskIds, entity: this.entityType, metrics: this.selectedVariants, xAxisType: this.settings.xAxisType})); + this.store.dispatch(getMultiSingleScalars({taskIds: this.taskIds, entity: this.entityType, metrics: this.selectedVariants})); + } else { + this.graphs = {}; + } this.changeDetection.markForCheck(); })); @@ -254,7 +284,7 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy } } return acc; - }, {} as { [metric: string]: string[] }); + }, {} as Record); return Object.entries(selectedMetricsVariants).map(([metricName, variants]) => ({metric: metricName, variants})); }; @@ -307,16 +337,23 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy const selectedMetricsCols = this.settings.groupBy === groupByCharts.none ? this.originMetrics.filter(metric => this.settings.selectedMetricsScalar.includes(metric.metric + metric.variant)) : this.originMetrics.filter(metric => this.settings.selectedMetricsScalar.includes(metric.metric)); - this.selectedVariants = this.buildMetricVariants(selectedMetricsCols); + const newSelectedVariants = this.buildMetricVariants(selectedMetricsCols); + const isAdded = selectedMetricsCols.length > this.previousSelectedMetricsCols.length || + selectedMetricsCols.filter(m => m.metric === ' Summary').length !== this.previousSelectedMetricsCols.filter(m => m.metric === ' Summary').length; + this.selectedVariants = newSelectedVariants; if (this.settings.groupBy === groupByCharts.metric) { this.cleanVariantsWithoutMetric(selectedMetricsCols); } if (this.selectedVariants.length > 0) { - this.store.dispatch(getMultiScalarCharts({taskIds: this.taskIds, entity: this.entityType, metrics: this.selectedVariants, xAxisType: this.settings.xAxisType})); - this.store.dispatch(getMultiSingleScalars({taskIds: this.taskIds, entity: this.entityType, metrics: this.selectedVariants})); + // We don't need to fetch when hiding charts + if (isAdded) { + this.store.dispatch(getMultiScalarCharts({taskIds: this.taskIds, entity: this.entityType, metrics: this.selectedVariants, xAxisType: this.settings.xAxisType})); + this.store.dispatch(getMultiSingleScalars({taskIds: this.taskIds, entity: this.entityType, metrics: this.selectedVariants})); + } } else { this.settings = {...this.settings, selectedMetricsScalar: []}; } + this.previousSelectedMetricsCols = selectedMetricsCols; } } @@ -337,8 +374,15 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy this.settings = {...this.settings, smoothWeight: $event}; } + changeSigma($event: number) { + this.settings = {...this.settings, smoothSigma: $event}; + } + + changeSmoothType($event: SmoothTypeEnum) { - this.settings = {...this.settings, smoothType: $event}; + this.settings = {...this.settings, smoothType: $event, + ...(this.settings.smoothType !== smoothTypeEnum.gaussian && {smoothSigma: 2}) + }; } changeXAxisType($event: ScalarKeyEnum) { @@ -352,7 +396,7 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy this.graphList = this.settings.groupBy === 'none' ? buildMetricsList(this.originMetrics) : this.buildNestedListWithoutChildren(this.originMetrics); const selectedMetricsWithoutVariants = this.selectedVariants.map(metric => ({metric: metric.metric, variants: []})); if (groupBy === 'none') { - this.settings = this.selectAllChildren() + this.settings = this.selectAllChildren(); } this.store.dispatch(getMultiScalarCharts({ taskIds: this.taskIds, diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.html b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.html index 7480cd14..61e5258e 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.html +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.html @@ -22,7 +22,7 @@ @if (dataTable?.length === 0) {
- +

NO METRICS

} @@ -39,7 +39,6 @@ [virtualScroll]="true" [virtualScrollItemSize]="50" [rowTrackBy]="trackByFunction" - styleClass="p-mt-3" scrollHeight="flex" [class.empty-state]="dataTable?.length < 1" [class.no-rows]="dataTableFiltered?.length < 1"> @@ -95,7 +94,10 @@ - + {{ metricVariant.firstMetricRow ? metricVariant.metric : '' }} diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.scss b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.scss index 4d4d7166..25a1af47 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.scss @@ -87,14 +87,6 @@ $tableBottomPaginatorBorderWidth: 0 0 1px 0 !default; .filter-header-cell { border-right: $tableBodyCellBorder !important; overflow: unset; - - i { - color: var(--color-on-surface-variant); - - &:hover { - color: var(--color-outline); - } - } } .filter-header { @@ -102,18 +94,6 @@ $tableBottomPaginatorBorderWidth: 0 0 1px 0 !default; width: 401px; align-items: center; gap: 24px; - padding-left: 8px; - - .btn-icon { - border: 1px solid transparent; - background-color: transparent; - padding: 5px; - - &:hover { - border-color: var(--color-surface-container-high); - background-color: var(--color-surface-container-lowest); - } - } .is-filtered { border-color: var(--color-surface-container-high); @@ -123,17 +103,6 @@ $tableBottomPaginatorBorderWidth: 0 0 1px 0 !default; mat-form-field { flex-grow: 1; } - - .al-ico-filter-on, - .al-ico-filter-off { - .path2:before { - color: var(--color-on-surface-variant); - } - - .path1:before { - color: var(--color-primary); - } - } } .freeze-divider::after { @@ -150,9 +119,9 @@ $tableBottomPaginatorBorderWidth: 0 0 1px 0 !default; width: 200px; max-width: 200px; overflow: hidden; - border-top: 1px solid transparent !important; border-right: $tableBodyCellBorder; border-left-width: 0; + border-bottom-width: 0; color: var(--color-primary); font-weight: 500; padding-left: 24px !important; @@ -181,20 +150,6 @@ $tableBottomPaginatorBorderWidth: 0 0 1px 0 !default; color: var(--color-primary); } -tr:hover { - background-color: var(--color-surface-container-low); -} - -tr.first-row { - td { - border-top-color: var(--color-outline-variant) !important; - } - - &:first-child td { - border-top-color: transparent !important; - } -} - .value-text { text-overflow: ellipsis; overflow: hidden; @@ -277,26 +232,30 @@ tr.first-row { .p-datatable-tbody { > tr { - background: $tableBodyRowBg; color: $tableBodyRowTextColor; transition: $listItemTransition; > td { + background: $tableBodyRowBg; text-align: $tableCellContentAlignment; - border-top: $tableBodyCellBorder; padding: $tableBodyCellPadding; + border-color: var(--color-surface-container-high); .p-row-editor-save { margin-right: $inlineSpacing; } } - &:hover { - background: $tableBodyRowHoverBg; + &.last-row { + td { + border-bottom: 1px solid var(--color-outline-variant); + } } - &:hover .metrics-column { - background: var(--color-surface-container-lowest); + &:hover { + > td:not(.metrics-column) { + background: $tableBodyRowHoverBg; + } } &:focus { @@ -310,7 +269,7 @@ tr.first-row { } } - .p-column-resizer-helper { + .p-datatable-column-resizer-helper { background: $tableResizerHelperBg; } @@ -319,8 +278,8 @@ tr.first-row { background: var(--color-surface-container-lowest); } - &.p-datatable-scrollable > .p-datatable-wrapper > .p-datatable-table, - &.p-datatable-scrollable > .p-datatable-wrapper > .p-scroller-viewport > .p-scroller > .p-datatable-table { + &.p-datatable-scrollable > .p-datatable-table-container > .p-datatable-table, + &.p-datatable-scrollable > .p-datatable-table-container > .p-scroller-viewport > .p-scroller > .p-datatable-table { > .p-datatable-thead, > .p-datatable-tfoot { background-color: $tableHeaderCellBg; @@ -331,69 +290,6 @@ tr.first-row { font-size: $loadingIconFontSize; } - &.p-datatable-gridlines { - .p-datatable-header { - border-width: 1px 1px 0 1px; - } - - .p-datatable-footer { - border-width: 0 1px 1px 1px; - } - - .p-paginator-top { - border-width: 0 1px 0 1px; - } - - .p-paginator-bottom { - border-width: 0 1px 1px 1px; - } - - .p-datatable-thead { - > tr { - > th { - border-width: 1px 0 1px 1px; - - &:last-child { - border-width: 1px; - } - } - } - } - - .p-datatable-tbody { - > tr { - > td { - border-width: 1px 0 0 1px; - - &:last-child { - border-width: 1px 1px 0 1px; - } - } - - &:last-child { - > td { - border-width: 1px 0 1px 1px; - - &:last-child { - border-width: 1px; - } - } - } - } - } - - &:has(.p-datatable-thead):has(.p-datatable-tbody) .p-datatable-tbody { - > tr { - > td { - border-width: 0 0 1px 1px; - - &:last-child { - border-width: 0 1px 1px 1px; - } - } - } - } - } .p-scroller { height: 100% !important; @@ -417,11 +313,12 @@ tr.first-row { } .no-output { - color: var(--color-on-surface); + color: var(--color-empty-state); z-index: 1; - mat-icon { - color: var(--color-tint-14); + h4 { + font-size: 16px; + font-weight: 500; } &.all-filtered-message { @@ -431,8 +328,3 @@ tr.first-row { } } } -.i-no-table-data { - width: 150px; - height: 100px; - margin-bottom: 10px; -} diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.ts index ab888b28..7e33fdd4 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.ts @@ -1,5 +1,14 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, HostListener, OnDestroy, OnInit, QueryList, ViewChildren} from '@angular/core'; +import { + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + HostListener, + OnDestroy, + OnInit, + viewChild +} from '@angular/core'; import {selectRouterConfig, selectRouterParams} from '@common/core/reducers/router-reducer'; +import {sanitizeCSVCell} from '@common/shared/utils/download'; import {Store} from '@ngrx/store'; import {combineLatestWith, distinctUntilChanged, distinctUntilKeyChanged, filter, map, take, tap, throttleTime} from 'rxjs/operators'; import {isEqual, mergeWith} from 'lodash-es'; @@ -59,6 +68,7 @@ interface tableRow { metric: string; variant: string; firstMetricRow: boolean; + lastInGroup: boolean; values: Record; } @@ -67,10 +77,11 @@ interface ExtTask extends Task { } @Component({ - selector: 'sm-experiment-compare-metric-values', - templateUrl: './experiment-compare-metric-values.component.html', - styleUrls: ['./experiment-compare-metric-values.component.scss', '../../cdk-drag.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-experiment-compare-metric-values', + templateUrl: './experiment-compare-metric-values.component.html', + styleUrls: ['./experiment-compare-metric-values.component.scss', '../../cdk-drag.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy { public experiments: ExtTask[] = []; @@ -91,7 +102,7 @@ export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy private selectExportTable$: Observable; public showFilterTooltip = false; - @ViewChildren(Table) public tableComp: QueryList; + table = viewChild(Table); private scrollContainer: HTMLDivElement; public scrolled: boolean; public filterValue: string; @@ -208,7 +219,7 @@ export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy } private startTableScrollListener() { - this.scrollContainer = this.tableComp?.first?.el.nativeElement.getElementsByClassName('p-scroller')[0] ?? this.tableComp?.first?.el.nativeElement.getElementsByClassName('p-datatable-wrapper')[0] as HTMLDivElement; + this.scrollContainer = this.table()?.el.nativeElement.getElementsByClassName('p-scroller')[0] ?? this.table()?.el.nativeElement.getElementsByClassName('p-datatable-table-container')[0] as HTMLDivElement; if (this.scrollContainer) { fromEvent(this.scrollContainer, 'scroll').pipe(throttleTime(150, undefined, {leading: true, trailing: true})).subscribe((e: Event) => { this.scrolled = (e.target as HTMLDivElement).scrollLeft > 10; @@ -253,10 +264,11 @@ export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy variant, values: acc.values, firstMetricRow: false, + lastInGroup: false, min: acc.min ? Math.min(acc.min, exp.last_metrics[metricId]?.[variantId]?.[this.valuesMode.key] ?? acc.min) : exp.last_metrics[metricId]?.[variantId]?.[this.valuesMode.key], max: acc.max ? Math.max(acc.max, exp.last_metrics[metricId]?.[variantId]?.[this.valuesMode.key] ?? acc.max) : exp.last_metrics[metricId]?.[variantId]?.[this.valuesMode.key] }; - }, {values: {}} as { metric, variant, firstMetricRow: boolean, min: number, max: number, values: Record }) + }, {values: {}} as { metric, variant, firstMetricRow: boolean, lastInGroup: boolean, min: number, max: number, values: Record }) }; })).flat(1); @@ -288,13 +300,18 @@ export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy if (!this.dataTable) { return; } - this.dataTableFiltered = this.dataTable.filter(row => this.settings.selectedMetricsScalar?.includes(row.metric + row.variant)).filter(row => row.metric.includes(value) || row.variant.includes(value)); + const lowerVal = value.toLowerCase(); + this.dataTableFiltered = this.dataTable + .filter(row => this.settings.selectedMetricsScalar?.includes(row.metric + row.variant)) + .filter(row => row.metric.toLowerCase().includes(lowerVal) || row.variant.toLowerCase().includes(lowerVal)); this.showFilterTooltip = true; - let previousMetric: string; - this.dataTableFiltered.forEach(row => { - row.firstMetricRow = row.metric !== previousMetric; - previousMetric = row.metric; + this.dataTableFiltered.forEach((row, i) => { + row.firstMetricRow = row.metric !== this.dataTableFiltered[i - 1]?.metric; + row.lastInGroup = row.metric !== this.dataTableFiltered[i + 1]?.metric; }); + if (this.table()) { + window.setTimeout(() => this.table().scroller?.setSize(), 50); + } }; private getExperimentIdsParams(experiments: { id?: string }[]): string { @@ -327,7 +344,9 @@ export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy Metric: row.metric, Variant: row.variant, ...headers.reduce((acc, header, i) => { - acc[header] = values[i]; + acc[header] = typeof values[i]=== 'string' ? + sanitizeCSVCell(values[i].replace(/\r?\n|\r/g, '')) : + values[i]; return acc; }, {}) }; diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.scss b/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.scss index 38a52047..9cb5bd71 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.scss @@ -1,5 +1,3 @@ -@import "../experiment-compare-base.component"; - :host { display: block; height: 100%; diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.ts index 6354e65e..2de18f2d 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.ts @@ -12,8 +12,9 @@ import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; @Component({ selector: 'sm-experiment-compare-params', templateUrl: './experiment-compare-params.component.html', - styleUrls: [ './experiment-compare-params.component.scss', '../../cdk-drag.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + styleUrls: ['../experiment-compare-base.component.scss', './experiment-compare-params.component.scss', '../../cdk-drag.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ExperimentCompareParamsComponent extends ExperimentCompareBase implements OnInit { public showEllipsis = true; @@ -43,19 +44,19 @@ export class ExperimentCompareParamsComponent extends ExperimentCompareBase impl this.originalExperiments = experiments.reduce((acc, exp) => { acc[exp.id] = isParamsConverted(exp.hyperparams) ? this.originalExperiments[exp.id] : exp; return acc; - }, {} as { [id: string]: IExperimentDetail | ExperimentParams }); + }, {} as Record); const experimentList = Object.values(this.originalExperiments).map(experiment => convertExperimentsArraysParams(experiment, this.originalExperiments[experiments[0].id])); this.resetComponentState(experimentList); this.calculateTree(experimentList); }); } - buildCompareTree(experiments: Array): ExperimentCompareTree { + buildCompareTree(experiments: ExperimentParams[]): ExperimentCompareTree { const mergedExperiment = getAllKeysEmptyObject(experiments); return experiments .reduce((acc, cur) => { acc[cur.id] = { - // eslint-disable-next-line @typescript-eslint/naming-convention + 'hyper-params': this.buildSectionTree(cur, this.entityType === EntityTypeEnum.model? 'design': 'hyperparams', mergedExperiment) }; diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.html b/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.html index 521430b3..fdf90a29 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.html +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.html @@ -1,22 +1,21 @@
@if (!minimized) {
- - + >
}
; + public graphs: Record = undefined; public refreshDisabled: boolean; @ViewChild(ExperimentGraphsComponent) graphsComponent: ExperimentGraphsComponent; @@ -80,6 +80,7 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { private originMetrics: MetricVariantResult[]; private firstTime = true; private previousTaskIds: string[]; + private originalPlotList: { metric: string; variant: string }[]; @HostListener('window:beforeunload', ['$event']) unloadHandler() { this.saveSettingsState(); @@ -123,7 +124,7 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { return acc; }, {} as Record); const newGraphs = convertMultiPlots(merged, tagsLists); - if (!this.graphs || !isEqual(newGraphs, this.graphs)) { + if (Object.keys(newGraphs).length !== 0 && (!this.graphs || !isEqual(newGraphs, this.graphs))) { this.graphs = newGraphs; } this.changeDetection.detectChanges(); @@ -132,15 +133,16 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { } })); - this.subs.add(this.routerParams$ + this.subs.add(this.routerParams$.pipe(distinctUntilChanged((prev, curr) => isEqual(prev, curr))) .pipe(withLatestFrom(this.store.select(selectMetricVariantsPlots), this.store.select(selectSelectedExperiments))) .subscribe(([params, metrics, selectedExperiments]) => { if (!this.taskIds || this.taskIds.join(',') !== params.ids) { const previousTaskIds = this.taskIds; + this.graphs = undefined; this.taskIds = params.ids.split(',').sort().filter(id => !!id); this.store.dispatch(setSelectedExperiments({selectedExperiments: this.taskIds})); - if (metrics.length === 0 || (metrics.length > 0 && previousTaskIds !== undefined) || !isEqual(selectedExperiments, this.taskIds)) { + if (metrics === null || metrics.length === 0 || (metrics.length > 0 && previousTaskIds !== undefined) || !isEqual(selectedExperiments, this.taskIds)) { this.store.dispatch(getCustomMetricsPerType({ids: this.taskIds, metricsType: EventTypeEnum.Plot, isModel: this.entityType === EntityTypeEnum.model})); } } @@ -166,6 +168,8 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { if (this.firstTime || this.previousSelectedMetrics?.length !== selectedMetrics?.length || this.taskIds.length !== this.previousTaskIds.length) { this.firstTime = false; this.store.dispatch(getMultiPlotCharts({taskIds: this.taskIds, entity: this.entityType, metrics: variants})); + } else if (this.previousSelectedMetrics?.length === 0) { + this.graphs = {}; } this.previousSelectedMetrics = selectedMetrics; this.previousTaskIds = this.taskIds; @@ -181,7 +185,9 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { this.subs.add(this.selectedMetrics$.pipe(take(1)).subscribe(selectedMetrics => { this.originalSettings = selectedMetrics; - this.settings = selectedMetrics ? {...this.initialSettings, selectedMetricsPlot: selectedMetrics} : {...this.initialSettings, selectedMetricsPlot: this.graphList.slice(0, 8).map(a => a.name)} as ExperimentCompareSettings; + this.settings = selectedMetrics ? + {...this.initialSettings, selectedMetricsPlot: selectedMetrics} : + {...this.initialSettings, selectedMetricsPlot: this.originalPlotList?.slice(0, 8).map(a => `${a.metric} - ${a.variant}`) ?? []} as ExperimentCompareSettings; })); this.subs.add(this.store.select(selectMetricVariantsPlots) @@ -190,8 +196,12 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { distinctUntilChanged((prev, curr) => isEqual(prev, curr))) .subscribe(metrics => { this.originMetrics = metrics; + this.originalPlotList = metrics.map((plot) => ({ + metric: plot.metric, + variant: plot.variant + })); + this.graphList = buildMetricsListFlat(metrics) const listSorted = sortMetricsList(metrics.map(m => `${m.metric} - ${m.variant}`)); - this.graphList = listSorted.map(metric => ({name: metric, value: metric})) if (this.settings.selectedMetricsPlot?.filter(sm => listSorted.includes(sm)).length === 0 && listSorted.length > 0) { this.settings.selectedMetricsPlot = listSorted.filter(name => !HIDDEN_PLOTS_BY_DEFAULT.includes(name)).slice(0, 8); } @@ -201,6 +211,9 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { this.selectedVariants = this.buildMetricVariants(selectedMetricsCols) if (this.selectedVariants?.length > 0) { this.store.dispatch(getMultiPlotCharts({taskIds: this.taskIds, entity: this.entityType, metrics: this.selectedVariants})); + } else { + this.graphs = {}; + this.store.dispatch(setExperimentPlots({plots: {}})); } } })); @@ -226,14 +239,8 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { this.resetMetrics(); } - private prepareList(metricsScalar): SelectableListItem[] { - const list = metricsScalar ? Object.keys(metricsScalar) : []; - const sortedList = sortMetricsList(list); - return sortedList.map((item) => ({name: item, value: item})); - } - metricSelected(id) { - this.graphsComponent?.scrollToGraph(id); + this.graphsComponent?.scrollToGraph(id, true); } selectedListChanged(selectedList) { diff --git a/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.scss b/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.scss index 4b102e41..bc21113f 100644 --- a/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.scss @@ -1,5 +1,3 @@ -@import "../experiment-compare-base.component"; - :host { display: block; height: 100%; diff --git a/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.ts b/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.ts index f29a96c8..a2b9fd48 100644 --- a/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.ts @@ -13,8 +13,9 @@ import {ModelDetail} from '@common/experiments-compare/shared/experiments-compar @Component({ selector: 'sm-model-compare-details', templateUrl: './model-compare-details.component.html', - styleUrls: ['./model-compare-details.component.scss', '../../cdk-drag.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + styleUrls: ['../experiment-compare-base.component.scss', './model-compare-details.component.scss', '../../cdk-drag.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ModelCompareDetailsComponent extends ExperimentCompareBase implements OnInit, AfterViewInit { public showEllipsis = true; @@ -42,7 +43,7 @@ export class ModelCompareDetailsComponent extends ExperimentCompareBase implemen this.originalExperiments = models.reduce((acc, exp) => { acc[exp.id] = isDetailsConverted(exp) ? this.originalExperiments[exp.id] : exp; return acc; - }, {} as { [id: string]: ConfigurationItem }); + }, {} as Record); models = Object.values(this.originalExperiments).map(experiment => convertmodelsArrays(experiment, this.originalExperiments[models[0].id], models)); this.resetComponentState(models); @@ -51,7 +52,7 @@ export class ModelCompareDetailsComponent extends ExperimentCompareBase implemen }); } - buildCompareTree(experiments: Array): ExperimentCompareTree { + buildCompareTree(experiments: ModelDetail[]): ExperimentCompareTree { const mergedExperiment = getAllKeysEmptyObject(experiments); return experiments .reduce((acc, cur) => { diff --git a/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.scss b/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.scss index 27ee9782..b6302da3 100644 --- a/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.scss @@ -1,5 +1,4 @@ -@import "variables"; - +@use "variables"; :host { @@ -9,9 +8,9 @@ } .hide-table { - height: 0px; + height: 0; overflow: hidden; - transition: $transition-fast; + transition: variables.$transition-fast; &.show-table { height: calc(100% - 60px); @@ -47,7 +46,7 @@ } ::ng-deep sm-table p-table { - .p-datatable-hoverable-rows .p-selectable-row { + .p-datatable-hoverable-rows .p-datatable-selectable-row { cursor: default; } } diff --git a/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.ts b/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.ts index 4f082582..9a97de5f 100644 --- a/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.ts @@ -78,9 +78,10 @@ export const allowAddExperiment$ = (selectRouterParams$: Observable) => @Component({ - selector: 'sm-select-experiments-for-compare', - templateUrl: './select-experiments-for-compare.component.html', - styleUrls: ['./select-experiments-for-compare.component.scss'] + selector: 'sm-select-experiments-for-compare', + templateUrl: './select-experiments-for-compare.component.html', + styleUrls: ['./select-experiments-for-compare.component.scss'], + standalone: false }) export class SelectExperimentsForCompareComponent implements OnInit, OnDestroy { public entityTypes = EntityTypeEnum; diff --git a/src/app/webapp-common/experiments-compare/dumbs/compare-card-body.directive.ts b/src/app/webapp-common/experiments-compare/dumbs/compare-card-body.directive.ts index c537f847..c3a06f72 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/compare-card-body.directive.ts +++ b/src/app/webapp-common/experiments-compare/dumbs/compare-card-body.directive.ts @@ -1,7 +1,8 @@ import {Directive} from '@angular/core'; @Directive({ - selector: '[compareCardBody]' + selector: '[compareCardBody]', + standalone: false }) export class CompareCardBodyDirective { diff --git a/src/app/webapp-common/experiments-compare/dumbs/compare-card-extra-header.directive.ts b/src/app/webapp-common/experiments-compare/dumbs/compare-card-extra-header.directive.ts index f9ef46fb..82bcb69a 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/compare-card-extra-header.directive.ts +++ b/src/app/webapp-common/experiments-compare/dumbs/compare-card-extra-header.directive.ts @@ -1,7 +1,8 @@ import {Directive} from '@angular/core'; @Directive({ - selector: '[compareCardExtraHeader]' + selector: '[compareCardExtraHeader]', + standalone: false }) export class CompareCardExtraHeaderDirective { diff --git a/src/app/webapp-common/experiments-compare/dumbs/compare-card-header.directive.ts b/src/app/webapp-common/experiments-compare/dumbs/compare-card-header.directive.ts index 1fe3cd00..fdc5ac25 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/compare-card-header.directive.ts +++ b/src/app/webapp-common/experiments-compare/dumbs/compare-card-header.directive.ts @@ -1,7 +1,8 @@ import {Directive} from '@angular/core'; @Directive({ - selector: '[compareCardHeader]' + selector: '[compareCardHeader]', + standalone: false }) export class CompareCardHeaderDirective { diff --git a/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.ts b/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.ts index 1ce65b4e..1b913fa9 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.ts +++ b/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.ts @@ -7,9 +7,10 @@ import {CompareCardHeaderDirective} from '../compare-card-header.directive'; import {IExperimentDetail} from '../../../../features/experiments-compare/experiments-compare-models'; @Component({ - selector : 'sm-compare-card-list', - templateUrl: './compare-card-list.component.html', - styleUrls : ['./compare-card-list.component.scss'] + selector: 'sm-compare-card-list', + templateUrl: './compare-card-list.component.html', + styleUrls: ['./compare-card-list.component.scss'], + standalone: false }) export class CompareCardListComponent { diff --git a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.ts b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.ts index 631b12df..1e24563e 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.ts +++ b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.ts @@ -14,23 +14,22 @@ import {EllipsisMiddleDirective} from '@common/shared/ui-components/directives/e import {StatusIconLabelComponent} from '@common/shared/experiment-status-icon-label/status-icon-label.component'; @Component({ - selector: 'sm-experiment-compare-general-data', - templateUrl: './experiment-compare-general-data.component.html', - styleUrls: ['./experiment-compare-general-data.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - TooltipDirective, - RouterLink, - IdBadgeComponent, - TagListComponent, - DecimalPipe, - NAPipe, - TimeAgoPipe, - DatePipe, - EllipsisMiddleDirective, - StatusIconLabelComponent - ] + selector: 'sm-experiment-compare-general-data', + templateUrl: './experiment-compare-general-data.component.html', + styleUrls: ['./experiment-compare-general-data.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + TooltipDirective, + RouterLink, + IdBadgeComponent, + TagListComponent, + DecimalPipe, + NAPipe, + TimeAgoPipe, + DatePipe, + EllipsisMiddleDirective, + StatusIconLabelComponent + ] }) export class ExperimentCompareGeneralDataComponent { diff --git a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-header/experiment-compare-header.component.ts b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-header/experiment-compare-header.component.ts index 9923f0ce..5d3e693d 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-header/experiment-compare-header.component.ts +++ b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-header/experiment-compare-header.component.ts @@ -4,7 +4,12 @@ import {Store} from '@ngrx/store'; import {selectHideIdenticalFields, selectShowRowExtremes} from '../../reducers'; import {Observable, Subscription} from 'rxjs'; import { - refreshIfNeeded, setExportTable, setHideIdenticalFields, setShowGlobalLegend, setShowRowExtremes, setShowSearchExperimentsForCompare + refreshIfNeeded, + setExportTable, + setHideIdenticalFields, + setShowGlobalLegend, + setShowRowExtremes, + setShowSearchExperimentsForCompare } from '../../actions/compare-header.actions'; import {ActivatedRoute, Router} from '@angular/router'; import {selectRouterParams, selectRouterQueryParams, selectRouterUrl} from '@common/core/reducers/router-reducer'; @@ -12,26 +17,30 @@ import {setAutoRefresh} from '@common/core/actions/layout.actions'; import {filter, map} from 'rxjs/operators'; import {MatSlideToggleChange} from '@angular/material/slide-toggle'; import {compareLimitations} from '@common/shared/entity-page/footer-items/compare-footer-item'; -import {SelectExperimentsForCompareComponent, allowAddExperiment$} from '../../containers/select-experiments-for-compare/select-experiments-for-compare.component'; +import { + SelectExperimentsForCompareComponent, + allowAddExperiment$ +} from '../../containers/select-experiments-for-compare/select-experiments-for-compare.component'; import {RefreshService} from '@common/core/services/refresh.service'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {paramsActions} from '@common/experiments-compare/actions/experiments-compare-params.actions'; import {SelectModelComponent} from '@common/select-model/select-model.component'; -import { MatDialog } from '@angular/material/dialog'; +import {MatDialog} from '@angular/material/dialog'; import {setArchive} from '@common/core/actions/projects.actions'; @Component({ selector: 'sm-experiment-compare-header', templateUrl: './experiment-compare-header.component.html', styleUrls: ['./experiment-compare-header.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ExperimentCompareHeaderComponent implements OnInit, OnDestroy { viewModeToIcon = { graph: 'al-ico-charts-view', scatter: 'al-ico-scatter-view', - } + }; private routerSubscription: Subscription; public selectHideIdenticalFields$: Observable; @@ -62,7 +71,7 @@ export class ExperimentCompareHeaderComponent implements OnInit, OnDestroy { .pipe(map(params => params[this.currentPage])); this.routerSubscription = this.store.select(selectRouterParams).subscribe((params) => { this.selectedIds = params?.ids; - }) + }); } ngOnInit() { @@ -75,7 +84,7 @@ export class ExperimentCompareHeaderComponent implements OnInit, OnDestroy { const currentPage = this.route?.snapshot?.firstChild?.url?.[0]?.path; const viewMode = this.route?.snapshot?.firstChild?.url?.[1]?.path; if (currentPage && viewMode && (currentPage !== this.currentPage || viewMode !== this.viewMode)) { - this.store.dispatch(paramsActions.setView({primary: currentPage, secondary: viewMode})) + this.store.dispatch(paramsActions.setView({primary: currentPage, secondary: viewMode})); } this.currentPage = currentPage; this.viewMode = viewMode; @@ -95,6 +104,7 @@ export class ExperimentCompareHeaderComponent implements OnInit, OnDestroy { const page = event.value.replace(/.*_/, ''); this.router.navigate([`./${this.currentPage}/${page}`], { relativeTo: this.route, + queryParams: {params: undefined}, queryParamsHandling: 'merge' }); } @@ -106,7 +116,8 @@ export class ExperimentCompareHeaderComponent implements OnInit, OnDestroy { data: { selectionMode: 'multiple', selectedModels: selectedIds, - header: 'Select compared model'}, + header: 'Select compared model' + }, panelClass: 'full-screen', }).afterClosed().pipe(filter(ids => !!ids)).subscribe(ids => this.updateUrl(ids)); } else { diff --git a/src/app/webapp-common/experiments-compare/dumbs/metric-param-selector/metric-variant-selector.component.ts b/src/app/webapp-common/experiments-compare/dumbs/metric-param-selector/metric-variant-selector.component.ts index 81b19ee7..958aeb04 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/metric-param-selector/metric-variant-selector.component.ts +++ b/src/app/webapp-common/experiments-compare/dumbs/metric-param-selector/metric-variant-selector.component.ts @@ -11,18 +11,17 @@ import {MetricValueTypeStrings} from '@common/shared/utils/tableParamEncode'; import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; @Component({ - selector: 'sm-metric-variant-selector', - standalone: true, - imports: [ - MenuComponent, - ExperimentCompareSharedModule, - MetricVariantToNamePipe, - TooltipDirective, - SelectMetricForCustomColComponent, - ShowTooltipIfEllipsisDirective - ], - templateUrl: './metric-variant-selector.component.html', - styleUrl: './metric-variant-selector.component.scss' + selector: 'sm-metric-variant-selector', + imports: [ + MenuComponent, + ExperimentCompareSharedModule, + MetricVariantToNamePipe, + TooltipDirective, + SelectMetricForCustomColComponent, + ShowTooltipIfEllipsisDirective + ], + templateUrl: './metric-variant-selector.component.html', + styleUrl: './metric-variant-selector.component.scss' }) export class MetricVariantSelectorComponent { public metricVariantsSet: MetricVariantResult[]; diff --git a/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.html b/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.html index 018b2598..b4d772bd 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.html +++ b/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.html @@ -1,21 +1,24 @@ @if (!reportMode) {
- - -
+ > + + + +
}
diff --git a/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.scss b/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.scss index bf57fc8e..856f8667 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.scss +++ b/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.scss @@ -7,8 +7,8 @@ .actions { position: absolute; - right: 22px; - top: 24px; + right: 12px; + top: 12px; z-index: 1; display: flex; align-items: center; @@ -54,7 +54,8 @@ flex-wrap: wrap; background-color: var(--color-surface-container-lowest);; font-size: 14px; - max-height: calc(100% - 524px); + max-height: 25%; + min-height: 30px; overflow: auto; display: grid; grid-template-columns: 1fr 1fr 1fr 1fr; diff --git a/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.ts b/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.ts index 21f0295b..83726f8b 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.ts +++ b/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.ts @@ -5,7 +5,7 @@ import { ExtLayout, PlotlyGraphBaseComponent } from '@common/shared/single-graph/plotly-graph-base'; -import { SlicePipe } from '@angular/common'; +import {SlicePipe} from '@angular/common'; import {debounceTime, filter, take} from 'rxjs/operators'; import {from} from 'rxjs'; import {cloneDeep, get, isEqual, max, min, uniq} from 'lodash-es'; @@ -54,19 +54,17 @@ interface ParaPlotData { @Component({ - selector: 'sm-parallel-coordinates-graph', - templateUrl: './parallel-coordinates-graph.component.html', - styleUrls: ['./parallel-coordinates-graph.component.scss'], - imports: [ - SlicePipe, - TooltipDirective, - ChooseColorModule, - MetricVariantToNamePipe, - ShowTooltipIfEllipsisDirective, - MatIconButton, - MatIcon - ], - standalone: true + selector: 'sm-parallel-coordinates-graph', + templateUrl: './parallel-coordinates-graph.component.html', + styleUrls: ['./parallel-coordinates-graph.component.scss'], + imports: [ + SlicePipe, + TooltipDirective, + ChooseColorModule, + ShowTooltipIfEllipsisDirective, + MatIconButton, + MatIcon + ] }) export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent implements OnInit, OnChanges { private metricVariantToPathPipe = new MetricVariantToPathPipe(); @@ -156,7 +154,7 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent .pipe( debounceTime(75), filter(() => !!this.parallelGraph) - ).subscribe(() => this.drawChart())) + ).subscribe(() => this.drawChart())); } ngOnChanges(changes: SimpleChanges): void { @@ -227,7 +225,7 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent const splitted = parameter.split('.'); const newParameter = [splitted.shift(), splitted.join('.'), 'value']; parameter = `${parameter}.value`; - const allValuesIncludingNull = this.experiments.map(experiment => get(experiment.hyperparams, newParameter)); + const allValuesIncludingNull = this.experiments.map(experiment => get(experiment.hyperparams, newParameter)); const allValues = allValuesIncludingNull.filter(value => (value !== undefined)).filter(value => (value !== '')); const textVal = {} as Record; let ticktext = this.naturalCompare(uniq(allValues).filter(text => text !== '')); @@ -326,19 +324,21 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent getLayout(setDimentiosn = true, margins?) { return { - margin: margins ? margins : {l: 120, r: 120}, + margin: margins ? margins : {l: 120, r: 120, b: this.container.nativeElement.clientHeight < 350 ? 40 : 60}, ...(setDimentiosn && { - height: 500, + height: Math.min(Math.max(this.container.nativeElement.clientHeight - this.legend.nativeElement.offsetHeight - 40, 300), 600), width: this.parallelGraph.nativeElement.offsetWidth }), - ...(this.isDarkTheme() ? { - paper_bgcolor: 'transparent', + ...(this.reportMode && { height: this.parallelGraph.nativeElement.parentElement.offsetHeight - this.legend.nativeElement.offsetHeight - 40, - margin: {l: 120, r: 120, b: 20}, + margin: {l: 120, r: 120, b: 20} + }), + ...(this.isDarkTheme() && { + paper_bgcolor: 'transparent', font: { color: Colors.dark.tick } - } : {}) + }) } as ExtLayout; } @@ -453,7 +453,7 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent data: this.data as unknown as ExtData[], layout: { ...this.getLayout(false, {l: 120, r: 120, t: 150, b: 40}), - title: '' + title: 'Parallel coordinates', }, config: { displaylogo: false, diff --git a/src/app/webapp-common/experiments-compare/dumbs/param-selector/param-selector.component.html b/src/app/webapp-common/experiments-compare/dumbs/param-selector/param-selector.component.html index 9cb07c05..f8b07b34 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/param-selector/param-selector.component.html +++ b/src/app/webapp-common/experiments-compare/dumbs/param-selector/param-selector.component.html @@ -18,7 +18,7 @@
@if (selectedHyperParams?.length > 0) { -
+
@for (hyperParam of selectedHyperParams; track trackByIndex($index)) {
{{ hyperParam }} diff --git a/src/app/webapp-common/experiments-compare/dumbs/param-selector/param-selector.component.scss b/src/app/webapp-common/experiments-compare/dumbs/param-selector/param-selector.component.scss index f7622c57..71744f80 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/param-selector/param-selector.component.scss +++ b/src/app/webapp-common/experiments-compare/dumbs/param-selector/param-selector.component.scss @@ -19,8 +19,9 @@ } } - .selected-parameter { + .selected-parameters .selected-parameter { color: var(--color-on-surface-variant); + padding: 4px 8px; &:hover { background-color: var(--color-surface-container-low); @@ -53,7 +54,6 @@ display: flex; align-items: center; justify-content: space-between; - padding: 4px 8px; border-radius: 4px; background-color: transparent; diff --git a/src/app/webapp-common/experiments-compare/dumbs/param-selector/param-selector.component.ts b/src/app/webapp-common/experiments-compare/dumbs/param-selector/param-selector.component.ts index 8b69df3b..b8764623 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/param-selector/param-selector.component.ts +++ b/src/app/webapp-common/experiments-compare/dumbs/param-selector/param-selector.component.ts @@ -5,7 +5,6 @@ import {ClickStopPropagationDirective} from '@common/shared/ui-components/direct import { GroupedCheckedFilterListComponent } from '@common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component'; -import { AsyncPipe } from '@angular/common'; import { trackByIndex } from '@common/shared/utils/forms-track-by'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import { @@ -13,19 +12,17 @@ import { } from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; @Component({ - selector: 'sm-param-selector', - standalone: true, - imports: [ - MenuComponent, - ExperimentSharedModule, - ClickStopPropagationDirective, - GroupedCheckedFilterListComponent, - AsyncPipe, - TooltipDirective, - ShowTooltipIfEllipsisDirective -], - templateUrl: './param-selector.component.html', - styleUrl: './param-selector.component.scss' + selector: 'sm-param-selector', + imports: [ + MenuComponent, + ExperimentSharedModule, + ClickStopPropagationDirective, + GroupedCheckedFilterListComponent, + TooltipDirective, + ShowTooltipIfEllipsisDirective + ], + templateUrl: './param-selector.component.html', + styleUrl: './param-selector.component.scss' }) export class ParamSelectorComponent { public trackByIndex = trackByIndex; diff --git a/src/app/webapp-common/experiments-compare/effects/experiments-compare-params.effects.ts b/src/app/webapp-common/experiments-compare/effects/experiments-compare-params.effects.ts index 070e7923..9eeb8e8c 100644 --- a/src/app/webapp-common/experiments-compare/effects/experiments-compare-params.effects.ts +++ b/src/app/webapp-common/experiments-compare/effects/experiments-compare-params.effects.ts @@ -61,7 +61,7 @@ export class ExperimentsCompareParamsEffects { catchError(error => [ requestFailed(error), deactivateLoader(action.type), - setServerError(error, null, 'The attempt to retrieve your experiment data failed. Refresh your browser and try again.') + setServerError(error, null, 'The attempt to retrieve your data failed. Refresh your browser and try again.') ] ) ); diff --git a/src/app/webapp-common/experiments-compare/experiments-compare-routing.module.ts b/src/app/webapp-common/experiments-compare/experiments-compare-routing.module.ts index 598c594b..3f65ba2d 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare-routing.module.ts +++ b/src/app/webapp-common/experiments-compare/experiments-compare-routing.module.ts @@ -10,12 +10,14 @@ import {ExperimentCompareHyperParamsGraphComponent} from './containers/experimen import {ExperimentCompareParamsComponent} from './containers/experiment-compare-params/experiment-compare-params.component'; import {ModelCompareDetailsComponent} from '@common/experiments-compare/containers/model-compare-details/model-compare-details.component'; import {compareNavigationGuard} from '@common/experiments-compare/compare-navigation.guard'; +import {resetContextMenuGuard} from '@common/shared/guards/resetContextMenuGuard.guard'; export const routes: Routes = [ { path: '', component: ExperimentsCompareComponent, + canDeactivate: [resetContextMenuGuard], data: {search: false}, children: [ {path: '', redirectTo: 'details', pathMatch: 'full'}, diff --git a/src/app/webapp-common/experiments-compare/experiments-compare.component.scss b/src/app/webapp-common/experiments-compare/experiments-compare.component.scss index 41b9601d..4be14fe6 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare.component.scss +++ b/src/app/webapp-common/experiments-compare/experiments-compare.component.scss @@ -1,6 +1,3 @@ -@import "../layout/layout"; - -$container-padding-top: 24px; $nav-height: 62px; $header-height: 60px; diff --git a/src/app/webapp-common/experiments-compare/experiments-compare.component.ts b/src/app/webapp-common/experiments-compare/experiments-compare.component.ts index 6dfbf3e4..5e9c41d7 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare.component.ts +++ b/src/app/webapp-common/experiments-compare/experiments-compare.component.ts @@ -22,7 +22,6 @@ import { SelectExperimentsForCompareComponent } from '@common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component'; import {MatDialog} from '@angular/material/dialog'; -import {HeaderMenuService} from '@common/shared/services/header-menu.service'; import { EXPERIMENTS_COMPARE_ROUTES, MODELS_COMPARE_ROUTES @@ -37,10 +36,11 @@ const toCompareEntityType = { }; @Component({ - selector: 'sm-experiments-compare', - templateUrl: './experiments-compare.component.html', - styleUrls: ['./experiments-compare.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-experiments-compare', + templateUrl: './experiments-compare.component.html', + styleUrls: ['./experiments-compare.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ExperimentsCompareComponent implements OnInit, OnDestroy { protected readonly trackById = trackById; @@ -69,7 +69,6 @@ export class ExperimentsCompareComponent implements OnInit, OnDestroy { private colorHash: ColorHashService, private dialog: MatDialog, private cdr: ChangeDetectorRef, - private contextMenuService: HeaderMenuService ) { // updating URL with store query params this.selectedProject$ = this.store.select(selectSelectedProject); @@ -87,7 +86,6 @@ export class ExperimentsCompareComponent implements OnInit, OnDestroy { this.subs.unsubscribe(); this.store.dispatch(resetSelectCompareHeader({fullReset: true})); this.store.dispatch(setGlobalLegendData({data: null})); - this.store.dispatch(headerActions.reset()); this.store.dispatch(resetSelectModelState({fullReset: true})); } @@ -169,7 +167,7 @@ export class ExperimentsCompareComponent implements OnInit, OnDestroy { ...(selectedProject && { selectedProjectBreadcrumb: { name: selectedProject?.id === '*' ? `All ${this.titleCasePipe.transform(this.entityType)}s` : selectedProject?.basename, - url: `${projectTypeBasePath[projectType]}/${selectedProject?.id}/${this.entityType === 'model' ? 'model' : 'experiment'}s` + url: `${projectTypeBasePath[projectType]}/${selectedProject?.id}/${this.entityType === 'model' ? 'model' : 'task'}s` } }) } diff --git a/src/app/webapp-common/experiments-compare/experiments-compare.module.ts b/src/app/webapp-common/experiments-compare/experiments-compare.module.ts index 0939666a..c25e6738 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare.module.ts +++ b/src/app/webapp-common/experiments-compare/experiments-compare.module.ts @@ -80,9 +80,6 @@ import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/ import { GroupedCheckedFilterListComponent } from '@common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component'; -import { - SelectableFilterListComponent -} from '@common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component'; import { SelectableGroupedFilterListComponent } from '@common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component'; @@ -107,6 +104,7 @@ import {DrawerComponent} from '@common/shared/ui-components/panel/drawer/drawer. import {PushPipe} from '@ngrx/component'; import {MatButton, MatIconButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; +import {SelectModelModule} from '@common/select-model/select-model.module'; export const COMPARE_STORE_KEY = 'experimentsCompare'; @@ -179,6 +177,7 @@ export const getCompareConfig = (userPreferences: UserPreferences) => ({ SelectCompareHeaderEffects, ExperimentsCompareScalarsGraphEffects ]), + SelectModelModule, MatRadioModule, FormsModule, ParallelCoordinatesGraphComponent, @@ -200,7 +199,6 @@ export const getCompareConfig = (userPreferences: UserPreferences) => ({ PortalComponent, TooltipDirective, GroupedCheckedFilterListComponent, - SelectableFilterListComponent, SelectableGroupedFilterListComponent, RefreshButtonComponent, MatSlideToggleModule, diff --git a/src/app/webapp-common/experiments-compare/get-key-value-array-pipe.pipe.ts b/src/app/webapp-common/experiments-compare/get-key-value-array-pipe.pipe.ts index a81ced30..a8b64d45 100644 --- a/src/app/webapp-common/experiments-compare/get-key-value-array-pipe.pipe.ts +++ b/src/app/webapp-common/experiments-compare/get-key-value-array-pipe.pipe.ts @@ -1,7 +1,8 @@ import {Pipe, PipeTransform} from '@angular/core'; @Pipe({ - name: 'getKeyValueArrayPipe', + name: 'getKeyValueArrayPipe', + standalone: false }) export class GetKeyValueArrayPipePipe implements PipeTransform { diff --git a/src/app/webapp-common/experiments-compare/services/experiment-details-reverter.service.ts b/src/app/webapp-common/experiments-compare/services/experiment-details-reverter.service.ts index 45188577..6fdc8bee 100644 --- a/src/app/webapp-common/experiments-compare/services/experiment-details-reverter.service.ts +++ b/src/app/webapp-common/experiments-compare/services/experiment-details-reverter.service.ts @@ -41,7 +41,7 @@ export class ExperimentDetailsReverterService extends ExperimentDetailsReverterS 'last update at': experiment.last_update && formatDate(experiment.last_update, TIME_FORMAT_STRING, this.locale) || NA, 'completed at': experiment.completed && formatDate(experiment.completed, TIME_FORMAT_STRING, this.locale) || NA, 'run time': this.durationPipe.transform(experiment.active_duration) || NA, - 'queue': experiment.execution.queue?.display_name ?? experiment.execution.queue?.name ?? NA, + 'queue': experiment.execution.queue?.display_name || experiment.execution.queue?.name || NA, 'worker': experiment.last_worker || NA, 'created by': experiment.user.name || NA, 'parent task': (experiment.parent as ITask)?.name || NA, diff --git a/src/app/webapp-common/experiments/actions/common-experiment-output.actions.ts b/src/app/webapp-common/experiments/actions/common-experiment-output.actions.ts index 692f37f2..1a5e3b88 100644 --- a/src/app/webapp-common/experiments/actions/common-experiment-output.actions.ts +++ b/src/app/webapp-common/experiments/actions/common-experiment-output.actions.ts @@ -41,12 +41,12 @@ export const resetOutput = createAction(EXPERIMENTS_OUTPUT_PREFIX + 'RESET_OUTPU export const experimentPlotsRequested = createAction( EXPERIMENTS_OUTPUT_PREFIX + 'EXPERIMENT_PLOTS_REQUESTED', - props<{ task: string }>() + props<{ task: string; refresh?: boolean}>() ); export const experimentScalarRequested = createAction( EXPERIMENTS_OUTPUT_PREFIX + 'EXPERIMENT_SCALAR_REQUESTED', - props<{experimentId: string; model?: boolean, refresh?: boolean}>() + props<{experimentId: string; model?: boolean; refresh?: boolean; skipSingleValue?: boolean}>() ); export const setHistogram = createAction( @@ -94,6 +94,11 @@ export const setExperimentSettings = createAction( props<{ id: string; changes: Partial }>() ); +export const removeExperimentSettings = createAction( + EXPERIMENTS_OUTPUT_PREFIX + 'REMOVE_EXPERIMENT_SETTINGS', + props<{ id: string }>() +); + export const setExperimentMetricsSearchTerm = createAction( EXPERIMENTS_OUTPUT_PREFIX + 'SET_EXPERIMENT_METRICS_SEARCH_TERM', props<{ searchTerm: string }>() diff --git a/src/app/webapp-common/experiments/actions/common-experiments-info.actions.ts b/src/app/webapp-common/experiments/actions/common-experiments-info.actions.ts index b6faea97..f7ee86a8 100644 --- a/src/app/webapp-common/experiments/actions/common-experiments-info.actions.ts +++ b/src/app/webapp-common/experiments/actions/common-experiments-info.actions.ts @@ -7,9 +7,6 @@ import {ConfigurationItem} from '~/business-logic/model/tasks/configurationItem' import {ExperimentInfoState} from '~/features/experiments/reducers/experiment-info.reducer'; import {ActivatedRoute} from '@angular/router'; import {TaskTypeEnum} from '~/business-logic/model/tasks/taskTypeEnum'; -import { - TasksGetOperationsLogResponseOperations -} from '~/business-logic/model/tasks/tasksGetOperationsLogResponseOperations'; export enum StepStatusEnum { queued = 'queued', @@ -47,11 +44,6 @@ export const getExperimentInfo = createAction( EXPERIMENTS_INFO_PREFIX + 'GET_EXPERIMENT_INFO', props<{ id: string; autoRefresh?: boolean }>() ); -export const getExperimentOperationLog = createAction( - EXPERIMENTS_INFO_PREFIX + 'GET_EXPERIMENT_OPERATION_LOG', - props<{ id: string; autoRefresh?: boolean }>() -); - export const resetExperimentInfo = createAction(EXPERIMENTS_INFO_PREFIX + 'RESET_EXPERIMENT_INFO'); @@ -75,11 +67,6 @@ export const setExperimentInfoData = createAction( props<{ experiment: IExperimentInfo }>() ); -export const setExperimentOperationLog = createAction( - EXPERIMENTS_INFO_PREFIX + 'SET_EXPERIMENT_OPERATION_LOG', - props<{ operationLog: TasksGetOperationsLogResponseOperations[] }>() -); - export const getExperiment = createAction( EXPERIMENTS_INFO_PREFIX + '[set experiment]', props<{ experimentId: string; autoRefresh?: boolean }>() diff --git a/src/app/webapp-common/experiments/actions/common-experiments-view.actions.ts b/src/app/webapp-common/experiments/actions/common-experiments-view.actions.ts index ba08fdb4..4c6c30fb 100644 --- a/src/app/webapp-common/experiments/actions/common-experiments-view.actions.ts +++ b/src/app/webapp-common/experiments/actions/common-experiments-view.actions.ts @@ -198,7 +198,7 @@ export const resetExperiments = createAction( props<{skipResetMetric?: boolean}>()); export const getCustomMetrics = createAction( EXPERIMENTS_PREFIX + ' [get custom metrics]', - props<{hideLoader?: boolean}>() + props<{hideLoader?: boolean; projectId?: string}>() ); export const getCustomMetricsPerType = createAction( EXPERIMENTS_PREFIX + ' [get custom metrics per type]', diff --git a/src/app/webapp-common/experiments/containers/create-experiment-dialog/create-experiment-dialog.component.html b/src/app/webapp-common/experiments/containers/create-experiment-dialog/create-experiment-dialog.component.html index e267d5ba..79f59d87 100644 --- a/src/app/webapp-common/experiments/containers/create-experiment-dialog/create-experiment-dialog.component.html +++ b/src/app/webapp-common/experiments/containers/create-experiment-dialog/create-experiment-dialog.component.html @@ -10,10 +10,11 @@
+ -
} @else { @@ -82,7 +83,7 @@ Working Directory - + Python Shell @@ -128,10 +129,10 @@ Content - - + +
} } @@ -141,7 +142,7 @@ @if (!shell()) {
- Add Task.init call + Add Task.init call
} @@ -158,7 +159,7 @@
Configuration Hyperparameters Args
- @for (pair of args.controls; track $index) { + @for (pair of args.controls; track pair) {
Key @@ -190,40 +191,47 @@
Python
-
+
Package Manager
+
Use Poetry
-
- +
Use Existing Virtual Environment
+
+ + Preinstalled venv
- +
Additional Packages
Skip - Use requirements.txt + Use requirements.txt Specify packages @if (envFormGroup.controls.requirements.value === 'manual') { Requirements - +numpy != 1.24.0 # https://github.com/numpy/numpy/issues/22826"> }
Environment Variables
- @for (pair of vars.controls; track $index) { + @for (pair of vars.controls; track pair) {
Variable diff --git a/src/app/webapp-common/experiments/containers/create-experiment-dialog/create-experiment-dialog.component.scss b/src/app/webapp-common/experiments/containers/create-experiment-dialog/create-experiment-dialog.component.scss index 16467956..0e6c61d6 100644 --- a/src/app/webapp-common/experiments/containers/create-experiment-dialog/create-experiment-dialog.component.scss +++ b/src/app/webapp-common/experiments/containers/create-experiment-dialog/create-experiment-dialog.component.scss @@ -1,4 +1,4 @@ -@import "variables"; +@use "variables"; :host { --mat-expansion-container-shape: 0; @@ -7,6 +7,10 @@ ::ng-deep .generic-container { padding: 32px 24px 0 !important; --mat-stepper-container-color: transparent; + + .ace_scroller { + bottom: 2px !important; + } } } @@ -46,13 +50,22 @@ h5 { margin: 24px 0 6px; } +h6 { + font-size: 12px; + margin: 24px 0 8px; + + &.disabled { + opacity: 0.5; + } +} + section { border-top: 1px solid var(--color-outline-variant); padding-bottom: 24px; } code { - font-family: $font-family-monospace; + font-family: variables.$font-family-monospace; border-radius: 4px; margin: 0 4px; padding: 2px 4px; @@ -76,12 +89,28 @@ mat-form-field { } .checkbox { - margin: 24px 0 12px -6px; + margin: 12px 0 12px -6px; +} + +.poetry { + margin-bottom: 12px; +} + +.venv { + display: grid; + grid-template-columns: auto 1fr; + grid-template-rows: 48px; + align-items: end; + gap: 24px; + + mat-button-toggle-group { + height: 40px; + } } .terminal { resize: none; - font-family: $font-family-monospace; + font-family: variables.$font-family-monospace; font-size: 13px !important; line-height: 1.6; padding: 6px; @@ -118,3 +147,7 @@ sm-code-editor { .mat-expansion-panel .mat-expansion-panel-header:not([aria-disabled="true"]).cdk-keyboard-focused, .mat-expansion-panel .mat-expansion-panel-header:not([aria-disabled="true"]).cdk-program-focused { background: inherit; } + +textarea { + resize: none; +} diff --git a/src/app/webapp-common/experiments/containers/create-experiment-dialog/create-experiment-dialog.component.ts b/src/app/webapp-common/experiments/containers/create-experiment-dialog/create-experiment-dialog.component.ts index e93b3b4e..17453291 100644 --- a/src/app/webapp-common/experiments/containers/create-experiment-dialog/create-experiment-dialog.component.ts +++ b/src/app/webapp-common/experiments/containers/create-experiment-dialog/create-experiment-dialog.component.ts @@ -45,6 +45,15 @@ import {debounceTime, distinctUntilChanged, map} from 'rxjs/operators'; import {CodeEditorComponent} from '@common/shared/ui-components/data/code-editor/code-editor.component'; import {shellBinaryValidator} from '@common/shared/validators/shell-binary.validator'; import {MatExpansionPanel, MatExpansionPanelHeader} from '@angular/material/expansion'; +import {ButtonToggleComponent} from '@common/shared/ui-components/inputs/button-toggle/button-toggle.component'; +import {Ace} from 'ace-builds'; + +const venvOptions = [ + {label: 'Discover', value: 'discover'}, + {label: 'manual', value: 'Specify'}, +]; + +type VenvOption = typeof venvOptions[number]['value']; export interface createExperimentDialogResult { id?: string; @@ -62,6 +71,7 @@ export interface createExperimentDialogResult { args: {key: string; value: string}[]; poetry: boolean; binary: string; + venvType: VenvOption; venv: string; requirements: 'skip' | 'text' | 'manual'; pip: string; @@ -80,52 +90,54 @@ type ScriptType = typeof scriptTypes[number]; @Component({ - selector: 'sm-create-experiment-dialog', - templateUrl: './create-experiment-dialog.component.html', - styleUrl: './create-experiment-dialog.component.scss', - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - MatStepper, - MatStep, - MatFormField, - ReactiveFormsModule, - DialogTemplateComponent, - MatStepperPrevious, - MatStepperNext, - MatInput, - MatLabel, - MatSelect, - MatOption, - MatCheckbox, - MatRadioGroup, - MatRadioButton, - PaginatedEntitySelectorComponent, - MatStepperIcon, - NgTemplateOutlet, - MatError, - MatButton, - MatIconButton, - MatIcon, - CodeEditorComponent, - MatSuffix, - MatExpansionPanel, - MatExpansionPanelHeader, - ], - providers: [ - { - provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, - useValue: {subscriptSizing: 'dynamic', appearance: 'outline', floatLabel: 'always'} as MatFormFieldDefaultOptions - }, - {provide: MAT_RIPPLE_GLOBAL_OPTIONS, useValue: {disabled: true} as RippleGlobalOptions} - ] + selector: 'sm-create-experiment-dialog', + templateUrl: './create-experiment-dialog.component.html', + styleUrl: './create-experiment-dialog.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatStepper, + MatStep, + MatFormField, + ReactiveFormsModule, + DialogTemplateComponent, + MatStepperPrevious, + MatStepperNext, + MatInput, + MatLabel, + MatSelect, + MatOption, + MatCheckbox, + MatRadioGroup, + MatRadioButton, + PaginatedEntitySelectorComponent, + MatStepperIcon, + NgTemplateOutlet, + MatError, + MatButton, + MatIconButton, + MatIcon, + CodeEditorComponent, + MatSuffix, + MatExpansionPanel, + MatExpansionPanelHeader, + ButtonToggleComponent, + ], + providers: [ + { + provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, + useValue: { subscriptSizing: 'dynamic', appearance: 'outline', floatLabel: 'always' } as MatFormFieldDefaultOptions + }, + { provide: MAT_RIPPLE_GLOBAL_OPTIONS, useValue: { disabled: true } as RippleGlobalOptions } + ] }) export class CreateExperimentDialogComponent { private readonly formBuilder = inject(FormBuilder); private readonly store = inject(Store); private readonly dialog = inject(MatDialogRef); + protected readonly venvOptions = venvOptions; private codeForm = viewChild>('codeForm'); + private codeEditor = viewChild(CodeEditorComponent); protected queues = this.store.selectSignal(selectQueuesList); protected filteredQueues = computed(() => this.queueVal() ? @@ -163,6 +175,7 @@ export class CreateExperimentDialogComponent { }) envFormGroup = this.formBuilder.group({ poetry: [false], + venvType: ['discover'], venv: [null], requirements: ['text'], pip: [''], @@ -187,6 +200,7 @@ export class CreateExperimentDialogComponent { )); protected scriptTypes = computed(() => this.shell() ? scriptTypes.filter((e, index) => index !== 1) : scriptTypes); protected editMode = signal(false); + protected cursorPosition: Ace.Point; constructor() { this.store.dispatch(getQueuesForEnqueue()); @@ -258,10 +272,10 @@ index 000000000..ff86f39a4 this.codeFormGroup.controls[type].setValidators(Validators.required); } else { this.codeFormGroup.controls[type].clearValidators(); - this.codeFormGroup.controls[type].updateValueAndValidity({onlySelf: true}); } - this.codeFormGroup.updateValueAndValidity(); - }) + this.codeFormGroup.controls[type].updateValueAndValidity({onlySelf: true}); + }); + this.codeFormGroup.updateValueAndValidity(); } togglePoetry(usePoetry: boolean) { @@ -298,6 +312,7 @@ index 000000000..ff86f39a4 this.codeFormGroup.controls.script.setValue(file.name ?? 'main.py'); }; reader.readAsText(file); + ($event.target as HTMLInputElement).value = ''; } editScript() { @@ -306,12 +321,30 @@ index 000000000..ff86f39a4 updateScript(code: string) { this.codeFormGroup.controls.uncommited.setValue(code); + this.cursorPosition = this.codeEditor().position; + if (!this.codeFormGroup.controls.script.value) { + this.codeFormGroup.controls.script.setValue(`custom_code.${this.shell() ? 'sh' : 'py'}`) + } + this.closeScript(); + } + + closeScript () { this.editMode.set(false) - window.setTimeout(() => this.codeForm().nativeElement.scrollTo({top: 1000, behavior: 'smooth'})); + window.setTimeout(() => this.codeForm().nativeElement.scrollTo({top: 1000, behavior: 'instant'})); } clearFile() { this.codeFormGroup.controls.script.setValue(null); this.codeFormGroup.controls.uncommited.setValue(null); } + + binaryChanged(value: string) { + if(value === 'shell' && this.codeFormGroup.controls.scriptType.value === 'module') { + this.codeFormGroup.controls.scriptType.setValue('script'); + } + } + + venevTypeChange(value: VenvOption) { + this.envFormGroup.controls.venvType.setValue(value); + } } diff --git a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.html b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.html index 9a12cad7..80f0b3ce 100644 --- a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.html @@ -25,14 +25,16 @@ > - + @if (modelInfo) { + + } } @else { @if (modelInfo) {
- +

NO ARTIFACTS RECORDED

diff --git a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.scss b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.scss index 19bb2869..a6a4ca9d 100644 --- a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.scss +++ b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.scss @@ -5,7 +5,7 @@ .no-data { text-align: center; - color: var(--color-on-surface-variant); + color: var(--color-empty-state); position: absolute; top: 50%; left: 50%; @@ -13,9 +13,7 @@ display: block; h4 { font-weight: 500; - } - .al-icon { - color: var(--color-tint-14); + font-size: 16px; } } diff --git a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.ts b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.ts index 7825adc1..b83cbbe6 100644 --- a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.ts @@ -26,9 +26,10 @@ import { import {selectSelectedProject} from '@common/core/reducers/projects.reducer'; @Component({ - selector: 'sm-experiment-info-artifacts-model', - templateUrl: './experiment-info-artifacts.component.html', - styleUrls: ['./experiment-info-artifacts.component.scss'] + selector: 'sm-experiment-info-artifacts-model', + templateUrl: './experiment-info-artifacts.component.html', + styleUrls: ['./experiment-info-artifacts.component.scss'], + standalone: false }) export class ExperimentInfoArtifactsComponent implements OnDestroy { public backdropActive$: Observable; diff --git a/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.ts b/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.ts index daf2bd25..b2c62cca 100644 --- a/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.ts @@ -7,10 +7,11 @@ import {selectDownloadingArtifact, selectExperimentModelInfoData} from '../../re @Component({ - selector: 'sm-experiment-info-artifact-item', - templateUrl: './experiment-info-artifact-item.component.html', - styleUrls: ['./experiment-info-artifact-item.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-experiment-info-artifact-item', + templateUrl: './experiment-info-artifact-item.component.html', + styleUrls: ['./experiment-info-artifact-item.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ExperimentInfoArtifactItemComponent { private store = inject(Store); diff --git a/src/app/webapp-common/experiments/containers/experiment-info-execution/experiment-info-execution.component.ts b/src/app/webapp-common/experiments/containers/experiment-info-execution/experiment-info-execution.component.ts index 99b2386b..f4697652 100644 --- a/src/app/webapp-common/experiments/containers/experiment-info-execution/experiment-info-execution.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-info-execution/experiment-info-execution.component.ts @@ -32,9 +32,10 @@ import { } from '@common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component'; @Component({ - selector: 'sm-experiment-info-execution', - templateUrl: './experiment-info-execution.component.html', - styleUrls: ['./experiment-info-execution.component.scss'] + selector: 'sm-experiment-info-execution', + templateUrl: './experiment-info-execution.component.html', + styleUrls: ['./experiment-info-execution.component.scss'], + standalone: false }) export class ExperimentInfoExecutionComponent implements OnInit, OnDestroy { @@ -195,7 +196,7 @@ export class ExperimentInfoExecutionComponent implements OnInit, OnDestroy { data: { textData: this.formData?.requirements?.pip, readOnly: false, - title: 'EDIT Python PACKAGES', + title: 'EDIT PYTHON PACKAGES', } as EditJsonData }); diff --git a/src/app/webapp-common/experiments/containers/experiment-info-general/experiment-info-general.component.html b/src/app/webapp-common/experiments/containers/experiment-info-general/experiment-info-general.component.html index b8d436be..b2f4849b 100644 --- a/src/app/webapp-common/experiments/containers/experiment-info-general/experiment-info-general.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-info-general/experiment-info-general.component.html @@ -1,8 +1,8 @@ - +> diff --git a/src/app/webapp-common/experiments/containers/experiment-info-general/experiment-info-general.component.ts b/src/app/webapp-common/experiments/containers/experiment-info-general/experiment-info-general.component.ts index 9b857b35..7310a6a0 100644 --- a/src/app/webapp-common/experiments/containers/experiment-info-general/experiment-info-general.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-info-general/experiment-info-general.component.ts @@ -1,8 +1,5 @@ -import {Component, ElementRef, viewChild, inject, ChangeDetectionStrategy} from '@angular/core'; -import {BehaviorSubject, combineLatest} from 'rxjs'; +import {Component, ElementRef, viewChild, inject, ChangeDetectionStrategy, computed, effect} from '@angular/core'; import {Store} from '@ngrx/store'; -import {debounceTime, distinctUntilChanged, filter, map} from 'rxjs/operators'; -import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; import { selectExperimentInfoData, selectIsExperimentEditable, @@ -10,71 +7,43 @@ import { } from '~/features/experiments/reducers'; import {experimentDetailsUpdated} from '../../actions/common-experiments-info.actions'; import {isReadOnly} from '@common/shared/utils/is-read-only'; -import {selectEditingDescription} from '@common/experiments/reducers'; +import {selectEditingDescription, selectSelectedExperimentFromRouter} from '@common/experiments/reducers'; import { - ExperimentGeneralInfoComponent -} from '@common/experiments/dumb/experiment-general-info/experiment-general-info.component'; + ExperimentDetailsComponent +} from '@common/experiments/dumb/experiment-details/experiment-details.component'; import {RefreshService} from '@common/core/services/refresh.service'; -import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; @Component({ - selector: 'sm-experiment-info-general', - templateUrl: './experiment-info-general.component.html', - styleUrls: ['./experiment-info-general.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, + selector: 'sm-experiment-info-general', + templateUrl: './experiment-info-general.component.html', + styleUrls: ['./experiment-info-general.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ExperimentInfoGeneralComponent { protected store = inject(Store); protected readonly ref = inject>(ElementRef); protected refresh = inject(RefreshService); - public experimentChanged(experiment) { - this.isExample = isReadOnly(experiment); - this.selectedExperiment = experiment; - } - - - protected experimentInfoData = this.store.selectSignal(selectExperimentInfoData); protected editable = this.store.selectSignal(selectIsExperimentEditable); protected selectedExperiment = this.store.selectSignal(selectSelectedExperiment); + protected selectedExperimentId = this.store.selectSignal(selectSelectedExperimentFromRouter); + protected isExample = computed(() => isReadOnly(this.selectedExperiment())); + private editDesc = this.store.selectSignal(selectEditingDescription); - public isExample: boolean; - private experiment$ = new BehaviorSubject(null); - - protected info = viewChild(ExperimentGeneralInfoComponent); + protected info = viewChild(ExperimentDetailsComponent); constructor() { - this.store.select(selectEditingDescription) - .pipe( - takeUntilDestroyed(), - filter(edit => edit) - ) - .subscribe(() => { - this.ref.nativeElement.scrollTo({top: 0, behavior: 'smooth'}); + effect(() => { + if(this.editDesc() && this.info()?.experimentDescriptionSection()) { + this.ref.nativeElement.scrollTo({top: 370, behavior: 'smooth'}); this.info()?.experimentDescriptionSection().editModeChanged(true); - }); - - combineLatest([ - this.store.select(selectSelectedExperiment), - this.experiment$ - ]) - .pipe( - takeUntilDestroyed(), - debounceTime(0), - map(([selected, input]) => input ?? selected), - distinctUntilChanged((prev, current) => prev?.id === current?.id && prev?.started === current?.started), - filter(experiment => !!experiment?.id), - ) - .subscribe(experiment => { - if (this.selectedExperiment()?.id !== experiment.id || this.selectedExperiment()?.started !== experiment.started) { - this.experimentChanged(experiment) - } - }); - + } + }); } commentChanged(comment) { - this.store.dispatch(experimentDetailsUpdated({id: this.selectedExperiment().id, changes: {comment}})); + this.store.dispatch(experimentDetailsUpdated({id: this.selectedExperimentId(), changes: {comment}})); } } diff --git a/src/app/webapp-common/experiments/containers/experiment-info-hyper-parameters-form-container/experiment-info-hyper-parameters-form-container.component.html b/src/app/webapp-common/experiments/containers/experiment-info-hyper-parameters-form-container/experiment-info-hyper-parameters-form-container.component.html index 82bd16a3..adb11d0e 100644 --- a/src/app/webapp-common/experiments/containers/experiment-info-hyper-parameters-form-container/experiment-info-hyper-parameters-form-container.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-info-hyper-parameters-form-container/experiment-info-hyper-parameters-form-container.component.html @@ -3,11 +3,11 @@ 0) { - this.store.dispatch(saveHyperParamsSection({hyperparams: this.executionParamsForm().form})); + if (this.executionParamsForm().form().length > 0) { + this.store.dispatch(saveHyperParamsSection({hyperparams: this.executionParamsForm().form()})); } else { this.store.dispatch(deleteHyperParamsSection({section: this.selectedSection()})); } diff --git a/src/app/webapp-common/experiments/containers/experiment-info-hyper-parameters/experiment-info-hyper-parameters.component.html b/src/app/webapp-common/experiments/containers/experiment-info-hyper-parameters/experiment-info-hyper-parameters.component.html index c3560c72..d6f8e568 100644 --- a/src/app/webapp-common/experiments/containers/experiment-info-hyper-parameters/experiment-info-hyper-parameters.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-info-hyper-parameters/experiment-info-hyper-parameters.component.html @@ -14,5 +14,5 @@ [disableAdd]="!((selectedExperiment$ | ngrxPush)?.status === 'created')" > - + diff --git a/src/app/webapp-common/experiments/containers/experiment-info-hyper-parameters/experiment-info-hyper-parameters.component.ts b/src/app/webapp-common/experiments/containers/experiment-info-hyper-parameters/experiment-info-hyper-parameters.component.ts index 401ff5d6..cca87148 100644 --- a/src/app/webapp-common/experiments/containers/experiment-info-hyper-parameters/experiment-info-hyper-parameters.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-info-hyper-parameters/experiment-info-hyper-parameters.component.ts @@ -23,9 +23,10 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; @Component({ - selector: 'sm-experiment-info-hyper-parameters', - templateUrl: './experiment-info-hyper-parameters.component.html', - styleUrls: ['./experiment-info-hyper-parameters.component.scss'] + selector: 'sm-experiment-info-hyper-parameters', + templateUrl: './experiment-info-hyper-parameters.component.html', + styleUrls: ['./experiment-info-hyper-parameters.component.scss'], + standalone: false }) export class ExperimentInfoHyperParametersComponent { private store = inject(Store); diff --git a/src/app/webapp-common/experiments/containers/experiment-info-model/experiment-info-model.component.html b/src/app/webapp-common/experiments/containers/experiment-info-model/experiment-info-model.component.html index 7278cdbe..2b78788d 100644 --- a/src/app/webapp-common/experiments/containers/experiment-info-model/experiment-info-model.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-info-model/experiment-info-model.component.html @@ -15,6 +15,7 @@ (cancelClicked)="cancelModelChange()" (activateEditClicked)="activateEditChanged()"> ; diff --git a/src/app/webapp-common/experiments/containers/experiment-info-task-model/experiment-info-task-model.component.ts b/src/app/webapp-common/experiments/containers/experiment-info-task-model/experiment-info-task-model.component.ts index 73aac543..fe1ec809 100644 --- a/src/app/webapp-common/experiments/containers/experiment-info-task-model/experiment-info-task-model.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-info-task-model/experiment-info-task-model.component.ts @@ -16,9 +16,10 @@ import {ConfirmDialogComponent} from '@common/shared/ui-components/overlay/confi import {EditableSectionComponent} from '@common/shared/ui-components/panel/editable-section/editable-section.component'; @Component({ - selector: 'sm-experiment-info-task-model', - templateUrl: './experiment-info-task-model.component.html', - styleUrls: ['./experiment-info-task-model.component.scss'] + selector: 'sm-experiment-info-task-model', + templateUrl: './experiment-info-task-model.component.html', + styleUrls: ['./experiment-info-task-model.component.scss'], + standalone: false }) export class ExperimentInfoTaskModelComponent implements OnInit, OnDestroy { private store = inject(Store); diff --git a/src/app/webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.scss b/src/app/webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.scss index 491b9966..60da2e0b 100644 --- a/src/app/webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.scss +++ b/src/app/webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.scss @@ -1,18 +1,17 @@ -@import "variables"; -@import "../../../layout/layout.scss"; +@use "../../../layout/layout.scss"; $output-tabs-height: 64px; - :host { + --mat-sidenav-container-width: 361px; display: block; height: 100%; background-color: var(--color-surface-container-lowest); .experiment-output-container { - height: 100%; + height: calc(100% - 32px); &.minimized { - height: calc(100% - 41px); + height: calc(100% - 38px); } } @@ -44,6 +43,12 @@ $output-tabs-height: 64px; margin-left: auto; } + .close-button-fake { + margin-right: 24px; + margin-left: auto; + width: 84px; + } + .scalar-buttons { gap: 12px; display: flex; @@ -66,10 +71,10 @@ $output-tabs-height: 64px; .output-body { position: relative; - height: calc(100% - #{$output-tabs-height + $experiment-info-header-height + 32px}); + height: calc(100% - #{$output-tabs-height + layout.$experiment-info-header-height + 10px}); &.minimized { - height: calc(100% - #{$experiment-info-header-height + $experiment-info-tabs-height + 3px}); + height: calc(100% - #{layout.$experiment-info-header-height + layout.$experiment-info-tabs-height + 3px}); } } } diff --git a/src/app/webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.ts b/src/app/webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.ts index 1ed6d29b..ac449e7e 100644 --- a/src/app/webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.ts @@ -1,9 +1,9 @@ -import {Component, OnDestroy, OnInit} from '@angular/core'; +import {Component, inject, OnDestroy, OnInit} from '@angular/core'; import {selectRouterConfig, selectRouterParams} from '@common/core/reducers/router-reducer'; import {Store} from '@ngrx/store'; -import {Observable, Subscription} from 'rxjs'; +import {interval, Subscription} from 'rxjs'; import {ActivatedRoute, Router} from '@angular/router'; -import {debounceTime, distinctUntilChanged, filter, map, tap, withLatestFrom} from 'rxjs/operators'; +import {debounce, distinctUntilChanged, filter, map, tap, withLatestFrom} from 'rxjs/operators'; import {Project} from '~/business-logic/model/projects/project'; import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; import { @@ -14,6 +14,7 @@ import { import { groupByCharts, GroupByCharts, + removeExperimentSettings, resetExperimentMetrics, setExperimentSettings, toggleMetricValuesView, @@ -21,13 +22,13 @@ import { } from '../../actions/common-experiment-output.actions'; import * as infoActions from '../../actions/common-experiments-info.actions'; import {experimentDetailsUpdated} from '../../actions/common-experiments-info.actions'; -import {selectAppVisible, selectBackdropActive} from '@common/core/reducers/view.reducer'; +import {selectBackdropActive} from '@common/core/reducers/view.reducer'; import {addMessage, setAutoRefresh} from '@common/core/actions/layout.actions'; import { selectIsExperimentInEditMode, selectMetricValuesView, - selectSelectedExperiments, - selectSelectedSettingsGroupBy, + selectSelectedExperiments, selectSelectedExperimentSettings, + selectSelectedSettingsGroupBy, selectSelectedSettingsHiddenScalar, selectSelectedSettingsIsProjectLevel, selectSelectedSettingsSmoothSigma, selectSelectedSettingsSmoothType, selectSelectedSettingsSmoothWeight, selectSelectedSettingsxAxisType, @@ -41,36 +42,45 @@ import {MESSAGES_SEVERITY} from '@common/constants'; import {setBreadcrumbsOptions} from '@common/core/actions/projects.actions'; import {selectSelectedProject} from '@common/core/reducers/projects.reducer'; import {headerActions} from '@common/core/actions/router.actions'; -import { SmoothTypeEnum } from '@common/shared/single-graph/single-graph.utils'; -import { ScalarKeyEnum } from '~/business-logic/model/events/scalarKeyEnum'; +import {smoothTypeEnum, SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; +import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; +import {toSignal} from '@angular/core/rxjs-interop'; +import {concatLatestFrom} from '@ngrx/operators'; @Component({ selector: 'sm-base-experiment-output', - template: '' + template: '', + standalone: false }) export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy { + private store = inject(Store); + private router = inject(Router); + private route = inject(ActivatedRoute); + private refresh = inject(RefreshService); public selectedExperiment: IExperimentInfo; private subs = new Subscription(); - public infoData$: Observable; - public backdropActive$: Observable; public minimized: boolean; - private isExperimentInEditMode$: Observable; - private projectId: Project['id']; + protected projectId: Project['id']; public experimentId: string; public routerConfig: string[]; - private isAppVisible$: Observable; - isSharedAndNotOwner$: Observable; public isExample: boolean; public isDevelopment: boolean; - private toMaximize = false; - public selectSplitSize$: Observable; - private selectedProject$: Observable; - public metricValuesView$: Observable; - public smoothWeight$: Observable; - public smoothType$: Observable; - public xAxisType$: Observable; - public groupBy$: Observable; + protected infoData$ = this.store.select(selectExperimentInfoData); + protected isSharedAndNotOwner$ = this.store.select((selectIsSharedAndNotOwner)); + protected isExperimentInEditMode$ = this.store.select(selectIsExperimentInEditMode); + protected backdropActive$ = this.store.select(selectBackdropActive); + protected selectSplitSize$ = this.store.select(selectSplitSize); + protected selectedProject$ = this.store.select(selectSelectedProject); + protected metricValuesView$ = this.store.select(selectMetricValuesView); + protected smoothWeight = toSignal(this.store.select(selectSelectedSettingsSmoothWeight).pipe(filter(smooth => smooth !== null))); + protected smoothSigma = toSignal(this.store.select(selectSelectedSettingsSmoothSigma).pipe(filter(sigma => sigma !== null))); + protected smoothType = this.store.selectSignal(selectSelectedSettingsSmoothType); + protected xAxisType = this.store.selectSignal(selectSelectedSettingsxAxisType(false)); + protected allSettings = this.store.selectSignal(selectSelectedExperimentSettings()); + protected isProjectLevel = this.store.selectSignal(selectSelectedSettingsIsProjectLevel); + protected groupBy = this.store.selectSignal(selectSelectedSettingsGroupBy); + protected listOfHidden = this.store.selectSignal(selectSelectedSettingsHiddenScalar()); groupByOptions = [ { @@ -83,26 +93,6 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy } ]; - constructor( - private store: Store, - private router: Router, - private route: ActivatedRoute, - private refresh: RefreshService - ) { - this.infoData$ = this.store.select(selectExperimentInfoData); - this.isSharedAndNotOwner$ = this.store.select((selectIsSharedAndNotOwner)); - this.isExperimentInEditMode$ = this.store.select(selectIsExperimentInEditMode); - this.isAppVisible$ = this.store.select(selectAppVisible); - this.backdropActive$ = this.store.select(selectBackdropActive); - this.selectSplitSize$ = this.store.select(selectSplitSize); - this.selectedProject$ = this.store.select(selectSelectedProject); - this.metricValuesView$ = this.store.select(selectMetricValuesView); - this.smoothWeight$ = this.store.select(selectSelectedSettingsSmoothWeight).pipe(filter(smooth => smooth !== null)); - this.smoothType$ = this.store.select(selectSelectedSettingsSmoothType); - this.xAxisType$ = this.store.select(selectSelectedSettingsxAxisType(false)); - this.groupBy$ = this.store.select(selectSelectedSettingsGroupBy); - } - ngOnInit() { this.subs.add(this.store.select(selectRouterConfig).subscribe(routerConfig => { this.minimized = !routerConfig.includes('output'); @@ -132,7 +122,7 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy this.subs.add(this.refresh.tick .pipe( - debounceTime(5000), // Fix loop - getExperimentInfo trigger tick + debounce(auto => auto === false ? interval(0) : interval(5000)), // Fix loop - getExperimentInfo trigger tick withLatestFrom(this.isExperimentInEditMode$), filter(([, isExperimentInEditMode]) => !isExperimentInEditMode && !this.minimized) ).subscribe(([auto]) => { @@ -162,6 +152,15 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy this.store.dispatch(setAutoRefresh({autoRefresh: $event})); } + minimizeViewUrl(projectId: string, experimentId :string): string { + const part = this.route?.firstChild.routeConfig.path; + if (['log', 'metrics/scalar', 'metrics/plots', 'debugImages'].includes(part)) { + return `projects/${projectId}/tasks/${experimentId}/info-output/${part}`; + } else { + return `projects/${projectId}/tasks/${experimentId}/${part}` + } + } + minimizeView() { const part = this.route.firstChild.routeConfig.path; if (['log', 'metrics/scalar', 'metrics/plots', 'debugImages'].includes(part)) { @@ -199,7 +198,6 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy this.router.navigateByUrl(parts.join('/')); } this.store.dispatch(headerActions.reset()); - this.toMaximize = true; } onActivate(e, scrollContainer) { @@ -212,8 +210,8 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy } setupBreadcrumbsOptions() { - this.subs.add(this.selectedProject$.pipe( - ).subscribe((selectedProject) => { + this.subs.add(this.selectedProject$.pipe(concatLatestFrom(()=>[this.store.select(selectRouterParams)]) + ).subscribe(([selectedProject, params]) => { this.store.dispatch(setBreadcrumbsOptions({ breadcrumbOptions: { showProjects: !!selectedProject, @@ -226,7 +224,9 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy filterBaseNameWith: null, compareModule: null, showSelectedProject: selectedProject?.id !== '*', - ...(selectedProject && {selectedProjectBreadcrumb: {name: selectedProject?.id === '*' ? 'All Tasks' : selectedProject?.basename}}) + ...(selectedProject && {selectedProjectBreadcrumb: {name: selectedProject?.id === '*' ? 'All Tasks' : selectedProject?.basename, + url: this.minimizeViewUrl(params.projectId, params.experimentId), queryParamsHandling: 'preserve', linkLast: true + }}) } } })); @@ -234,19 +234,38 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy } changeSmoothness($event: number) { - this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {smoothWeight: $event}})); + this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {...this.getSettingsObject(), smoothWeight: $event}})); + } + + changeSigma($event: number) { + this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {...this.getSettingsObject(), smoothSigma: $event}})); } changeSmoothType($event: SmoothTypeEnum) { - this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {smoothType: $event}})); + this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {...this.getSettingsObject(), smoothType: $event}})); } changeXAxisType($event: ScalarKeyEnum) { - this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {xAxisType: $event}})); + this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {...this.getSettingsObject(), xAxisType: $event}})); } changeGroupBy($event: GroupByCharts) { - this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {groupBy: $event}})); + this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {...this.getSettingsObject(), groupBy: $event}})); + } + + getSettingsObject = () => ({ + ...(this.groupBy() && {groupBy: this.groupBy()}), + ...(this.xAxisType() && {xAxisType: this.xAxisType()}), + ...(this.smoothType() && {smoothType: this.smoothType()}), + ...(this.smoothWeight() && {smoothWeight: this.smoothWeight()}), + ...(this.smoothSigma() && {smoothSigma: this.smoothType() === smoothTypeEnum.gaussian ? this.smoothSigma() : 2}), + ...(this.listOfHidden() && {hiddenMetricsScalar: this.listOfHidden()}), + projectLevel: false + }); + + setToProject() { + this.store.dispatch(setExperimentSettings({changes: {...this.allSettings(), id: this.projectId, projectLevel: true}, id: this.projectId})); + this.store.dispatch(removeExperimentSettings({id: this.experimentId})); } } diff --git a/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.html b/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.html index 99732a9c..72dd1d04 100644 --- a/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.html @@ -1,27 +1,26 @@ +@if (!loading() || !disabled) { @if (hasLog && showHeader) { -
-
- - Hostname:{{creator}} - +
+
+ Hostname:{{creator}}
- - + + />
} @if (hasLog === false) {
- +

NO LOG DATA

} @@ -34,5 +33,7 @@ [filterString]="filter$ | ngrxPush" [fetching]="fetching$ | ngrxPush" (fetchMore)="getLogs($event)" + (scrolledToBottom)="this.scrolledToBottom.emit();" > } +} diff --git a/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.scss b/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.scss index fd05c7db..8593e232 100644 --- a/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.scss +++ b/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.scss @@ -2,19 +2,26 @@ display: block; height: 100%; + .header { + display: grid; + align-items: center; + padding: 12px 24px; + grid-template-columns: 1fr auto 250px; + gap: 24px; + } + sm-experiment-log-info { - height: calc(100% - 50px); + height: calc(100% - 60px); &.no-header { height: calc(100%); } } .no-output { + color: var(--color-empty-state); h4 { font-weight: 500; - } - .al-icon { - color: var(--color-tint-14); + font-size: 16px; } } } diff --git a/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.ts b/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.ts index 21ce65e6..990b893f 100644 --- a/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.ts @@ -2,13 +2,13 @@ import { ChangeDetectorRef, Component, inject, Input, - OnDestroy, - viewChild, + OnDestroy, output, signal, + viewChild } from '@angular/core'; import {Store} from '@ngrx/store'; import {selectExperimentBeginningOfLog, selectExperimentLog, selectLogFilter, selectLogLoading} from '../../reducers'; import {BehaviorSubject, combineLatest} from 'rxjs'; -import {debounceTime, filter, map} from 'rxjs/operators'; +import {debounceTime, filter, map, tap} from 'rxjs/operators'; import {last} from 'lodash-es'; import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; import {selectSelectedExperiment} from '~/features/experiments/reducers'; @@ -24,11 +24,28 @@ import {RefreshService} from '@common/core/services/refresh.service'; import {activeLoader} from '@common/core/actions/layout.actions'; import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; import {selectThemeMode} from '@common/core/reducers/view.reducer'; +import {MatFormField} from '@angular/material/form-field'; +import {MatIcon} from '@angular/material/icon'; +import {MatButton} from '@angular/material/button'; +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {PushPipe} from '@ngrx/component'; +import {MatInput} from '@angular/material/input'; +import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; @Component({ - selector: 'sm-experiment-output-log', - templateUrl: './experiment-output-log.component.html', - styleUrls: ['./experiment-output-log.component.scss'] + selector: 'sm-experiment-output-log', + templateUrl: './experiment-output-log.component.html', + styleUrls: ['./experiment-output-log.component.scss'], + imports: [ + ExperimentLogInfoComponent, + MatFormField, + MatIcon, + MatButton, + TooltipDirective, + PushPipe, + MatInput, + ShowTooltipIfEllipsisDirective + ] }) export class ExperimentOutputLogComponent implements OnDestroy { private store = inject(Store); @@ -40,8 +57,10 @@ export class ExperimentOutputLogComponent implements OnDestroy { this.experiment$.next(experiment); } + scrolledToBottom = output(); + private currExperiment: IExperimentInfo; - private loading: boolean; + protected loading = signal(false); protected log$ = this.store.select(selectExperimentLog); protected logBeginning$ = this.store.select(selectExperimentBeginningOfLog); @@ -65,6 +84,7 @@ export class ExperimentOutputLogComponent implements OnDestroy { takeUntilDestroyed(), debounceTime(0), map(([selected, input]) => input ?? selected), + tap(() => this.loading.set(true)), filter(experiment => !!experiment?.id), ) .subscribe(experiment => { @@ -73,7 +93,6 @@ export class ExperimentOutputLogComponent implements OnDestroy { this.logRef()?.reset(); this.currExperiment = experiment; this.hasLog = undefined; - this.loading = true; this.cdr.detectChanges(); this.store.dispatch(activeLoader(getExperimentLog.type)); this.store.dispatch(getExperimentLog({ id: this.currExperiment.id, direction: null })); @@ -83,19 +102,19 @@ export class ExperimentOutputLogComponent implements OnDestroy { this.log$ .pipe(takeUntilDestroyed()) .subscribe(log => { - this.loading = false; + this.loading.set(false); if (log) { this.creator = last(log)?.worker ?? ''; this.disabled = false; this.hasLog = log.length > 0; - this.cdr.detectChanges(); + this.cdr.markForCheck(); } }); this.refresh.tick .pipe( takeUntilDestroyed(), - filter(autoRefresh => autoRefresh !== null && !this.loading && !!this.currExperiment?.id && (!this.logRef() || this.logRef().atEnd || autoRefresh === false))) + filter(autoRefresh => autoRefresh !== null && !this.loading() && !!this.currExperiment?.id && (!this.logRef() || this.logRef().atEnd || autoRefresh === false))) .subscribe(autoRefresh => this.store.dispatch(getExperimentLog({ id: this.currExperiment.id, ...(autoRefresh && { @@ -117,7 +136,7 @@ export class ExperimentOutputLogComponent implements OnDestroy { getLogs({direction, from}: {direction: string; from?: number}) { this.store.dispatch(getExperimentLog({id: this.currExperiment.id, direction, from, refresh: !from})); - this.loading = true; + this.loading.set(true); } downloadLog() { diff --git a/src/app/webapp-common/experiments/containers/experiment-output-plots/experiment-output-plots.component.html b/src/app/webapp-common/experiments/containers/experiment-output-plots/experiment-output-plots.component.html index 8957d21d..719f51c3 100644 --- a/src/app/webapp-common/experiments/containers/experiment-output-plots/experiment-output-plots.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-output-plots/experiment-output-plots.component.html @@ -3,17 +3,15 @@
@if (plotsList !== undefined) { - - + > }
@if (minimized) { @@ -26,7 +24,7 @@
@if (minimized) {
-
@@ -37,6 +35,7 @@ [isGroupGraphs]="true" [hiddenList]="selectedMetrics" [metrics]="graphs" + [list]="plotsList" [legendStringLength]="minimized ? 14 : 19" [minimized]="minimized" [splitSize]="splitSize$ | ngrxPush" diff --git a/src/app/webapp-common/experiments/containers/experiment-output-plots/experiment-output-plots.component.ts b/src/app/webapp-common/experiments/containers/experiment-output-plots/experiment-output-plots.component.ts index 87d4ba02..2fef1917 100644 --- a/src/app/webapp-common/experiments/containers/experiment-output-plots/experiment-output-plots.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-output-plots/experiment-output-plots.component.ts @@ -1,60 +1,40 @@ -import { - ChangeDetectionStrategy, - ChangeDetectorRef, - Component, - Input, - OnChanges, - OnDestroy, - OnInit, - SimpleChanges, - ViewChild -} from '@angular/core'; +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; import {addMessage} from '@common/core/actions/layout.actions'; import {selectRouterParams} from '@common/core/reducers/router-reducer'; import {RefreshService} from '@common/core/services/refresh.service'; import {ExperimentGraphsComponent} from '@common/shared/experiment-graphs/experiment-graphs.component'; import {ExtFrame} from '@common/shared/single-graph/plotly-graph-base'; -import {SelectableListItem} from '@common/shared/ui-components/data/selectable-list/selectable-list.model'; -import {convertPlots, groupIterations, sortMetricsList} from '@common/tasks/tasks.utils'; +import {convertPlots, ExtMetricsPlotEvent, groupIterations} from '@common/tasks/tasks.utils'; import {Store} from '@ngrx/store'; import {combineLatest, Observable, Subscription} from 'rxjs'; -import {distinctUntilChanged, distinctUntilKeyChanged, filter, map} from 'rxjs/operators'; +import {distinctUntilChanged, distinctUntilKeyChanged, filter, map, tap} from 'rxjs/operators'; import {MetricsPlotEvent} from '~/business-logic/model/events/metricsPlotEvent'; import {selectSelectedExperiment} from '~/features/experiments/reducers'; import {ReportCodeEmbedService} from '~/shared/services/report-code-embed.service'; -import { - experimentPlotsRequested, - resetExperimentMetrics, - setExperimentMetricsSearchTerm, - setExperimentSettings -} from '../../actions/common-experiment-output.actions'; -import { - selectExperimentInfoPlots, - selectExperimentMetricsSearchTerm, - selectIsExperimentInProgress, - selectSelectedSettingsHiddenPlot, - selectSplitSize -} from '../../reducers'; +import {experimentPlotsRequested, resetExperimentMetrics, setExperimentMetricsSearchTerm, setExperimentSettings} from '../../actions/common-experiment-output.actions'; +import {selectExperimentInfoPlots, selectExperimentMetricsSearchTerm, selectIsExperimentInProgress, selectSelectedSettingsHiddenPlot, selectSplitSize} from '../../reducers'; +import {GroupedList} from '@common/tasks/tasks.model'; @Component({ - selector: 'sm-experiment-output-plots', - templateUrl: './experiment-output-plots.component.html', - styleUrls: ['./experiment-output-plots.component.scss', '../experiment-output-scalars/shared-experiment-output.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, + selector: 'sm-experiment-output-plots', + templateUrl: './experiment-output-plots.component.html', + styleUrls: ['./experiment-output-plots.component.scss', '../experiment-output-scalars/shared-experiment-output.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ExperimentOutputPlotsComponent implements OnInit, OnDestroy, OnChanges { @Input() isDatasetVersionPreview = false; - @Input() selected: {id: string}; + @Input() selected: { id: string }; @ViewChild(ExperimentGraphsComponent) graphsComponent: ExperimentGraphsComponent; - public plotsList: Array; + public plotsList: GroupedList; private experimentId: string; - private routerParams$: Observable<{[para: string]: string}>; - public listOfHidden$: Observable>; + private routerParams$: Observable>; + public listOfHidden$: Observable; public searchTerm$: Observable; - public minimized: boolean = false; - public graphs: { [key: string]: ExtFrame[] }; + public minimized = false; + public graphs: Record; public refreshDisabled: boolean; public selectIsExperimentPendingRunning: Observable; public splitSize$: Observable; @@ -62,6 +42,8 @@ export class ExperimentOutputPlotsComponent implements OnInit, OnDestroy, OnChan private subs = new Subscription(); private plots$: Observable; public selectedMetrics: string[]; + private originalPlotList: { metric: string; variant: string }[]; + public plotsListLength: number; constructor( @@ -76,6 +58,12 @@ export class ExperimentOutputPlotsComponent implements OnInit, OnDestroy, OnChan this.listOfHidden$ = this.store.select(selectSelectedSettingsHiddenPlot); this.plots$ = this.store.select(selectExperimentInfoPlots).pipe( filter((metrics) => !!metrics), + tap((list: MetricsPlotEvent[]) => { + this.originalPlotList = list.map((plot) => ({ + metric: plot.metric, + variant: plot.variant + })); + }) ); this.routerParams$ = this.store.select(selectRouterParams) @@ -88,7 +76,7 @@ export class ExperimentOutputPlotsComponent implements OnInit, OnDestroy, OnChan } ngOnChanges(changes: SimpleChanges): void { - if(changes.selected && this.experimentId !== changes.selected.currentValue.id ){ + if (changes.selected && this.experimentId !== changes.selected.currentValue.id) { this.dark = true; this.experimentId = changes.selected.currentValue.id; this.refresh(); @@ -101,15 +89,19 @@ export class ExperimentOutputPlotsComponent implements OnInit, OnDestroy, OnChan .pipe( distinctUntilChanged(), filter(metrics => !!metrics), - map(plots => this.isDatasetVersionPreview ? plots.filter(plot => !plot.metric.startsWith('_')).filter(plot=> !['Execution Flow', 'Execution Details'].includes(plot.variant)) : plots), + map(plots => this.isDatasetVersionPreview ? plots.filter(plot => !plot.metric.startsWith('_')).filter(plot => !['Execution Flow', 'Execution Details'].includes(plot.variant)) : plots) ) .subscribe(metricsPlots => { this.refreshDisabled = false; const groupedPlots = groupIterations(metricsPlots); - this.plotsList = this.preparePlotsList(groupedPlots); + this.plotsList = this.getPlotsList(groupedPlots); + this.plotsListLength = metricsPlots.length; + const {graphs, parsingError} = convertPlots({plots: groupedPlots, id: this.experimentId}); this.graphs = graphs; - parsingError && this.store.dispatch(addMessage('warn', `Couldn't read all plots. Please make sure all plots are properly formatted (NaN & Inf aren't supported).`, [], true)); + if (parsingError) { + this.store.dispatch(addMessage('warn', `Couldn't read all plots. Please make sure all plots are properly formatted (NaN & Inf aren't supported).`, [], true)); + } this.changeDetection.markForCheck(); })); @@ -139,18 +131,27 @@ export class ExperimentOutputPlotsComponent implements OnInit, OnDestroy, OnChan this.subs.add(this.refreshService.tick .pipe(filter(autoRefresh => autoRefresh !== null && !!this.experimentId)) .subscribe(() => { - this.refresh(); + this.refresh(true); this.changeDetection.markForCheck(); }) ); this.subs.add(combineLatest([this.listOfHidden$, this.plots$]) .subscribe(([hiddenList]) => { - this.selectedMetrics = hiddenList.length === 0 ? - this.plotsList.map( name => name.name) : - this.plotsList.map( name => name.name).filter(metric => !hiddenList.includes(metric)); + const selectedMetrics = hiddenList.length === 0 ? + [...this.originalPlotList] : + this.originalPlotList.filter(({metric, variant}) => !hiddenList.includes(`${metric}${variant}`)); + + const metricsWithoutVariants = selectedMetrics + .map(({metric}) => metric) + .filter(m => !!m); + + this.selectedMetrics = Array.from(new Set([ + ...selectedMetrics.map(({metric, variant}) => `${metric}${variant}`), + ...metricsWithoutVariants + ])); this.changeDetection.markForCheck(); - })); + })); } ngOnDestroy() { @@ -159,10 +160,20 @@ export class ExperimentOutputPlotsComponent implements OnInit, OnDestroy, OnChan this.resetMetrics(); } - private preparePlotsList(groupedPlots: { [title: string]: MetricsPlotEvent[] }): Array { - const list = groupedPlots ? Object.keys(groupedPlots) : []; - const sortedList = sortMetricsList(list); - return sortedList.map((item) => ({name: item, value: item})); + getPlotsList(groupedPlots: Record) { + return Object.keys(groupedPlots) + .sort((a, b) => a.localeCompare(b, undefined, {sensitivity: 'base'})) + .reduce((acc, metric) => { + if (groupedPlots[metric].length < 2) { + acc[metric + groupedPlots[metric][0].variant] = {__displayName: metric} as any; + } else { + acc[metric] = groupedPlots[metric].reduce((acc2, plot) => { + acc2[plot.variant] = {}; + return acc2; + }, {}); + } + return acc; + }, {} as GroupedList); } metricSelected(id: string) { @@ -170,15 +181,20 @@ export class ExperimentOutputPlotsComponent implements OnInit, OnDestroy, OnChan } hiddenListChanged(hiddenList: string[]) { + const metrics = this.originalPlotList.map(metric => metric.metric); + const variants = this.originalPlotList.map(metric => `${metric.metric}${metric.variant}`) this.store.dispatch(setExperimentSettings({ id: this.experimentId, - changes: {hiddenMetricsPlot: this.plotsList.map( name => name.name).filter(metric => !hiddenList.includes(metric))}})); + changes: { + hiddenMetricsPlot: Array.from(new Set([...metrics, ...variants].filter(metric => !hiddenList.includes(metric)))) + } + })); } - refresh() { + refresh(autorefresh?: boolean) { if (!this.refreshDisabled) { this.refreshDisabled = true; - this.store.dispatch(experimentPlotsRequested({task: this.experimentId})); + this.store.dispatch(experimentPlotsRequested({task: this.experimentId, refresh: autorefresh})); } } diff --git a/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.html b/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.html index 977aa2d0..6e08f795 100644 --- a/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.html @@ -1,5 +1,5 @@ -@if (metricValuesView$ | async) { - +@if (metricValuesView()) { + } @else { @@ -8,23 +8,27 @@ }
- @if ((metricValuesView$ | async) === false && minimized) { + @if (metricValuesView() === false && minimized) {
-
} - sortMetricsList(Object.keys(metricsScalar || [])).reduce((acc, curr) => { - acc[curr] = {}; - return acc; - }, {}); - +import {toSignal} from '@angular/core/rxjs-interop'; +import {explicitEffect} from 'ngxtension/explicit-effect'; +import {computedPrevious} from 'ngxtension/computed-previous'; @Component({ selector: 'sm-experiment-output-scalars', templateUrl: './experiment-output-scalars.component.html', - styleUrls: ['./experiment-output-scalars.component.scss', './shared-experiment-output.scss'] + styleUrls: ['./experiment-output-scalars.component.scss', './shared-experiment-output.scss'], + standalone: false }) export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { protected store = inject(Store); - private activeRoute = inject(ActivatedRoute); + protected activeRoute = inject(ActivatedRoute); private changeDetection = inject(ChangeDetectorRef); private reportEmbed = inject(ReportCodeEmbedService); private refreshService = inject(RefreshService); - public scalarList: GroupedList = {}; + public scalarList = signal({}); private subs = new Subscription(); - protected experimentId: string; protected routerParams$: Observable; public refreshDisabled: boolean; - public listOfHidden$: Observable; - public scalars$: Observable; - public searchTerm$: Observable; public minimized = false; - public graphs: Record; + public graphs = signal>(null); public selectIsExperimentPendingRunning: Observable; - public smoothWeight$: Observable; - public smoothWeightDelayed$: Observable; - public smoothType$: Observable; - public showSettingsBar$ = this.store.select(selectShowSettings); - public xAxisType$: Observable; - public groupBy$: Observable; - public splitSize$: Observable; - public groupBy: GroupByCharts; + public showSettingsBar = this.store.selectSignal(selectShowSettings); + protected searchTerm = this.store.selectSignal(selectExperimentMetricsSearchTerm); + protected metricValuesView = this.store.selectSignal(selectMetricValuesView); + protected lastMetricsValues = this.store.selectSignal(selectLastMetricsValues); + protected tableSelectedMetrics = this.store.selectSignal(selectSelectedSettingsTableMetric); + protected splitSize = this.store.selectSignal(selectSplitSize); + protected entitySelector = this.store.select(selectSelectedExperimentFromRouter); + protected scalars = this.store.selectSignal(selectExperimentInfoHistograms); + protected smoothWeight = toSignal(this.store.select(selectSelectedSettingsSmoothWeight).pipe(filter(smooth => smooth !== null))); + protected smoothSigma = toSignal(this.store.select(selectSelectedSettingsSmoothSigma).pipe(filter(sigma => sigma !== null))); + protected smoothWeightDelayed = toSignal(this.store.select(selectSelectedSettingsSmoothWeight).pipe(debounceTime(75))); + protected smoothSigmaDelayed = toSignal(this.store.select(selectSelectedSettingsSmoothSigma).pipe(debounceTime(75))); + protected smoothType = this.store.selectSignal(selectSelectedSettingsSmoothType); + protected xAxisType = this.store.selectSignal(selectSelectedSettingsxAxisType(false)); + protected xAxisTypePrev = computedPrevious(this.xAxisType); + protected groupBy = this.store.selectSignal(selectSelectedSettingsGroupBy); + protected singleValueData = this.store.selectSignal(selectScalarSingleValue); + protected hasSingleValueData = this.store.selectSignal(selectHasScalarSingleValue); + protected listOfHidden = this.store.selectSignal(selectSelectedSettingsHiddenScalar()); + protected allSettings = this.store.selectSignal(selectSelectedExperimentSettings()); + protected isProjectLevel = this.store.selectSignal(selectSelectedSettingsIsProjectLevel); + protected experiment = this.store.selectSignal<{ name?: string; id: string }>(selectSelectedExperiment); + protected experimentId = this.store.selectSignal(selectSelectedExperimentFromRouter); + protected projectId = this.store.selectSignal(selectRouterProjectId); + protected entityType: 'task' | 'model' = 'task'; protected exportForReport = true; - private scalars: GroupedList; @ViewChild(ExperimentGraphsComponent) experimentGraphs; groupByOptions = [ @@ -94,104 +105,94 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { value: groupByCharts.none } ]; - public singleValueData$: Observable; - public experimentName: string; - public singleValueExists: boolean; - protected entitySelector: Observable<{ id?: string; name?: string }>; - protected selectedMetrics: string[] = []; - private originalScalarList: {metric: string; variant: string}[]; - public metricValuesView$: Observable; - public lastMetricsValues$: Observable>; + protected selectedMetrics = signal(null); + private originalScalarList: { metric: string; variant: string }[]; private firstTime = true; - public tableSelectedMetrics$: Observable; + protected xAxisEffectRef: EffectRef; + protected mainEffectRef1: EffectRef; + protected mainEffectRef2: EffectRef; constructor() { - this.searchTerm$ = this.store.select(selectExperimentMetricsSearchTerm); - this.metricValuesView$ = this.store.select(selectMetricValuesView); - this.lastMetricsValues$ = this.store.select(selectLastMetricsValues); - this.tableSelectedMetrics$ = this.store.select(selectSelectedSettingsTableMetric); - this.splitSize$ = this.store.select(selectSplitSize); - this.entitySelector = this.store.select(selectSelectedExperiment); - - this.scalars$ = this.store.select(selectExperimentInfoHistograms) - .pipe( - filter((metrics) => !!metrics), - ); - - this.smoothWeight$ = this.store.select(selectSelectedSettingsSmoothWeight).pipe(filter(smooth => smooth !== null)); - this.smoothWeightDelayed$ = this.store.select(selectSelectedSettingsSmoothWeight).pipe(debounceTime(75)); - this.smoothType$ = this.store.select(selectSelectedSettingsSmoothType); - this.xAxisType$ = this.store.select(selectSelectedSettingsxAxisType(false)); - this.groupBy$ = this.store.select(selectSelectedSettingsGroupBy); - this.singleValueData$ = this.store.select(selectScalarSingleValue) - .pipe(tap( data => this.singleValueExists = data?.length > 0)); - this.listOfHidden$ = this.store.select(selectSelectedSettingsHiddenScalar); - - this.routerParams$ = this.store.select(selectRouterParams) .pipe( filter(params => !!params.experimentId), - tap(params => this.experimentId = params.experimentId), distinctUntilChanged() ); this.selectIsExperimentPendingRunning = this.store.select(selectIsExperimentInProgress); + + this.mainEffectRef1 = explicitEffect( + [this.listOfHidden], ([hiddenList]) => { + if (this.scalars() && this.groupBy() && hiddenList) { + this.dataHandler(this.scalars(), hiddenList, this.groupBy(), true); + } + }); + + this.mainEffectRef2 = explicitEffect( + [this.groupBy, this.scalars, this.xAxisType], ([groupBy, scalars]) => { + if (groupBy && scalars && + // prevent rendering chart with misfit x-axis type and data + ( Object.values(scalars || {}).length === 0 || + (this.xAxisType() !== 'iter' && Object.values(Object.values(scalars || {})[0] || {})?.[0]?.x?.[0] > 1600000000000) || + (this.xAxisType() === 'iter' && Object.values(Object.values(scalars || {})[0] || {})?.[0]?.x?.[0] < 1600000000000)) + ) { + this.dataHandler(scalars, this.listOfHidden(), groupBy, false); + } + }); + + this.xAxisEffectRef = explicitEffect( + [this.xAxisType], + ([xAxisType]) => { + if (this.experiment() && xAxisType && this.xAxisTypePrev() !== xAxisType) { + this.axisChanged(); + } + }); + + } + + protected dataHandler(scalars, hiddenList, groupBy, skipCalc) { + this.refreshDisabled = false; + this.originalScalarList = [ + ...(this.hasSingleValueData() ? [{metric: singleValueChartTitle, variant: null}] : []), + ...Object.entries(scalars).map(([metric, value]) => Object.keys(value).map((variant) => ({ + metric, + variant + }))).flat() + ]; + if (!skipCalc) { + this.prepareGraphsAndUpdate(scalars); + } + + const selectedMetric = (!this.isProjectLevel() && this.firstTime && hiddenList.length === 0) ? + this.originalScalarList.slice(0, 20) : + groupBy === 'metric' ? + this.originalScalarList.filter(({metric}) => !hiddenList.includes(metric)) : + this.originalScalarList.filter(({metric, variant}) => variant !== null ? + !hiddenList.includes(`${metric}${variant}`) && !hiddenList.includes(metric) : + !hiddenList.includes(metric) + ); + this.firstTime = false; + const metricsWithoutVariants = selectedMetric + .map(({metric}) => metric) + .filter(m => !!m); + this.selectedMetrics.set(Array.from(new Set([ + ...selectedMetric.map(({metric, variant}) => `${metric}${variant}`), + ...metricsWithoutVariants + ]))); } ngOnInit() { this.minimized = this.activeRoute.snapshot.routeConfig.data?.minimized; - this.subs.add(this.groupBy$ - .pipe(filter((groupBy) => !!groupBy)) - .subscribe(groupBy => { - this.groupBy = groupBy; - this.prepareGraphsAndUpdate(this.scalars); - }) - ); - - this.subs.add(this.xAxisType$ - .pipe(filter(axis => !!axis && !!this.experimentId)) - .subscribe(() => this.axisChanged()) - ); - this.subs.add(this.singleValueData$.subscribe((data)=> this.singleValueExists = data?.length > 0)) - - this.subs.add(this.entitySelector - .pipe( - filter(experiment => !!experiment?.id), - distinctUntilKeyChanged('id') - ) - .subscribe(experiment => { - this.experimentId = experiment.id; - this.experimentName = experiment.name; - this.scalarList = {}; - this.refresh(); - }) - ); this.subs.add(this.refreshService.tick - .pipe(filter(autoRefresh => autoRefresh !== null && !!this.experimentId)) + .pipe(filter(autoRefresh => autoRefresh !== null && !!this.experiment()?.id)) .subscribe(() => this.refresh()) ); - this.subs.add(this.scalars$ - .subscribe(scalars => { - this.refreshDisabled = false; - this.scalars = scalars; - this.originalScalarList = [ - ...(this.singleValueExists ? [{metric: singleValueChartTitle, variant: null}] : []), - ...Object.entries(scalars).map(([metric, value]) => Object.keys(value).map((variant) => ({ - metric, - variant - }))).flat() - ]; - this.prepareGraphsAndUpdate(scalars); - }) - ); - - this.subs.add(this.routerParams$ .subscribe(params => { - if (!this.experimentId || ![params.experimentId, params.modelId].includes(this.experimentId)) { - this.graphs = undefined; + if (!this.experimentId() || ![params.experimentId, params.modelId].includes(this.experimentId())) { + this.graphs.set(undefined); this.resetMetrics(); // this.store.dispatch(new ExperimentScalarRequested(params.experimentId)); this.store.dispatch(setExperimentMetricsSearchTerm({searchTerm: ''})); @@ -199,34 +200,24 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { }) ); - this.subs.add(combineLatest([this.listOfHidden$, this.scalars$]) - .pipe(debounceTime(50)) - .subscribe(([hiddenList]) => { - const selectedMetric = (this.firstTime && hiddenList.length === Object.keys(this.scalarList).length) ? - this.originalScalarList.slice(0, 9) : - this.groupBy === 'metric' ? - this.originalScalarList.filter(({metric}) => !hiddenList.includes(metric)) : - this.originalScalarList.filter(({metric, variant}) => variant !== null ? - !hiddenList.includes(`${metric} / ${variant}`) && !hiddenList.includes(metric) : - !hiddenList.includes(metric) - ); - this.firstTime = false; - const metricsWithoutVariants = selectedMetric - .map(({metric}) => metric) - .filter(m => !!m); - this.selectedMetrics = Array.from(new Set([ - ...selectedMetric.map(({metric, variant}) => `${metric} / ${variant}`), - ...metricsWithoutVariants - ])); - this.changeDetection.detectChanges(); + this.subs.add(this.entitySelector + .pipe( + filter(entity => !!entity), + distinctUntilChanged() + ) + .subscribe(() => { + this.scalarList.set({}); + this.selectedMetrics.set(null); + this.refresh(); })); } private prepareGraphsAndUpdate(scalars: GroupedList) { if (scalars) { - this.scalarList = {...(this.singleValueExists && {[singleValueChartTitle]: {}}), ...prepareScalarList(scalars)}; - this.graphs = this.groupBy === 'metric' ? convertScalars(scalars, this.experimentId) : convertSplitScalars(scalars, this.experimentId); - this.changeDetection.markForCheck(); + const taskId = this.experiment()?.id ?? this.experimentId(); + this.scalarList.set({...(this.hasSingleValueData() && {[singleValueChartTitle]: {}}), ...this.prepareScalarList(scalars, this.groupBy() === 'none')}); + this.graphs.set(this.groupBy() === 'metric' ? convertScalars(scalars, taskId) : convertSplitScalars(scalars, taskId)); + // this.changeDetection.markForCheck(); } } @@ -241,11 +232,21 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { hiddenListChanged(hiddenList: string[]) { + const metrics = this.originalScalarList.map(metric => metric.metric); + const variants = this.originalScalarList.map(metric => `${metric.metric}${metric.variant || ''}`); + const nonTaskMetrics = this.listOfHidden().filter(m => !metrics.some(metric => metric.startsWith(m)) && !variants.includes(m)); + const newList = [ + ...metrics.filter(metric => !hiddenList.some(a => a.startsWith(metric))), + ...variants.filter(metric => this.groupBy() === 'none' ? !hiddenList.includes(metric) : !hiddenList.some(a => metric.startsWith(a))), + ...nonTaskMetrics.filter(metric => !hiddenList.includes(metric)) + ]; + + const metricsWithoutVariants = metrics.filter(metric => !variants.filter(v => v.startsWith(metric)).filter(v => !newList.includes(v)).length); this.store.dispatch(setExperimentSettings({ - id: this.experimentId, + id: this.experiment()?.id, changes: { - hiddenMetricsScalar: Object.keys(this.scalarList) - .filter(metric => !hiddenList.includes(metric)) + ...this.getSettingsObject(), + hiddenMetricsScalar: Array.from(new Set(newList.concat(metricsWithoutVariants))) } })); } @@ -253,10 +254,28 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { refresh() { if (!this.refreshDisabled) { this.refreshDisabled = true; - this.store.dispatch(experimentScalarRequested({experimentId: this.experimentId, refresh: true})); + this.store.dispatch(experimentScalarRequested({experimentId: this.experimentId(), refresh: true})); } } + prepareScalarList = (metricsScalar: GroupedList, splitted: boolean): GroupedList => + sortMetricsList(Object.keys(metricsScalar || [])).reduce((acc, curr) => { + const variants = Object.keys(metricsScalar[curr]); + if (splitted) { + if (variants.length > 1) { + acc[curr] = {}; + Object.keys(metricsScalar[curr]).forEach((variant) => { + acc[curr][variant] = {}; + }); + } else { + acc[curr + variants[0]] = {__displayName: `${curr} - ${variants[0]}`}; + } + } else { + acc[curr] = {}; + } + return acc; + }, {}); + searchTermChanged(searchTerm: string) { this.store.dispatch(setExperimentMetricsSearchTerm({searchTerm})); } @@ -266,19 +285,39 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { } changeSmoothness($event: number) { - this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {smoothWeight: $event}})); + this.store.dispatch(setExperimentSettings({id: this.experiment()?.id, changes: {...this.getSettingsObject(), smoothWeight: $event}})); + } + + changeSigma($event: number) { + this.store.dispatch(setExperimentSettings({id: this.experiment()?.id, changes: {...this.getSettingsObject(), smoothSigma: $event}})); } changeSmoothType($event: SmoothTypeEnum) { - this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {smoothType: $event}})); + this.store.dispatch(setExperimentSettings({id: this.experiment()?.id, changes: {...this.getSettingsObject(), smoothType: $event}})); } changeXAxisType($event: ScalarKeyEnum) { - this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {xAxisType: $event}})); + this.store.dispatch(setExperimentSettings({id: this.experiment()?.id, changes: {...this.getSettingsObject(), xAxisType: $event}})); } changeGroupBy($event: GroupByCharts) { - this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {groupBy: $event}})); + this.store.dispatch(setExperimentSettings({id: this.experiment()?.id, changes: {...this.getSettingsObject(), groupBy: $event}})); + } + + + getSettingsObject = () => ({ + ...(this.groupBy() && {groupBy: this.groupBy()}), + ...(this.xAxisType() && {xAxisType: this.xAxisType()}), + ...(this.smoothType() && {smoothType: this.smoothType()}), + ...(this.smoothWeight() && {smoothWeight: this.smoothWeight()}), + ...(this.smoothSigma() && {smoothSigma: this.smoothType() === smoothTypeEnum.gaussian ? this.smoothSigma() : 2}), + ...(this.listOfHidden() && {hiddenMetricsScalar: this.listOfHidden()}), + projectLevel: false + }); + + setToProject() { + this.store.dispatch(setExperimentSettings({changes: {...this.allSettings(), id: this.projectId(), projectLevel: true}, id: this.projectId()})); + this.store.dispatch(removeExperimentSettings({id: this.experiment()?.id})); } toggleSettingsBar() { @@ -288,19 +327,19 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { createEmbedCode(event: { metrics?: string[]; variants?: string[]; xaxis?: ScalarKeyEnum; domRect: DOMRect; group?: boolean }) { this.reportEmbed.createCode({ type: (!event.metrics && !event.variants) ? 'single' : 'scalar', - objects: [this.experimentId], + objects: [this.experiment()?.id], objectType: this.entityType, ...event }); } protected axisChanged() { - this.store.dispatch(experimentScalarRequested({experimentId: this.experimentId})); + this.store.dispatch(experimentScalarRequested({experimentId: this.experiment()?.id, skipSingleValue: true})); } selectedMetricsChanged(selectedMetrics: string[]) { this.store.dispatch(setExperimentSettings({ - id: this.experimentId, + id: this.experiment()?.id, changes: {selectedMetricTable: selectedMetrics} })); } diff --git a/src/app/webapp-common/experiments/containers/experiment-output-scalars/shared-experiment-output.scss b/src/app/webapp-common/experiments/containers/experiment-output-scalars/shared-experiment-output.scss index 1c1a5fcd..2a2e9efa 100644 --- a/src/app/webapp-common/experiments/containers/experiment-output-scalars/shared-experiment-output.scss +++ b/src/app/webapp-common/experiments/containers/experiment-output-scalars/shared-experiment-output.scss @@ -7,6 +7,10 @@ mat-drawer-container { --mat-sidenav-container-divider-color: var(--color-surface-container-high); } +mat-drawer { + border-right: 1px solid var(--color-surface-container-high); +} + .hover-button-container { position: relative; left: 30px; diff --git a/src/app/webapp-common/experiments/dumb/base-clickable-artifact.component.ts b/src/app/webapp-common/experiments/dumb/base-clickable-artifact.component.ts index a47ed4b9..b897cfcf 100644 --- a/src/app/webapp-common/experiments/dumb/base-clickable-artifact.component.ts +++ b/src/app/webapp-common/experiments/dumb/base-clickable-artifact.component.ts @@ -7,8 +7,9 @@ import {getSignedUrl} from '../../core/actions/common-auth.actions'; import {downloadArtifacts} from '@common/experiments/actions/common-experiments-info.actions'; @Component({ - selector: 'sm-base-clickable-artifact', - template: '
' + selector: 'sm-base-clickable-artifact', + template: '
', + standalone: false }) export class BaseClickableArtifactComponent { protected timestamp: number; diff --git a/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.html b/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.html index d2614025..3cc00ac7 100644 --- a/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.html +++ b/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.html @@ -9,7 +9,7 @@ aria-label="Select an option"> Empty (Agent will install packages using 'requirements.txt' from repository). {{showReset? '*': ''}} Empty (Agent will not install any packages). {{showReset? '*': ''}} - @if (showReset){Set to originally recorded packages (original-pip).} + @if (showReset){Set to originally recorded packages (original-pip).}
{{showReset? '* ':''}}This will clear all packages{{showReset? ' - Both originally recorded, and from latest execution.':'.'}}
diff --git a/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.ts b/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.ts index 4b73a8c8..bc50af72 100644 --- a/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.ts +++ b/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.ts @@ -1,25 +1,22 @@ import {Component, Inject} from '@angular/core'; import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dialog-template/dialog-template.component'; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; -import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import {MatRadioButton, MatRadioChange, MatRadioGroup} from '@angular/material/radio'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {MatButton} from '@angular/material/button'; @Component({ - selector: 'sm-clear-installed-packages-dialog', - standalone: true, - imports: [ - DialogTemplateComponent, - TooltipDirective, - MatRadioButton, - MatRadioGroup, - ReactiveFormsModule, - FormsModule, - MatButton - ], - templateUrl: './clear-installed-packages-dialog.component.html', - styleUrl: './clear-installed-packages-dialog.component.scss' + selector: 'sm-clear-installed-packages-dialog', + imports: [ + DialogTemplateComponent, + MatRadioButton, + MatRadioGroup, + ReactiveFormsModule, + FormsModule, + MatButton + ], + templateUrl: './clear-installed-packages-dialog.component.html', + styleUrl: './clear-installed-packages-dialog.component.scss' }) export class ClearInstalledPackagesDialogComponent { install: 'install' | 'dontInstall' | 'reset' = 'install'; diff --git a/src/app/webapp-common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component.scss b/src/app/webapp-common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component.scss index 7fcf74cb..4abb5a8f 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component.scss +++ b/src/app/webapp-common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component.scss @@ -1,4 +1,4 @@ -@import "mixins/link"; +@use "mixins/link"; :host { display: flex; @@ -18,7 +18,7 @@ vertical-align: middle; } - @include link(); + @include link.link(); .mat-mdc-progress-spinner { display: inline-block; diff --git a/src/app/webapp-common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component.ts b/src/app/webapp-common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component.ts index db3d85e7..ad07c87e 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component.ts @@ -4,10 +4,11 @@ import {BaseClickableArtifactComponent} from '../base-clickable-artifact.compone import {fileSizeConfigStorage} from '@common/shared/pipes/filesize.pipe'; @Component({ - selector: 'sm-experiment-artifact-item-view', - templateUrl: './experiment-artifact-item-view.component.html', - styleUrls: ['./experiment-artifact-item-view.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-experiment-artifact-item-view', + templateUrl: './experiment-artifact-item-view.component.html', + styleUrls: ['./experiment-artifact-item-view.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ExperimentArtifactItemViewComponent extends BaseClickableArtifactComponent{ public isLocalFile: boolean; diff --git a/src/app/webapp-common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component.ts b/src/app/webapp-common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component.ts index f42ad36f..0e7dd10d 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component.ts @@ -8,18 +8,17 @@ import {safeAngularUrlParameterPipe} from '@common/shared/pipes/safeAngularUrlPa import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-experiment-artifacts-navbar', - templateUrl: './experiment-artifacts-navbar.component.html', - styleUrls: ['./experiment-artifacts-navbar.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - MatExpansionPanel, - MatExpansionPanelHeader, - RouterLink, - safeAngularUrlParameterPipe, - MatIcon - ], - standalone: true + selector: 'sm-experiment-artifacts-navbar', + templateUrl: './experiment-artifacts-navbar.component.html', + styleUrls: ['./experiment-artifacts-navbar.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatExpansionPanel, + MatExpansionPanelHeader, + RouterLink, + safeAngularUrlParameterPipe, + MatIcon + ] }) export class ExperimentArtifactsNavbarComponent { public route = inject(ActivatedRoute); diff --git a/src/app/webapp-common/experiments/dumb/experiment-custom-cols-menu/experiment-custom-cols-menu.component.ts b/src/app/webapp-common/experiments/dumb/experiment-custom-cols-menu/experiment-custom-cols-menu.component.ts index 7008a764..e8b20ebd 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-custom-cols-menu/experiment-custom-cols-menu.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-custom-cols-menu/experiment-custom-cols-menu.component.ts @@ -9,20 +9,19 @@ import {MatIcon} from '@angular/material/icon'; import {MatButton} from '@angular/material/button'; @Component({ - selector: 'sm-custom-cols-menu', - templateUrl: './experiment-custom-cols-menu.component.html', - styleUrls: ['./experiment-custom-cols-menu.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - MenuComponent, - CustomColumnsListComponent, - NgTemplateOutlet, - UpperCasePipe, - MatProgressSpinner, - MatIcon, - MatButton - ], - standalone: true + selector: 'sm-custom-cols-menu', + templateUrl: './experiment-custom-cols-menu.component.html', + styleUrls: ['./experiment-custom-cols-menu.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MenuComponent, + CustomColumnsListComponent, + NgTemplateOutlet, + UpperCasePipe, + MatProgressSpinner, + MatIcon, + MatButton + ] }) export class ExperimentCustomColsMenuComponent { diff --git a/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.html b/src/app/webapp-common/experiments/dumb/experiment-details/experiment-details.component.html similarity index 98% rename from src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.html rename to src/app/webapp-common/experiments/dumb/experiment-details/experiment-details.component.html index 1b1eabc7..f7f3d834 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-details/experiment-details.component.html @@ -60,7 +60,7 @@ - {{ experiment()?.execution?.queue?.display_name ?? experiment()?.execution?.queue?.name | NA }} + {{ experiment()?.execution?.queue?.display_name || experiment()?.execution?.queue?.name | NA }} diff --git a/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.scss b/src/app/webapp-common/experiments/dumb/experiment-details/experiment-details.component.scss similarity index 100% rename from src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.scss rename to src/app/webapp-common/experiments/dumb/experiment-details/experiment-details.component.scss diff --git a/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.ts b/src/app/webapp-common/experiments/dumb/experiment-details/experiment-details.component.ts similarity index 90% rename from src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.ts rename to src/app/webapp-common/experiments/dumb/experiment-details/experiment-details.component.ts index eff1fdeb..0c335fbe 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-details/experiment-details.component.ts @@ -10,11 +10,12 @@ import {EditableSectionComponent} from '@common/shared/ui-components/panel/edita export const EXPERIMENT_COMMENT = 'ExperimentComment'; @Component({ - selector: 'sm-experiment-general-info', - templateUrl: './experiment-general-info.component.html', - styleUrls: ['./experiment-general-info.component.scss'] + selector: 'sm-experiment-details', + templateUrl: './experiment-details.component.html', + styleUrls: ['./experiment-details.component.scss'], + standalone: false }) -export class ExperimentGeneralInfoComponent { +export class ExperimentDetailsComponent { private store = inject(Store); commentControl = new UntypedFormControl(); diff --git a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.html b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.html index 81cd5624..0dbce1e2 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.html @@ -1,13 +1,12 @@ @if (editable()) { - @for (parameter of form; track $index) { + @for (parameter of form(); track parameter.id) {
+ class="strength"> } - + + @if (parameter.isMaximize || parameter.value.length > 24) { + + } } - @case ('name') { - {{row.name}} - } - @case ('value') { - @if (row.section === 'Datasets' && row.value.length === 36) { - {{row.value}} - } @else { + } + @case ('name') { + {{ row.name }} + } + @case ('value') { + @if (row.section === 'Datasets' && row.value.length === 36) { + {{ row.value }} + } @else { +
{{row.value}} - } + >{{ row.value }} + @if (row.isMaximize && row.value.length >= 150) { + +
{{ (row.value | jsonIndent).slice(0, 150) }}
+ @if (row.value.length >= 150 - 4) { +
● ● ●
+ + + View All + + } + + } +
} } - - -
- } + } + + +
+} diff --git a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.scss b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.scss index 4c1106d5..8b6c6e8a 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.scss +++ b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.scss @@ -1,4 +1,6 @@ :host { + --row-border-color: var(--color-surface-container-high); + form.editable, .table-container { height: 100%; padding-bottom: 6px; @@ -11,13 +13,6 @@ .form-container { height: 100%; overflow: auto; - - input.highlight-text { - background-color: var(--color-tertiary-container); - &.current-match { - background-color: var(--color-tertiary); - } - } } .param-row { @@ -56,9 +51,14 @@ .highlight-text { background-color: var(--color-tertiary-container); color: var(--color-on-tertiary-container); + + &.current-match { + background-color: var(--color-tertiary); + color: var(--color-on-tertiary); + } } - .current-match .highlight-text{ + .current-match .highlight-text { background-color: var(--color-tertiary); color: var(--color-on-tertiary); } @@ -69,12 +69,50 @@ .allow-multi-space { white-space: pre; + } + .al-ico-description { + color: var(--color-primary); } ::ng-deep .table-container { + --p-datatable-body-cell-border-color: var(--color-surface-container-high); td:first-child { padding-left: 8px !important; } } + + ::ng-deep .mat-mdc-form-field-icon-suffix { + padding: 0 12px !important; + } +} + +.value-container { + display: flex; + align-items: center; + + button { + margin-left: 12px; + visibility: hidden; + opacity: 0; + transition: opacity 0.3s; + } + + &:hover { + button { + visibility: visible; + opacity: 1; + } + } +} + +.dots-slice { + transform: scale(0.5); + transform-origin: left; + margin-bottom: 12px; +} + +.divider { + border-color: var(--color-outline-variant); + opacity: 0.5; } diff --git a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.ts b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.ts index 4afbd7ce..5175023c 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.ts @@ -1,19 +1,23 @@ import { Component, OnChanges, - SimpleChanges, inject, viewChild, viewChildren, output, effect, input } from '@angular/core'; + SimpleChanges, inject, viewChild, viewChildren, output, effect, input, signal +} from '@angular/core'; import {cloneDeep} from 'lodash-es'; import {v4 as uuidV4} from 'uuid'; import {NgForm} from '@angular/forms'; import {ParamsItem} from '~/business-logic/model/tasks/paramsItem'; -import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {CdkVirtualScrollViewport} from '@angular/cdk/scrolling'; import {TableComponent} from '@common/shared/ui-components/data/table/table.component'; import {isEqual} from 'lodash-es'; import {MatInput} from '@angular/material/input'; import {Store} from '@ngrx/store'; -import { navigateToDataset } from '@common/experiments/actions/common-experiments-info.actions'; -import {trackByIndex} from '@common/shared/utils/forms-track-by'; +import {navigateToDataset} from '@common/experiments/actions/common-experiments-info.actions'; +import {injectResize} from 'ngxtension/resize'; +import {map, take} from 'rxjs/operators'; +import {startWith} from 'rxjs'; +import {EditJsonComponent, EditJsonData} from '@common/shared/ui-components/overlay/edit-json/edit-json.component'; +import {MatDialog} from '@angular/material/dialog'; export interface ExecutionParameter { name?: string; @@ -22,51 +26,57 @@ export interface ExecutionParameter { id: string; type?: string; value?: string; + isMaximize?: boolean; + isJson?: boolean; } @Component({ selector: 'sm-experiment-execution-parameters', templateUrl: './experiment-execution-parameters.component.html', - styleUrls: ['./experiment-execution-parameters.component.scss'] + styleUrls: ['./experiment-execution-parameters.component.scss'], + standalone: false }) export class ExperimentExecutionParametersComponent implements OnChanges { private store = inject(Store); + private dialog = inject(MatDialog); + private resize$ = injectResize({emitInitialResult: true}); - form = [] as ExecutionParameter[]; + public form = signal([]); private clickedRow: number; - public search = ''; - public searchIndexList: {index: number; col: string}[] = []; + protected search = ''; + protected searchIndexList: { index: number; col: string }[] = []; public matchIndex = -1; - public cols = [ - {id: 'name', style: {width: '300px'}}, - {id: 'value', style: {width: '60%'}}, - {id: 'description', style: {width: '48px'}} - ] as ISmCol[]; + protected calcCols$ = this.resize$ + .pipe( + startWith({width: 500}), + map(res => res.width), + map(width => [ + {id: 'name', style: {width: `${(width - 64) / 2}px`}}, + {id: 'value', style: {width: `${(width - 64) / 2}px`}}, + {id: 'description', style: {width: '64px'}} + ]) + ); - - hyperParameters = viewChild('hyperParameters'); - executionParametersTable = viewChild>(TableComponent); - - formContainer = viewChild(CdkVirtualScrollViewport); - rows = viewChildren('row'); - viewPort = viewChild(CdkVirtualScrollViewport); + section = input(); + size = input(); + formData = input(); + editable = input(); + searchedText = input(); formDataChanged = output<{ - field: string; - value: ParamsItem[]; - }>(); + field: string; + value: ParamsItem[]; + }>(); searchCounterChanged = output(); resetSearch = output(); scrollToResultCounterReset = output(); - section = input(); - size = input(); - formData = input(); + public hyperParameters = viewChild('hyperParameters'); + private executionParametersTable = viewChild>(TableComponent); - - editable = input(); - - searchedText = input(); + private formContainer = viewChild(CdkVirtualScrollViewport); + private rows = viewChildren('row'); + private viewPort = viewChild(CdkVirtualScrollViewport); constructor() { effect(() => { @@ -82,7 +92,12 @@ export class ExperimentExecutionParametersComponent implements OnChanges { }); effect(() => { - this.form = cloneDeep(this.formData()).map((row: ParamsItem) => ({...row, id: uuidV4()})); + this.form.set(cloneDeep(this.formData()).map((row: ParamsItem) => ({ + ...row, + id: uuidV4(), + isMaximize: this.isMaximize(row.value), + isJson: this.isJson(row.value) + }))); }); effect(() => { @@ -94,18 +109,21 @@ export class ExperimentExecutionParametersComponent implements OnChanges { } formNames(id) { - return this.form.filter(parameter => parameter.id !== id).map(parameter => parameter.name); + return this.form().filter(parameter => parameter.id !== id).map(parameter => parameter.name); } addRow() { - this.form.push({ - id: uuidV4(), - section: this.section(), - name: '', - value: '', - description: '', - type: '' - }); + this.form.update(form => ([ + ...form, + { + id: uuidV4(), + section: this.section(), + name: '', + value: '', + description: '', + type: '' + }]) + ); window.setTimeout(() => { const height = this.viewPort().elementRef.nativeElement.scrollHeight; this.viewPort().scrollToIndex(height, 'smooth'); @@ -113,11 +131,12 @@ export class ExperimentExecutionParametersComponent implements OnChanges { } removeRow(index) { - this.form.splice(index, 1); + this.form().splice(index, 1); + this.hyperParameters().form.markAsDirty(); } rowActivated({data}: { data: ExecutionParameter; e: MouseEvent }) { - this.clickedRow = this.form.findIndex(row => row.name === data.name); + this.clickedRow = this.form().findIndex(row => row.name === data.name); } resetIndex() { @@ -161,7 +180,13 @@ export class ExperimentExecutionParametersComponent implements OnChanges { } cancel() { - this.form = cloneDeep(this.formData()).map((row: ParamsItem) => ({...row, id: uuidV4()})); + this.form.set(cloneDeep(this.formData()).map((row: ParamsItem) => ({ + ...row, + id: uuidV4(), + isMaximize: this.isMaximize(row.value), + isJson: this.isJson(row.value) + }))); + this.hyperParameters().form.markAsPristine(); } nextRow(event: Event, index: number) { @@ -170,12 +195,59 @@ export class ExperimentExecutionParametersComponent implements OnChanges { if (this.formData().length === index + 1) { this.addRow(); } - window.setTimeout(()=> this.rows().at(index + 1)?.focus()); + window.setTimeout(() => this.rows().at(index + 1)?.focus()); } navigateToDataset(datasetId: string) { this.store.dispatch(navigateToDataset({datasetId})); } - protected readonly trackByIndex = trackByIndex; + private isMaximize(value: string): boolean { + return value.length > 24; + } + + private isJson(value: string): boolean { + try { + const a = JSON.parse(value); + return true; + } catch (e) { + return false; + } + } + + openJsonViewer(parameter: ExecutionParameter, readOnly: boolean) { + let text= ''; + let isJson = false; + try { + text = JSON.parse(parameter.value); + isJson = true; + } + catch (e) { + text = parameter.value; + } + this.dialog.open(EditJsonComponent, { + data: { + textData: text, + readOnly, + title: `${readOnly ? 'VIEW' : 'EDIT'} PARAMETER: "${parameter.name}"`, + format: isJson ? 'json' : null + } as EditJsonData, + maxWidth: 'calc(70vw + 64px)' + }).afterClosed() + .pipe(take(1)) + .subscribe((data) => { + if (data !== undefined && data !== parameter.value) { + const dataString = JSON.stringify(data); + this.form.update(form => form.map(row => + row.id === parameter.id ? { + ...row, + value: data.length === 0 ? '' : isJson ? dataString : data, + isJson: this.isJson(dataString), + isMaximize: this.isMaximize(dataString), + } : row)); + this.hyperParameters().form.markAsDirty(); + } + } + ); + } } diff --git a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/json-indent.pipe.ts b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/json-indent.pipe.ts new file mode 100644 index 00000000..f68e15eb --- /dev/null +++ b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/json-indent.pipe.ts @@ -0,0 +1,14 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'jsonIndent', +}) +export class JsonIndentPipe implements PipeTransform { + transform(value: string): string { + try { + return JSON.stringify(JSON.parse(value), null, '\t'); + } catch (e) { + return value; + } + } +} diff --git a/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.scss b/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.scss index ac3eef02..937dd2d2 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.scss +++ b/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - .source-code-container { margin-bottom: 16px; } diff --git a/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.ts b/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.ts index 586bb2fd..83d680f6 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.ts @@ -12,16 +12,18 @@ import {debounceTime, filter, map, startWith} from 'rxjs/operators'; import {pairwise} from 'rxjs'; @Component({ - selector : 'sm-experiment-execution-source-code', - templateUrl: './experiment-execution-source-code.component.html', - styleUrls : ['./experiment-execution-source-code.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - providers: [ - { - provide: NG_VALUE_ACCESSOR, - useExisting: forwardRef(() => ExperimentExecutionSourceCodeComponent), - multi: true - }] + selector: 'sm-experiment-execution-source-code', + templateUrl: './experiment-execution-source-code.component.html', + styleUrls: ['./experiment-execution-source-code.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + providers: [ + { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => ExperimentExecutionSourceCodeComponent), + multi: true + } + ], + standalone: false }) export class ExperimentExecutionSourceCodeComponent implements ControlValueAccessor { private formBuilder = inject(FormBuilder); diff --git a/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.html b/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.html index d116b260..14d60b68 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.html @@ -16,6 +16,8 @@ [value]="!noData() && tableMode()" [rippleEffect]="rippleEffect()" (valueChanged)="tableModeChanged.emit($any($event))"> + +
diff --git a/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.scss b/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.scss index 4aaac480..b732e0f2 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.scss +++ b/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.scss @@ -1,4 +1,4 @@ -@import '../../../../webapp-common/layout/layout.scss'; +@use '../../../../webapp-common/layout/layout.scss'; :host { display: block; @@ -6,7 +6,7 @@ .header-container { padding-left: 24px; - height: $project-header-height; + height: layout.$project-header-height; transition: background-color 0.5s; .hide-item { diff --git a/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.ts b/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.ts index 80641f4f..d6f10ea3 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.ts @@ -23,13 +23,13 @@ import {NgTemplateOutlet} from '@angular/common'; import {MatIconButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; import {ExperimentGraphsModule} from '@common/shared/experiment-graphs/experiment-graphs.module'; -import {MatMenu} from '@angular/material/menu'; +import {CommonSearchComponent} from '@common/common-search/containers/common-search/common-search.component'; @Component({ - selector: 'sm-experiment-header', - templateUrl: './experiment-header.component.html', - styleUrls: ['./experiment-header.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, + selector: 'sm-experiment-header', + templateUrl: './experiment-header.component.html', + styleUrls: ['./experiment-header.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, imports: [ PushPipe, ToggleArchiveComponent, @@ -50,9 +50,8 @@ import {MatMenu} from '@angular/material/menu'; MatIconButton, MatIcon, ExperimentGraphsModule, - MatMenu - ], - standalone: true + CommonSearchComponent, + ] }) export class ExperimentHeaderComponent extends BaseEntityHeaderComponent { diff --git a/src/app/webapp-common/experiments/dumb/experiment-hyper-params-navbar/experiment-hyper-params-navbar.component.html b/src/app/webapp-common/experiments/dumb/experiment-hyper-params-navbar/experiment-hyper-params-navbar.component.html index d8a93605..4a2c0df1 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-hyper-params-navbar/experiment-hyper-params-navbar.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-hyper-params-navbar/experiment-hyper-params-navbar.component.html @@ -1,56 +1,58 @@ - - - USER PROPERTIES - -
+ + USER PROPERTIES + +
- - Properties -
- -@if (((hyperParams() | keyvalue)|filterOut:'key':'properties')?.length>0) { - - - HYPERPARAMETERS - - @for (hyperParameter of (hyperParams() | keyvalue)|filterOut:'key':'properties' | sort:'key'; track hyperParameter['key']) { -
- - {{hyperParameter.key | replaceViaMapPipe:sectionReplaceMap}} -
- } + + Properties +
-} + @if (((hyperParams() | keyvalue)|filterOut:'key':'properties')?.length > 0) { + + + HYPERPARAMETERS + + @for (hyperParameter of (hyperParams() | keyvalue)|filterOut:'key':'properties' | sort:'key'; track hyperParameter['key']) { +
+ + {{ hyperParameter.key | replaceViaMapPipe:sectionReplaceMap }} +
+ } + + } -@if ((configuration() | keyvalue)?.length>0) { - - - CONFIGURATION OBJECTS - - @for (confObj of configuration() | keyvalue; track confObj['key']) { -
- - {{confObj.key | replaceViaMapPipe:sectionReplaceMap}} -
- } - + @if ((configuration() | keyvalue)?.length > 0) { + + + CONFIGURATION OBJECTS + + @for (confObj of configuration() | keyvalue; track confObj['key']) { +
+ + {{ confObj.key | replaceViaMapPipe:sectionReplaceMap }} +
+ } + + } } diff --git a/src/app/webapp-common/experiments/dumb/experiment-hyper-params-navbar/experiment-hyper-params-navbar.component.ts b/src/app/webapp-common/experiments/dumb/experiment-hyper-params-navbar/experiment-hyper-params-navbar.component.ts index e984c68c..f0f0231d 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-hyper-params-navbar/experiment-hyper-params-navbar.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-hyper-params-navbar/experiment-hyper-params-navbar.component.ts @@ -2,10 +2,11 @@ import {ChangeDetectionStrategy, Component, input, output, computed} from '@angu import {Params} from '@angular/router'; @Component({ - selector : 'sm-experiment-hyper-params-navbar', - templateUrl: './experiment-hyper-params-navbar.component.html', - styleUrls : ['./experiment-hyper-params-navbar.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-experiment-hyper-params-navbar', + templateUrl: './experiment-hyper-params-navbar.component.html', + styleUrls: ['./experiment-hyper-params-navbar.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ExperimentHyperParamsNavbarComponent { sectionReplaceMap= { diff --git a/src/app/webapp-common/experiments/dumb/experiment-info-edit-description/experiment-info-edit-description.component.scss b/src/app/webapp-common/experiments/dumb/experiment-info-edit-description/experiment-info-edit-description.component.scss index 05a4f9d9..7038f7f3 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-info-edit-description/experiment-info-edit-description.component.scss +++ b/src/app/webapp-common/experiments/dumb/experiment-info-edit-description/experiment-info-edit-description.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { .description-tooltip { margin: -4px 0; diff --git a/src/app/webapp-common/experiments/dumb/experiment-info-edit-description/experiment-info-edit-description.component.ts b/src/app/webapp-common/experiments/dumb/experiment-info-edit-description/experiment-info-edit-description.component.ts index cd6a5fd7..4cf02be8 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-info-edit-description/experiment-info-edit-description.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-info-edit-description/experiment-info-edit-description.component.ts @@ -2,9 +2,10 @@ import {Component, input, output } from '@angular/core'; import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; @Component({ - selector: 'sm-experiment-info-edit-description', - templateUrl: './experiment-info-edit-description.component.html', - styleUrls: ['./experiment-info-edit-description.component.scss'] + selector: 'sm-experiment-info-edit-description', + templateUrl: './experiment-info-edit-description.component.html', + styleUrls: ['./experiment-info-edit-description.component.scss'], + standalone: false }) export class ExperimentInfoEditDescriptionComponent { selectedExperiment = input(); diff --git a/src/app/webapp-common/experiments/dumb/experiment-info-header/experiment-info-header.component.html b/src/app/webapp-common/experiments/dumb/experiment-info-header/experiment-info-header.component.html index 9cd31b3c..389c7821 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-info-header/experiment-info-header.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-info-header/experiment-info-header.component.html @@ -1,7 +1,10 @@
- - + @if (experiment()) { + + } - + (); + experiment = input(); editable = input(true); infoData = input(); backdropActive = input(false); @@ -72,7 +74,8 @@ export class ExperimentInfoHeaderComponent { [MenuItems.dequeue]: selectionDisabledDequeue([this.experiment()]), [MenuItems.queue]: selectionDisabledQueue([this.experiment()]), [MenuItems.viewWorker]: selectionDisabledViewWorker([this.experiment()]), - [MenuItems.archive]: selectionDisabledArchive([this.experiment()]) + [MenuItems.archive]: selectionDisabledArchive([this.experiment()]), + [MenuItems.run]: selectionDisabledPipelineRun([this.experiment()]) })); onNameChanged(name) { @@ -112,8 +115,8 @@ export class ExperimentInfoHeaderComponent { } editDescriptionHandler() { - this.router.navigate(['general'], {relativeTo: this.activatedRoute}); - window.setTimeout(() => this.store.dispatch(activateEdit(EXPERIMENT_COMMENT)), 50); + this.router.navigate(['general'], {relativeTo: this.activatedRoute}).then(() => + window.setTimeout(() => this.store.dispatch(activateEdit(EXPERIMENT_COMMENT)), 500)); } copyToClipboard() { diff --git a/src/app/webapp-common/experiments/dumb/experiment-log-info/experiment-log-info.component.ts b/src/app/webapp-common/experiments/dumb/experiment-log-info/experiment-log-info.component.ts index 6ef20df9..5b27b55d 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-log-info/experiment-log-info.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-log-info/experiment-log-info.component.ts @@ -5,12 +5,17 @@ import { OnDestroy, ChangeDetectorRef, AfterViewInit, ElementRef, viewChild, input, output } from '@angular/core'; import {Subscription} from 'rxjs'; -import {CdkVirtualScrollViewport} from '@angular/cdk/scrolling'; -import {last, findIndex} from 'lodash-es'; +import {CdkFixedSizeVirtualScroll, CdkVirtualForOf, CdkVirtualScrollViewport} from '@angular/cdk/scrolling'; +import {last, findLastIndex} from 'lodash-es'; import Convert from 'ansi-to-html'; import {Log} from '../../actions/common-experiment-output.actions'; import hasAnsi from 'has-ansi'; +import {DatePipe} from '@angular/common'; +import {SaferPipe} from '@common/shared/pipes/safe.pipe'; +import {MatProgressSpinner} from '@angular/material/progress-spinner'; +import {MatIcon} from '@angular/material/icon'; +import {MatButton} from '@angular/material/button'; interface LogRow { timestamp?: string; @@ -20,10 +25,20 @@ interface LogRow { } @Component({ - selector: 'sm-experiment-log-info', - templateUrl: './experiment-log-info.component.html', - styleUrls: ['./experiment-log-info.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, + selector: 'sm-experiment-log-info', + templateUrl: './experiment-log-info.component.html', + styleUrls: ['./experiment-log-info.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + CdkVirtualScrollViewport, + CdkVirtualForOf, + CdkFixedSizeVirtualScroll, + DatePipe, + SaferPipe, + MatProgressSpinner, + MatIcon, + MatButton + ] }) export class ExperimentLogInfoComponent implements OnDestroy, AfterViewInit { public orgLogs: Log[]; @@ -57,7 +72,7 @@ export class ExperimentLogInfoComponent implements OnDestroy, AfterViewInit { setTimeout(() => this.shouldFocusLog = true, 1000); } if(!this.hasFilter && filter) { - this.locationBeforeFilter = findIndex(this.lines, this.prevLine) + this.prevLineOffset; + this.locationBeforeFilter = findLastIndex(this.lines, this.prevLine) + this.prevLineOffset; } else if (this.locationBeforeFilter !== null) { window.setTimeout(() => { this.logContainer()?.scrollToIndex(this.locationBeforeFilter); @@ -85,7 +100,7 @@ export class ExperimentLogInfoComponent implements OnDestroy, AfterViewInit { if (autoRefresh && this.atEnd) { prevLocation = this.lines.length; } else { - prevLocation = findIndex(this.lines, this.prevLine) + this.prevLineOffset; + prevLocation = findLastIndex(this.lines, this.prevLine) + this.prevLineOffset; } this.fetchPrev = null; if (!this.initial && prevLocation) { @@ -101,6 +116,7 @@ export class ExperimentLogInfoComponent implements OnDestroy, AfterViewInit { this.scrolling = true; window.setTimeout(() => { this.logContainer()?.scrollToIndex(this.lines.length); + this.scrolledToBottom.emit(); this.canRefresh = true; window.setTimeout(() => this.scrolling = false, 80); }, 10); @@ -108,6 +124,8 @@ export class ExperimentLogInfoComponent implements OnDestroy, AfterViewInit { } } + scrolledToBottom = output(); + fetchMore = output<{ direction: string; from?: number; diff --git a/src/app/webapp-common/experiments/dumb/experiment-models-form-view/experiment-models-form-view.component.html b/src/app/webapp-common/experiments/dumb/experiment-models-form-view/experiment-models-form-view.component.html index 4db32ec3..9362bb45 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-models-form-view/experiment-models-form-view.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-models-form-view/experiment-models-form-view.component.html @@ -13,9 +13,6 @@ label="" [clipboardText]="model().uri" > } - @if (model()?.id) { - - }
@if (editable()) {
+ @if (model()?.id) { + + + + } @if (showCreatedExperiment()) { - + @switch (col.id) { + @case ('icon') { + @if (row.summary) { +
+ + +
+ } + } @case ('created') {
{{ row?.[col.id] | date:'MMM d yyyy H:mm' }}
} @case ('operation') { -
{{OPERATIONS[row.operation]?? (row.operation | titlecase)}}
+
+ {{OPERATIONS[row.operation]?? (row.operation | titlecase)}} + @if (row.summary && !expanded) { + ({{row.summary.length}}) + } +
} @case ('user') {
{{ row.user?.name }}
@@ -28,4 +44,30 @@ } } + + @for (event of groupedEvents.summary?.slice(1); track event.id) { +
+ @for (col of columns | filterOut: 'hidden': true ; track col.id) { + + } + + } + diff --git a/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.scss b/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.scss index 267294bf..1376954f 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.scss +++ b/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.scss @@ -1,3 +1,30 @@ :host { - --row-border-color: var(--color-surface-container-high); -} \ No newline at end of file + --p-datatable-body-cell-border-color: var(--color-surface-container-high); + + .al-ico-next { + transition: transform 0.2s ease-in-out, color 0.2s ease-in-out; + + &.expanded { + transform: rotate(90deg); + } + } + + .expanded-row { + position: relative; + vertical-align: middle; + color: var(--row-default-text-color); + background-color: var(--color-surface-container-lowest); + font-size: 1rem; + height: 36px; + border-bottom: 1px solid var(--p-datatable-body-cell-border-color); + } + + .expanded-cell { + padding: 0 8px; + + &:nth-of-type(2) { + padding-left: 18px; + } + } + +} diff --git a/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.ts b/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.ts index 1c1d5d62..41128361 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.ts @@ -1,13 +1,14 @@ -import {Component, EventEmitter, input, Output, viewChild} from '@angular/core'; -import { DatePipe, TitleCasePipe } from '@angular/common'; +import {Component, input, viewChild, output } from '@angular/core'; +import {DatePipe, TitleCasePipe} from '@angular/common'; +import {FilterOutPipe} from '@common/shared/pipes/filterOut.pipe'; import {TableComponent} from '@common/shared/ui-components/data/table/table.component'; import {PrimeTemplate} from 'primeng/api'; -import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; +import {ColHeaderTypeEnum, ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import { ShowTooltipIfEllipsisDirective } from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; -import {trackByIndex} from '@common/shared/utils/forms-track-by'; +import {trackById} from '@common/shared/utils/forms-track-by'; import { TasksGetOperationsLogResponseOperations } from '~/business-logic/model/tasks/tasksGetOperationsLogResponseOperations'; @@ -25,13 +26,27 @@ import {EXPERIMENTS_STATUS_LABELS} from '~/features/experiments/shared/experimen PrimeTemplate, ShowTooltipIfEllipsisDirective, TooltipDirective, -], - standalone: true + FilterOutPipe, + ] }) export class ExperimentOperationsLogComponent { OPERATIONS = {...EXPERIMENTS_STATUS_LABELS, archived: 'Archived'}; columns: ISmCol[] = [ + { + id: 'icon', + headerType: ColHeaderTypeEnum.checkBox, + header: '', + frozen: true, + style: {width: '60px'}, + sortable: false, + filterable: false, + bodyStyleClass: 'selected-col-body type-col', + headerStyleClass: 'selected-col-header', + disableDrag: true, + disablePointerEvents: true, + includeInDownload: false, + }, { id: 'operation', header: 'New status', @@ -78,9 +93,10 @@ export class ExperimentOperationsLogComponent { ]; lines = input([]); - @Output() downloadFullLog = new EventEmitter(); - @Output() openFullLog = new EventEmitter(); + downloadFullLog = output(); + openFullLog = output(); table = viewChild(TableComponent<{ id: string }>); - protected readonly trackByIndex = trackByIndex; + protected readonly trackById = trackById; + expandedRowKeys: Record = {}; } diff --git a/src/app/webapp-common/experiments/dumb/experiment-output-model-view/experiment-output-model-view.component.ts b/src/app/webapp-common/experiments/dumb/experiment-output-model-view/experiment-output-model-view.component.ts index 8389259a..ceb381c3 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-output-model-view/experiment-output-model-view.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-output-model-view/experiment-output-model-view.component.ts @@ -5,9 +5,10 @@ import {BaseClickableArtifactComponent} from '../base-clickable-artifact.compone @Component({ - selector : 'sm-experiment-output-model-view', - templateUrl: './experiment-output-model-view.component.html', - styleUrls : ['./experiment-output-model-view.component.scss'] + selector: 'sm-experiment-output-model-view', + templateUrl: './experiment-output-model-view.component.html', + styleUrls: ['./experiment-output-model-view.component.scss'], + standalone: false }) export class ExperimentOutputModelViewComponent extends BaseClickableArtifactComponent { diff --git a/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.html b/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.html index 0b05d42f..6a1d2739 100644 --- a/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.html +++ b/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.html @@ -54,6 +54,7 @@ @if (col?.headerType === colHeaderTypeEnum.checkBox) { @if (multiSelect) { -
+
- + {{ variant.variant }}
@@ -61,18 +62,21 @@
LAST MIN MAX diff --git a/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.scss b/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.scss index 3e065d8c..909d7ed6 100644 --- a/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.scss +++ b/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.scss @@ -1,4 +1,4 @@ -@import "mixins/link"; +@use "mixins/link"; :host-context(.normal-size) { @@ -7,7 +7,7 @@ } :host { - @include link(); + @include link.link(); .actions { display: block; @@ -52,10 +52,6 @@ align-items: center; height: 36px; - mat-checkbox{ - transform: scale(0.8); - } - .var-label { color: var(--mat-menu-item-label-text-color); letter-spacing: var(--mat-menu-item-label-text-tracking); @@ -71,7 +67,7 @@ font-size: 11px; font-weight: bold; mat-checkbox { - transform: scale(0.8); + transform: scale(0.9); } } diff --git a/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.ts b/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.ts index 6e983eb5..13ec41a5 100644 --- a/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.ts +++ b/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.ts @@ -13,7 +13,6 @@ import {MatRadioButton, MatRadioGroup} from '@angular/material/radio'; import {FormsModule} from '@angular/forms'; import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; import {HasSelectedPipe} from '@common/experiments/dumb/select-metric-for-custom-col/has-selected.pipe'; -import {IsRowSelectedPipe} from '@common/shared/ui-components/data/table/is-rwo-selected.pipe'; import {MatCheckbox} from '@angular/material/checkbox'; export interface SelectionEvent { @@ -23,30 +22,28 @@ export interface SelectionEvent { } @Component({ - selector: 'sm-select-metric-for-custom-col', - templateUrl: './select-metric-for-custom-col.component.html', - styleUrls: ['./select-metric-for-custom-col.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - SearchComponent, - ClickStopPropagationDirective, - MatProgressSpinner, - MatExpansionPanel, - IsEmptyPipe, - MatExpansionPanelHeader, - MatExpansionPanelTitle, - TooltipDirective, - AdvancedFilterPipe, - MatExpansionPanelContent, - ShowTooltipIfEllipsisDirective, - MatRadioButton, - MatRadioGroup, - FormsModule, - HasSelectedPipe, - IsRowSelectedPipe, - MatCheckbox - ], - standalone: true + selector: 'sm-select-metric-for-custom-col', + templateUrl: './select-metric-for-custom-col.component.html', + styleUrls: ['./select-metric-for-custom-col.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + SearchComponent, + ClickStopPropagationDirective, + MatProgressSpinner, + MatExpansionPanel, + IsEmptyPipe, + MatExpansionPanelHeader, + MatExpansionPanelTitle, + TooltipDirective, + AdvancedFilterPipe, + MatExpansionPanelContent, + ShowTooltipIfEllipsisDirective, + MatRadioButton, + MatRadioGroup, + FormsModule, + HasSelectedPipe, + MatCheckbox + ] }) export class SelectMetricForCustomColComponent { public metricTree: Record; diff --git a/src/app/webapp-common/experiments/effects/common-experiment-output.effects.ts b/src/app/webapp-common/experiments/effects/common-experiment-output.effects.ts index 970568a8..59dca55f 100644 --- a/src/app/webapp-common/experiments/effects/common-experiment-output.effects.ts +++ b/src/app/webapp-common/experiments/effects/common-experiment-output.effects.ts @@ -43,6 +43,7 @@ export class CommonExperimentOutputEffects { activeLoader = createEffect(() => this.actions$.pipe( ofType(outputActions.experimentScalarRequested, outputActions.experimentPlotsRequested), + filter(action => !action?.['refresh']), map(action => activeLoader(action.type)) )); @@ -61,7 +62,7 @@ export class CommonExperimentOutputEffects { this.store.select(selectSelectedExperiment), this.store.select(selectPipelineSelectedStep)), mergeMap(([res, selectedTask, pipeStep]: [EventsGetTaskLogResponse, IExperimentInfo, IExperimentInfo]) => [ - ...([pipeStep?.id, selectedTask.id].includes(action.id) ? + ...([pipeStep?.id, selectedTask?.id].includes(action.id) || selectedTask === null ? [ outputActions.setExperimentLog({ events: res.events.map((e: Log) => ({...e, msg: e.msg?.replace(/\0/g, '')})), @@ -84,7 +85,12 @@ export class CommonExperimentOutputEffects { deactivateLoader(refreshExperiments.type), ...(action.refresh || action.from || action.autoRefresh // hide weird missing id error - || error.error.meta.result_subcode === 101 ? [] : [setServerError(error, null, 'Failed to fetch log')]), + || error.error.meta.result_subcode === 101 ? (action.id === '*' ? [outputActions.setExperimentLog({ + events: [], + total: 0, + direction: action.direction, + refresh: action.refresh + })] : []) : [setServerError(error, null, 'Failed to fetch log')]), outputActions.setExperimentLogLoading({loading: false}) ]) ) @@ -119,6 +125,7 @@ export class CommonExperimentOutputEffects { fetchExperimentScalarSingleValue$ = createEffect(() => this.actions$.pipe( ofType(outputActions.experimentScalarRequested), + filter(action => !action.skipSingleValue), switchMap((action) => this.eventsApi.eventsGetTaskSingleValueMetrics({ tasks: [action.experimentId], // eslint-disable-next-line @typescript-eslint/naming-convention diff --git a/src/app/webapp-common/experiments/effects/common-experiments-info.effects.ts b/src/app/webapp-common/experiments/effects/common-experiments-info.effects.ts index 6c819b49..b3549b74 100644 --- a/src/app/webapp-common/experiments/effects/common-experiments-info.effects.ts +++ b/src/app/webapp-common/experiments/effects/common-experiments-info.effects.ts @@ -36,7 +36,6 @@ import { saveExperimentConfigObj, saveExperimentSection, saveHyperParamsSection, - setExperimentOperationLog, setExperimentSaving, TreeStep } from '../actions/common-experiments-info.actions'; @@ -97,7 +96,9 @@ export class CommonExperimentsInfoEffects { } activeLoader = createEffect(() => this.actions$.pipe( - ofType(commonInfoActions.getExperimentInfo, commonInfoActions.getSelectedPipelineStep), + ofType(commonInfoActions.getExperimentInfo, commonInfoActions.getSelectedPipelineStep, getExperimentConfigurationNames, + commonInfoActions.getExperiment, getPipelineConfigurationObj, commonInfoActions.getExperimentUncommittedChanges), + filter(action => !action?.['autoRefresh']), map(action => activeLoader(action.type)) )); @@ -174,7 +175,8 @@ export class CommonExperimentsInfoEffects { id: experimentId, changes: {configuration: configurationObj} }), - deactivateLoader(action.type), + deactivateLoader(getExperimentConfigurationObj.type), + deactivateLoader(getPipelineConfigurationObj.type), setBackdrop({active: false}), deactivateEdit(), setExperimentSaving({saving: false}) @@ -214,19 +216,6 @@ export class CommonExperimentsInfoEffects { )) )); - getExperimentEventLog$ = createEffect(() => this.actions$.pipe( - ofType(commonInfoActions.getExperimentOperationLog), - concatLatestFrom(() => [this.store.select(selectRouterConfig)]), - filter(([, routeConfig]) => routeConfig.includes('general')), - switchMap(([action,]) => this.apiTasks.tasksGetOperationsLog({task: action.id, page_size: 5000}).pipe( - mergeMap(res => [setExperimentOperationLog({operationLog: res.operations}), deactivateLoader(action.type)]), - catchError(error => [ - requestFailed(error), - deactivateLoader(action.type) - ]) - )))); - - getExperimentInfo$ = createEffect(() => this.actions$.pipe( ofType(commonInfoActions.getExperimentInfo, commonInfoActions.autoRefreshExperimentInfo, commonInfoActions.experimentUpdatedSuccessfully), concatLatestFrom(() => [ @@ -237,8 +226,7 @@ export class CommonExperimentsInfoEffects { this.store.select(selectAppVisible), this.store.select(selectRouterConfig).pipe(map(config => !!config?.includes('pipelines') || !!config?.includes('datasets'))) ]), - switchMap(([action, tableSelected, selected, - selectedExperimentFromTable, infoData, visible, customView]) => { + switchMap(([action, tableSelected, selected, selectedExperimentFromTable, infoData, visible, customView]) => { const currentSelected = tableSelected || selected; if (this.previousSelectedId && currentSelected?.id != this.previousSelectedId) { this.previousSelectedLastUpdate = null; @@ -248,9 +236,10 @@ export class CommonExperimentsInfoEffects { return of([action, null, tableSelected, selected, customView]); } - return (selectedExperimentFromTable ? of(selectedExperimentFromTable) : - - this.apiTasks.tasksGetByIdEx({id: [selected.id], only_fields: ['last_change']}).pipe(map(res => res.tasks[0])) + return (selectedExperimentFromTable ? + of(selectedExperimentFromTable) : + this.apiTasks.tasksGetByIdEx({id: [selected.id], only_fields: ['last_change']}) + .pipe(map(res => res.tasks[0])) ).pipe(map(task => [action, task?.last_change ?? task?.last_update, task, selected, customView])); }), filter(([action, , tableSelected, selected]) => (action.type !== commonInfoActions.autoRefreshExperimentInfo.type || (!tableSelected) || (tableSelected?.id === selected?.id))), @@ -342,7 +331,7 @@ export class CommonExperimentsInfoEffects { requestFailed(error), deactivateLoader(action.type), deactivateLoader(commonInfoActions.getExperimentInfo.type), - ...(action.autoRefresh ? [] : [setServerError(error, null, 'Fetch experiment failed')]) + ...(action.autoRefresh ? [] : [setServerError(error, null, 'Fetch task failed')]) ]) ) ) @@ -356,9 +345,15 @@ export class CommonExperimentsInfoEffects { .pipe( mergeMap(res => { const experiment = res.tasks[0]; - return [commonInfoActions.setExperimentUncommittedChanges({diff: experiment?.script?.diff})]; + return [ + commonInfoActions.setExperimentUncommittedChanges({diff: experiment?.script?.diff}), + deactivateLoader(action.type) + ]; }), - catchError(() => [commonInfoActions.setExperimentUncommittedChanges({diff: ''})]) + catchError(() => [ + commonInfoActions.setExperimentUncommittedChanges({diff: ''}), + deactivateLoader(action.type) + ]) ) ) )); @@ -453,7 +448,7 @@ export class CommonExperimentsInfoEffects { }), catchError((err: HttpErrorResponse) => [ requestFailed(err), - setServerError(err, null, 'Update Experiment failed'), + setServerError(err, null, 'Update task failed'), commonInfoActions.getExperimentInfo({id: action.id}) ]) ) @@ -527,7 +522,6 @@ export class CommonExperimentsInfoEffects { this.apiTasks.tasksEditHyperParams({ task: selectedExperiment.id, hyperparams: action.hyperparams.length > 0 ? action.hyperparams : [{section}], - replace_hyperparams: ReplaceHyperparamsEnum.Section }) .pipe( @@ -608,7 +602,7 @@ export class CommonExperimentsInfoEffects { if (res.tasks?.length > 0) { const task = res.tasks[0]; const a = document.createElement('a'); - a.href = `/datasets/simple/${task.project.id}/experiments/${task.id}`; + a.href = `/datasets/simple/${task.project.id}/tasks/${task.id}`; a.target = '_blank'; a.click(); return {type: 'none'}; diff --git a/src/app/webapp-common/experiments/effects/common-experiments-menu.effects.ts b/src/app/webapp-common/experiments/effects/common-experiments-menu.effects.ts index 0ccaf468..62e2f481 100644 --- a/src/app/webapp-common/experiments/effects/common-experiments-menu.effects.ts +++ b/src/app/webapp-common/experiments/effects/common-experiments-menu.effects.ts @@ -223,11 +223,13 @@ export class CommonExperimentsMenuEffects { } as TasksCloneRequest) .pipe( mergeMap((res: TasksCloneResponse) => { - this.router.navigate(['projects', action.cloneData.project?.value || res.id || '*', 'tasks', res.id]); + this.router.navigate(['projects', action.cloneData.project?.value || res.new_project?.id || '*', 'tasks', res.id]); return [ viewActions.getExperiments(), deactivateLoader(action.type), - ...action.cloneData.newProjectName ? [getAllSystemProjects()] : [], + ...action.cloneData.newProjectName ? [ + projectsActions.setDeep({deep: false}), + getAllSystemProjects()] : [], ]; }), catchError(error => [ diff --git a/src/app/webapp-common/experiments/effects/common-experiments-view.effects.ts b/src/app/webapp-common/experiments/effects/common-experiments-view.effects.ts index 03d03cb0..c6ec75b6 100644 --- a/src/app/webapp-common/experiments/effects/common-experiments-view.effects.ts +++ b/src/app/webapp-common/experiments/effects/common-experiments-view.effects.ts @@ -80,7 +80,7 @@ import { selectionDisabledDelete, selectionDisabledDequeue, selectionDisabledEnqueue, - selectionDisabledMoveTo, + selectionDisabledMoveTo, selectionDisabledPipelineRun, selectionDisabledPublishExperiments, selectionDisabledQueue, selectionDisabledReset, @@ -319,7 +319,7 @@ export class CommonExperimentsViewEffects { actions.push(autoRefreshExperimentInfo({id: selectedExperiment.id})); } else { // SetExperiments must be before GetExperimentInfo! - actions.push(getExperimentInfo({id: selectedExperiment.id})); + actions.push(getExperimentInfo({id: selectedExperiment.id, autoRefresh: null})); } } return actions; @@ -512,8 +512,8 @@ export class CommonExperimentsViewEffects { getCustomMetrics = createEffect(() => this.actions$.pipe( ofType(exActions.getCustomMetrics), - concatLatestFrom(() => [ - this.store.select(selectRouterParams).pipe(map(params => params?.projectId)), + concatLatestFrom((action) => [ + this.store.select(selectRouterParams).pipe(map(params => action.projectId ?? params?.projectId)), this.store.select(selectIsDeepMode) ]), switchMap(([action, projectId, isDeep]) => this.projectsApi.projectsGetUniqueMetricVariants({ @@ -967,7 +967,8 @@ export class CommonExperimentsViewEffects { [MenuItems.queue]: selectionDisabledQueue(experiments), [MenuItems.viewWorker]: selectionDisabledViewWorker(experiments), [MenuItems.archive]: selectionDisabledArchive(experiments), - [MenuItems.tags]: selectionDisabledTags(experiments) + [MenuItems.tags]: selectionDisabledTags(experiments), + [MenuItems.run]: selectionDisabledPipelineRun(experiments) }; //allHasExamples: selectionAllExamples(action.experiments), // allArchive: selectionAllIsArchive(action.experiments), @@ -1013,8 +1014,8 @@ export class CommonExperimentsViewEffects { image: action.data.docker.image, setup_shell_script: action.data.docker.script }), - arguments: `${action.data.docker.args}${action.data.taskInit ? ' -e CLEARML_AGENT_FORCE_TASK_INIT=1' : ''}${action.data.poetry ? ' -e CLEARML_AGENT_FORCE_POETRY' : ''}${action.data.venv ? ' -e CLEARML_AGENT_SKIP_PIP_VENV_INSTALL=' + action.data.venv : ''}${action.data.requirements === 'skip' ? ' -e CLEARML_AGENT_SKIP_PYTHON_ENV_INSTALL=1' : ''}` - .concat(action.data.vars.map(v => ` -e ${v.key}:${v.value}`).join('')) + arguments: `${action.data.docker.args}${action.data.taskInit ? ' -e CLEARML_AGENT_FORCE_TASK_INIT=1' : ''}${action.data.poetry ? ' -e CLEARML_AGENT_FORCE_POETRY' : ''}${action.data.venvType === 'manual' ? ' -e CLEARML_AGENT_SKIP_PIP_VENV_INSTALL=' + action.data.venv : ''}${action.data.requirements === 'skip' ? ' -e CLEARML_AGENT_SKIP_PYTHON_ENV_INSTALL=1' : ''}` + .concat(action.data.vars?.map(v => ` -e ${v.key}:${v.value}`).join('') ?? '') .trimStart(), } } as TasksCreateRequest).pipe( diff --git a/src/app/webapp-common/experiments/experiment.consts.ts b/src/app/webapp-common/experiments/experiment.consts.ts index 3529c854..b3187c7c 100644 --- a/src/app/webapp-common/experiments/experiment.consts.ts +++ b/src/app/webapp-common/experiments/experiment.consts.ts @@ -62,7 +62,7 @@ export const INITIAL_EXPERIMENT_TABLE_COLS: ISmCol[] = [ headerType: ColHeaderTypeEnum.sortFilter, filterable: true, header: 'STATUS', - style: {width: '115px'}, + style: {width: '130px', minWidth: '130px'}, showInCardFilters: true }, { diff --git a/src/app/webapp-common/experiments/experiments.component.html b/src/app/webapp-common/experiments/experiments.component.html index 90e6ccb8..fcaa0e2d 100644 --- a/src/app/webapp-common/experiments/experiments.component.html +++ b/src/app/webapp-common/experiments/experiments.component.html @@ -1,7 +1,7 @@ experiments !== null), - withLatestFrom(this.isArchived$), // lil hack for hiding archived task after they have been archived from task info or footer... - map(([experiments, showArchived]) => filterArchivedExperiments(experiments, showArchived))); + map((experiments) => filterArchivedExperiments(experiments, this.isArchivedMode()))); protected filteredTableCols$ = this.store.select(selectFilteredTableCols); @@ -378,6 +378,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI override ngOnDestroy(): void { super.ngOnDestroy(); this.store.dispatch(experimentsActions.resetExperiments({})); + this.store.dispatch(setExperiment({experiment: null})); this.stopSyncSearch(); } @@ -389,7 +390,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI syncAppSearch() { this.store.dispatch(initSearch({payload: 'Search for tasks'})); - this.sub.add(this.searchQuery$.pipe(skip(1)).subscribe(query => { + this.sub.add(this.searchQuery$.pipe(skip(1),filter(query => query !== null)).subscribe(query => { this.store.dispatch(experimentsActions.globalFilterChanged(query)); })); } @@ -646,7 +647,8 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI [MenuItems.dequeue]: selectionDisabledDequeue([experiment]), [MenuItems.queue]: selectionDisabledQueue([experiment]), [MenuItems.viewWorker]: selectionDisabledViewWorker([experiment]), - [MenuItems.archive]: selectionDisabledArchive([experiment]) + [MenuItems.archive]: selectionDisabledArchive([experiment]), + [MenuItems.run]: selectionDisabledPipelineRun([experiment]) }; } diff --git a/src/app/webapp-common/experiments/reducers/common-experiment-info.reducer.ts b/src/app/webapp-common/experiments/reducers/common-experiment-info.reducer.ts index 2d66294d..1eb13ffa 100644 --- a/src/app/webapp-common/experiments/reducers/common-experiment-info.reducer.ts +++ b/src/app/webapp-common/experiments/reducers/common-experiment-info.reducer.ts @@ -8,7 +8,7 @@ import { downloadSuccess, experimentDataUpdated, experimentDetailsUpdated, - getExperimentArtifacts, + getExperimentArtifacts, getExperimentInfo, getExperimentUncommittedChanges, resetExperimentInfo, saveExperiment, @@ -20,7 +20,6 @@ import { setExperimentErrors, setExperimentFormErrors, setExperimentInfoData, - setExperimentOperationLog, setExperimentSaving, setExperimentUncommittedChanges, setSelectedPipelineStep, @@ -32,9 +31,6 @@ import {experimentSections, experimentSectionsEnum} from '~/features/experiments import {set} from 'lodash-es'; import {setControllerForStartPipelineDialog} from '../actions/common-experiments-menu.actions'; import {ActionCreator, createReducer, on, ReducerTypes} from '@ngrx/store'; -import { - TasksGetOperationsLogResponseOperations -} from '~/business-logic/model/tasks/tasksGetOperationsLogResponseOperations'; export interface CommonExperimentInfoState { @@ -52,7 +48,6 @@ export interface CommonExperimentInfoState { artifactsExperimentId: string; downloading: boolean; downloadingExperimentOperationLog: boolean; - operationLog: TasksGetOperationsLogResponseOperations[]; } export const initialCommonExperimentInfoState: CommonExperimentInfoState = { @@ -75,7 +70,6 @@ export const initialCommonExperimentInfoState: CommonExperimentInfoState = { artifactsExperimentId: null, downloading: false, downloadingExperimentOperationLog: false, - operationLog: null }; export const commonExperimentInfoReducers = [ @@ -101,7 +95,6 @@ export const commonExperimentInfoReducers = [ on(downloadSuccess, downloadFailed, (state): CommonExperimentInfoState => ({...state, downloading: false})), on(setExperimentErrors, (state, action): CommonExperimentInfoState => ({...state, errors: {...state.errors, ...action}})), on(resetExperimentInfo, (state): CommonExperimentInfoState => ({...state, infoData: null})), - on(setExperimentOperationLog, (state, action): CommonExperimentInfoState => ({...state, operationLog: action.operationLog})), on(setExperimentInfoData, (state, action): CommonExperimentInfoState => ({ ...state, infoData: { diff --git a/src/app/webapp-common/experiments/reducers/experiment-output.reducer.ts b/src/app/webapp-common/experiments/reducers/experiment-output.reducer.ts index 53a4bef0..a7c2ae71 100644 --- a/src/app/webapp-common/experiments/reducers/experiment-output.reducer.ts +++ b/src/app/webapp-common/experiments/reducers/experiment-output.reducer.ts @@ -39,11 +39,13 @@ export interface ExperimentSettings { selectedHyperParams: Array; selectedMetric: string; smoothWeight: number; + smoothSigma: number; smoothType: SmoothTypeEnum; xAxisType: ScalarKeyEnum; groupBy: GroupByCharts; lastModified?: number; - valueType?: 'min_value' | 'max_value' | 'value' + valueType?: 'min_value' | 'max_value' | 'value'; + projectLevel?: boolean; } export const experimentOutputInitState: ExperimentOutputState = { @@ -114,6 +116,10 @@ export const experimentOutputReducer = createReducer( on(actions.setExperimentPlots, (state, action) => ({...state, metricsPlotsCharts: action.plots})), on(actions.setExperimentScalarSingleValue, (state, action) => ({...state, scalarSingleValue: action.values})), on(actions.setExperimentMetricsVariantValues, (state, action) => ({...state, lastMetrics: action.lastMetrics})), + on(actions.removeExperimentSettings, (state, action) => ({ + ...state, + settingsList: state.settingsList.filter(setting => setting.id !== action.id), + })), on(actions.setExperimentSettings, (state, action) => { let newSettings: ExperimentSettings[]; const changes = {...action.changes, lastModified: (new Date()).getTime()} as ExperimentSettings; diff --git a/src/app/webapp-common/experiments/reducers/experiments-view.reducer.ts b/src/app/webapp-common/experiments/reducers/experiments-view.reducer.ts index e47c8cff..25639dba 100644 --- a/src/app/webapp-common/experiments/reducers/experiments-view.reducer.ts +++ b/src/app/webapp-common/experiments/reducers/experiments-view.reducer.ts @@ -82,8 +82,8 @@ export const experimentsViewInitialState: ExperimentsViewState = { globalFilter: null, showAllSelectedIsActive: false, metricsCols: [], - metricVariants: [], - metricVariantsPlots: [], + metricVariants: null, + metricVariantsPlots: null, compareSelectedMetrics: {}, compareSelectedMetricsPlots: {}, hyperParams: [], diff --git a/src/app/webapp-common/experiments/reducers/index.ts b/src/app/webapp-common/experiments/reducers/index.ts index ace0b289..dff96a3d 100644 --- a/src/app/webapp-common/experiments/reducers/index.ts +++ b/src/app/webapp-common/experiments/reducers/index.ts @@ -1,6 +1,6 @@ import {createSelector} from '@ngrx/store'; import {ISmCol, TABLE_SORT_ORDER} from '../../shared/ui-components/data/table/table.consts'; -import {experimentInfo, experimentOutput, experimentsView, selectExperimentInfoData, selectSelectedExperiment, selectSelectedModelSettings,} from '~/features/experiments/reducers'; +import {experimentInfo, experimentOutput, experimentsView, selectExperimentInfoData, selectOutputSettings, selectSelectedExperiment, selectSelectedModelSettings} from '~/features/experiments/reducers'; import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; import {EXPERIMENTS_TABLE_COL_FIELDS, experimentSectionsEnum} from '~/features/experiments/shared/experiments.const'; import {ExperimentSettings} from './experiment-output.reducer'; @@ -11,13 +11,13 @@ import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {ParamsItem} from '~/business-logic/model/tasks/paramsItem'; import {selectRouterConfig, selectRouterParams} from '../../core/reducers/router-reducer'; import {experimentsViewInitialState} from '@common/experiments/reducers/experiments-view.reducer'; -import {selectCompareAddTableFilters, selectCompareAddTableSortFields, selectIsCompare, selectIsModels,} from '../../experiments-compare/reducers'; +import {selectCompareAddTableFilters, selectCompareAddTableSortFields, selectIsCompare, selectIsModels} from '../../experiments-compare/reducers'; import {FilterMetadata} from 'primeng/api/filtermetadata'; import {SortMeta} from 'primeng/api'; import {EventsGetTaskSingleValueMetricsResponseValues} from '~/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseValues'; import {selectModelExperimentsTableFilters} from '@common/models/reducers'; import {smoothTypeEnum, SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; -import {EXPERIMENT_COMMENT} from '@common/experiments/dumb/experiment-general-info/experiment-general-info.component'; +import {EXPERIMENT_COMMENT} from '@common/experiments/dumb/experiment-details/experiment-details.component'; import {isReadOnly} from '@common/shared/utils/is-read-only'; import {createMetricColumn} from '@common/shared/utils/tableParamEncode'; import {selectIsDeepMode, selectSelectedProjectId} from '@common/core/reducers/projects.reducer'; @@ -34,29 +34,31 @@ export const selectExperimentsHiddenTableCols = createSelector(experimentsView, export const selectMetricVariants = createSelector(experimentsView, state => state.metricVariants); export const selectMetricVariantsPlots = createSelector(experimentsView, state => state.metricVariantsPlots); export const selectExperimentViewMode = createSelector(selectRouterConfig, - config => config.at(-2) === 'compare' ? 'compare' : config.includes(':experimentId') ? 'info' : 'table'); + config => config.at(-2) === 'compare' ? 'compare' : config.includes(':experimentId') ? 'info' : 'table'); export const selectTableCompareView = createSelector(experimentsView, state => state.tableCompareView); export const selectMetricVariantForView = createSelector(selectExperimentViewMode, selectTableCompareView, selectMetricVariants, selectMetricVariantsPlots, (viewMode, compareView, scalarVars, plotVars) => viewMode === 'compare' && compareView === 'plots' ? plotVars : scalarVars); -export const selectCompareSelectedMetricsScalars = createSelector(experimentsView, selectRouterParams, (state, params) => state.compareSelectedMetrics?.[params?.projectId]) -export const selectCompareSelectedMetricsPlots = createSelector(experimentsView, selectRouterParams, (state, params) => state.compareSelectedMetricsPlots?.[params?.projectId]) -export const selectCompareSelectedMetrics = (viewMode: 'scalars' | 'plots') => createSelector(selectMetricVariants, +export const selectCompareSelectedMetricsScalars = createSelector(experimentsView, selectRouterParams, (state, params) => state.compareSelectedMetrics?.[params?.projectId]); +export const selectCompareSelectedMetricsPlots = createSelector(experimentsView, selectRouterParams, (state, params) => state.compareSelectedMetricsPlots?.[params?.projectId]); +export const selectCompareSelectedMetrics = (viewMode: 'scalars' | 'plots') => createSelector(selectMetricVariants, selectMetricVariantsPlots, selectCompareSelectedMetricsScalars, selectCompareSelectedMetricsPlots, (metricVariantsScalars, metricVariantsPlots, selectedMetricsScalars, selectedMetricsPlots): ISmCol[] => { const selectedMetricsState = viewMode === 'scalars' ? selectedMetricsScalars : selectedMetricsPlots; const metricVariants = viewMode === 'scalars' ? metricVariantsScalars : metricVariantsPlots; - const selectedMetrics = selectedMetricsState?.metrics.map(selectedMetric => { - const metricVariant = metricVariants.find(metric => selectedMetric.id === `last_metrics.${metric.metric_hash}.${metric.variant_hash}.value`); - return metricVariant ? {...metricVariant, ... selectedMetric} : null - }).filter(a => !!a); - return selectedMetrics?.map(selectedMetric => ({...createMetricColumn({ - metric: selectedMetric.metric, - variant: selectedMetric.variant, - metricHash: selectedMetric.metric_hash, - variantHash: selectedMetric.variant_hash, - valueType: null - }, null) as ISmCol, hidden: selectedMetric.hidden})); -}); + const selectedMetrics = selectedMetricsState?.metrics.map(selectedMetric => { + const metricVariant = metricVariants?.find(metric => selectedMetric.id === `last_metrics.${metric.metric_hash}.${metric.variant_hash}.value`); + return metricVariant ? {...metricVariant, ...selectedMetric} : null; + }).filter(a => !!a); + return selectedMetrics?.map(selectedMetric => ({ + ...createMetricColumn({ + metric: selectedMetric.metric, + variant: selectedMetric.variant, + metricHash: selectedMetric.metric_hash, + variantHash: selectedMetric.variant_hash, + valueType: null + }, null) as ISmCol, hidden: selectedMetric.hidden + })); + }); export const selectRawExperimentsTableCols = createSelector(experimentsView, (state) => state.tableCols); export const selectExperimentsTableCols = createSelector(selectRawExperimentsTableCols, selectExperimentsHiddenTableCols, selectExperimentsTableColsWidth, (cols, hidden, colWidth) => @@ -82,7 +84,7 @@ export const selectExperimentsMetricsColsForProject = createSelector(experiments style: {...col.style, ...(colWidth[col.id] && {width: `${colWidth[col.id]}px`})} } as ISmCol)) ); -export const selectCustomColumns = createSelector(selectSelectedProjectId,selectExperimentsMetricsCols, selectExperimentsHiddenTableCols, selectExperimentsTableColsWidth, +export const selectCustomColumns = createSelector(selectSelectedProjectId, selectExperimentsMetricsCols, selectExperimentsHiddenTableCols, selectExperimentsTableColsWidth, (projectId, custom, hidden, colWidth) => custom .filter(metricCol => metricCol.projectId === projectId) .map(col => ({ @@ -109,13 +111,13 @@ export const selectInitTableOrders = createSelector(experimentsView, (state): So export const selectTableSortFields = createSelector( experimentsView, selectRouterParams, selectIsCompare, selectCompareAddTableSortFields, selectInitTableOrders, (state, params, isCompare, compareSortFields, initTableOrders): SortMeta[] => - (isCompare ? compareSortFields : (state.projectColumnsSortOrder?.[params?.projectId])) ?? initTableOrders + (isCompare ? compareSortFields : (state.projectColumnsSortOrder?.[params?.projectId])) ?? initTableOrders ); export const selectTableFilters = createSelector( experimentsView, selectRouterParams, selectIsCompare, selectCompareAddTableFilters, selectIsModels, selectModelExperimentsTableFilters, (state, params, isCompare, compareFilters, isModels, modelExperimentsFilters) => - isModels ? modelExperimentsFilters : isCompare ? compareFilters : state.projectColumnFilters?.[params?.projectId] ?? {} as { [columnId: string]: FilterMetadata }); -export const selectExperimentsTableFilters = createSelector(experimentsView, selectRouterParams, (state, params) => state.projectColumnFilters?.[params?.projectId] ?? {} as { [columnId: string]: FilterMetadata }); + isModels ? modelExperimentsFilters : isCompare ? compareFilters : state.projectColumnFilters?.[params?.projectId] ?? {} as Record); +export const selectExperimentsTableFilters = createSelector(experimentsView, selectRouterParams, (state, params) => state.projectColumnFilters?.[params?.projectId] ?? {} as Record); export const selectSelectedExperiments = createSelector(experimentsView, state => state.selectedExperiments); export const selectSelectedExperimentsDisableAvailable = createSelector(experimentsView, (state) => state.selectedExperimentsDisableAvailable); @@ -125,7 +127,8 @@ export const selectTableMode = createSelector(experimentsView, state => state.ta export const selectTableCompareUrlParts = createSelector( selectTableCompareView, selectSelectedExperiments, selectExperimentsList, selectRouterConfig, (view, selected, experiments, routeConfig) => ({ - view, selected: (selected.map(e=>e.id)) , experiments: experiments.map(e=>e.id), routeConfig })); + view, selected: (selected.map(e => e.id)), experiments: experiments.map(e => e.id), routeConfig + })); export const selectShowCompareScalarSettings = createSelector(experimentsView, state => state.showCompareScalarSettings); export const selectCloneForceParent = createSelector(experimentsView, state => state.cloneForceParent); export const selectExperimentInfoDataFreeze = createSelector(experimentInfo, (state): IExperimentInfo => state.infoDataFreeze); @@ -152,9 +155,10 @@ export const selectGraphsPerRow = createSelector(experimentOutput, state => stat export const selectHyperParamsVariants = createSelector(experimentsView, state => state.hyperParams); export const selectHyperParamsOptions = createSelector(experimentsView, (state): Record => state.hyperParamsOptions); export const selectPipelineSelectedStep = createSelector(experimentInfo, state => state.selectedPipelineStep); -export const selectExperimentOperationLog = createSelector(experimentInfo, state => state.operationLog); export const selectExperimentDownloadingOperationLog = createSelector(experimentInfo, state => state.downloadingExperimentOperationLog); -export const selectPipelineSelectedStepWithFallback = createSelector( selectSelectedExperiment, selectPipelineSelectedStep, (selectedController, selectedStep) => selectedStep ?? selectedController) +export const selectPipelineSelectedStepWithFallback = createSelector(selectSelectedExperiment, selectPipelineSelectedStep, + (selectedController, selectedStep) => ((selectedStep as any)?.data?.isStage ? selectedController : selectedStep) ?? selectedController); + export const selectStartPipelineDialogTask = createSelector(experimentInfo, state => state.pipelineRunDialogTask); export const selectExperimentUserKnowledge = createSelector(experimentInfo, @@ -167,27 +171,38 @@ export const selectTotalLogLines = createSelector(experimentOutput, (state) => s export const selectShowSettings = createSelector(experimentOutput, (state) => state.showSettings); export const selectMetricValuesView = createSelector(experimentOutput, (state) => state.metricValuesView); -export const selectSelectedExperimentSettings = createSelector(experimentOutput, selectSelectedExperiment, - (output, currentExperiment): ExperimentSettings => currentExperiment && output.settingsList?.find((setting) => setting.id === currentExperiment.id)); -export const selectSelectedSettingsHiddenPlot = createSelector(selectSelectedExperimentSettings, +export const selectSelectedExperimentSettings = (cardProjectId?: string) => createSelector(selectOutputSettings, selectSelectedExperiment, selectSelectedProjectId, + (settingsList, currentExperiment, projectId): Partial => { + if (currentExperiment) { + return settingsList?.find((setting) => setting.id === currentExperiment.id) ?? settingsList?.find((setting) => setting.id === (currentExperiment.project?.id ?? projectId)) ?? {}; + } else { + return settingsList?.find((setting) => setting.id === cardProjectId) || {}; + } + }); + +export const selectSelectedSettingsHiddenPlot = createSelector(selectSelectedExperimentSettings(), settings => settings?.hiddenMetricsPlot ?? []); -export const selectSelectedSettingsHiddenScalar = createSelector(selectSelectedExperimentSettings, +export const selectSelectedSettingsHiddenScalar = (cardProjectId?: string) =>createSelector(selectSelectedExperimentSettings(cardProjectId), settings => settings?.hiddenMetricsScalar ?? []); -export const selectSelectedSettingsTableMetric = createSelector(selectSelectedExperimentSettings, +export const selectSelectedSettingsTableMetric = createSelector(selectSelectedExperimentSettings(), settings => settings?.selectedMetricTable ?? null); export const selectSelectedSettingsModelTableMetric = createSelector(selectSelectedModelSettings, settings => settings?.selectedMetricTable ?? null); -export const selectSelectedSettingsSmoothWeight = createSelector(selectSelectedExperimentSettings, +export const selectSelectedSettingsSmoothWeight = createSelector(selectSelectedExperimentSettings(), settings => settings?.smoothWeight === undefined ? 0 : settings.smoothWeight); -export const selectSelectedSettingsSmoothType = createSelector(selectSelectedExperimentSettings, +export const selectSelectedSettingsSmoothSigma = createSelector(selectSelectedExperimentSettings(), + settings => settings?.smoothSigma === undefined ? 2 : settings.smoothSigma); +export const selectSelectedSettingsSmoothType = createSelector(selectSelectedExperimentSettings(), (settings): SmoothTypeEnum => settings?.smoothType ?? smoothTypeEnum.exponential); -export const selectSelectedSettingsxAxisType = (isModel: boolean) => createSelector(selectSelectedExperimentSettings, selectSelectedModelSettings, +export const selectSelectedSettingsxAxisType = (isModel: boolean) => createSelector(selectSelectedExperimentSettings(), selectSelectedModelSettings, (settings, modelSettings) => { - const theSettings = isModel ? modelSettings : settings; - return theSettings?.xAxisType ?? ScalarKeyEnum.Iter as ScalarKeyEnum; + const theSettings = isModel ? modelSettings : settings; + return theSettings?.xAxisType ?? ScalarKeyEnum.Iter as ScalarKeyEnum; }); +export const selectSelectedSettingsIsProjectLevel = createSelector(selectSelectedExperimentSettings(), + (settings): boolean => Object.keys(settings).length === 0 || settings?.projectLevel); -export const selectSelectedSettingsGroupBy = createSelector(selectSelectedExperimentSettings, +export const selectSelectedSettingsGroupBy = createSelector(selectSelectedExperimentSettings(), settings => settings?.groupBy ?? 'metric'); export const selectIsExperimentInProgress = createSelector(selectSelectedExperiment, experiment => experiment && (experiment.status === TaskStatusEnum.InProgress)); @@ -220,7 +235,8 @@ export const selectExperimentConfigObj = export const selectExperimentHyperParamsSelectedSectionParams = createSelector(selectExperimentHyperParamsInfoData, selectExperimentHyperParamsSelectedSectionFromRoute, (hyperparams: IExperimentInfo['hyperparams'], section: string): ParamsItem[] => Object.entries(get(hyperparams, section, {})).map(([, value]) => value)); -export const selectScalarSingleValue = createSelector(experimentOutput, (state): Array => state.scalarSingleValue); +export const selectScalarSingleValue = createSelector(experimentOutput, (state): EventsGetTaskSingleValueMetricsResponseValues[] => state.scalarSingleValue); +export const selectHasScalarSingleValue = createSelector(selectScalarSingleValue, (scalarSingleValue): boolean => scalarSingleValue?.length > 0); export const selectLastMetricsValues = createSelector(experimentOutput, (state): Task['last_metrics'] => state.lastMetrics); @@ -255,11 +271,14 @@ export const selectDownloadingArtifact = createSelector(experimentInfo, state => export const selectModelSettingsXAxisType = createSelector(selectSelectedModelSettings, settings => settings?.xAxisType ?? ScalarKeyEnum.Iter as ScalarKeyEnum); -export const selectModelInfoHistograms = createHistogramSelector(selectModelSettingsXAxisType); +// export const selectModelInfoHistograms = createHistogramSelector(selectModelSettingsXAxisType); +export const selectModelInfoHistograms = createHistogramSelector(selectSelectedSettingsxAxisType(true)); export const selectModelSettingsGroupBy = createSelector(selectSelectedModelSettings, settings => settings?.groupBy ?? 'metric'); export const selectModelSettingsSmoothWeight = createSelector(selectSelectedModelSettings, - settings => settings?.smoothWeight === undefined ? 0 : settings.smoothWeight); + settings => settings?.smoothWeight ?? 0); +export const selectModelSettingsSmoothSigma = createSelector(selectSelectedModelSettings, + settings => settings?.smoothSigma ?? 2); export const selectModelSettingsSmoothType = createSelector(selectSelectedModelSettings, settings => settings?.smoothType ?? smoothTypeEnum.exponential); export const selectModelSettingsHiddenScalar = createSelector(selectSelectedModelSettings, @@ -269,3 +288,6 @@ export const selectModelSettingsHiddenPlot = createSelector(selectSelectedModelS export const selectEditingDescription = createSelector(selectCurrentActiveSectionEdit, section => section === EXPERIMENT_COMMENT); export const selectSelectedExperimentReadOnly = createSelector(selectSelectedExperiment, experiment => isReadOnly(experiment)); + +export const selectSelectedModelSettingsIsProjectLevel = createSelector(selectSelectedModelSettings, + (settings): boolean => Object.keys(settings || {}).length === 0 || settings?.projectLevel); diff --git a/src/app/webapp-common/experiments/shared/components/abort-all-children-dialog/abort-all-children-dialog.component.ts b/src/app/webapp-common/experiments/shared/components/abort-all-children-dialog/abort-all-children-dialog.component.ts index d0c28cb0..1d247fe5 100644 --- a/src/app/webapp-common/experiments/shared/components/abort-all-children-dialog/abort-all-children-dialog.component.ts +++ b/src/app/webapp-common/experiments/shared/components/abort-all-children-dialog/abort-all-children-dialog.component.ts @@ -3,9 +3,10 @@ import {Component, inject} from '@angular/core'; import {ISelectedExperiment} from '~/features/experiments/shared/experiment-info.model'; @Component({ - selector: 'sm-abort-all-children-dialog', - templateUrl: './abort-all-children-dialog.component.html', - styleUrls: ['./abort-all-children-dialog.component.scss'] + selector: 'sm-abort-all-children-dialog', + templateUrl: './abort-all-children-dialog.component.html', + styleUrls: ['./abort-all-children-dialog.component.scss'], + standalone: false }) export class AbortAllChildrenDialogComponent { protected data = inject<{ diff --git a/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.html b/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.html index d91d5752..15631037 100644 --- a/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.html +++ b/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.html @@ -47,7 +47,7 @@ [displayWith]="displayFn" autoActiveFirstOption > - @if (!projectInput?.errors && projects !== null && projectInput.value && + @if (!projectInput?.errors && projects !== null && projectInput.value && projectInput.value?.value !== null && !((projectInput.value?.label ?? projectInput.value) | stringIncludedInArray: allProjectsNames()) ) { "{{ projectInput.value }}" diff --git a/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.ts b/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.ts index 819d1bf1..d21deb72 100644 --- a/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.ts +++ b/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.ts @@ -14,10 +14,11 @@ import {rootProjectsPageSize} from '@common/constants'; import {ProjectsGetAllResponseSingle} from '~/business-logic/model/projects/projectsGetAllResponseSingle'; @Component({ - selector: 'sm-change-project-dialog', - templateUrl: './change-project-dialog.component.html', - styleUrls: ['./change-project-dialog.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-change-project-dialog', + templateUrl: './change-project-dialog.component.html', + styleUrls: ['./change-project-dialog.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ChangeProjectDialogComponent implements OnInit, OnDestroy { private store = inject(Store); diff --git a/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.ts b/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.ts index 2c1c170c..4359a5cb 100644 --- a/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.ts +++ b/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.ts @@ -25,10 +25,11 @@ export interface CloneDialogData { } @Component({ - selector: 'sm-clone-dialog', - templateUrl: './clone-dialog.component.html', - styleUrls: ['./clone-dialog.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-clone-dialog', + templateUrl: './clone-dialog.component.html', + styleUrls: ['./clone-dialog.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class CloneDialogComponent implements OnInit, OnDestroy { public reference: string; diff --git a/src/app/webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.ts b/src/app/webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.ts index 3a037571..85bbb559 100644 --- a/src/app/webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.ts +++ b/src/app/webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.ts @@ -57,9 +57,10 @@ import {Task} from '~/business-logic/model/tasks/task'; @Component({ - selector: 'sm-experiment-menu', - templateUrl: './experiment-menu.component.html', - styleUrls: ['./experiment-menu.component.scss'] + selector: 'sm-experiment-menu', + templateUrl: './experiment-menu.component.html', + styleUrls: ['./experiment-menu.component.scss'], + standalone: false }) export class ExperimentMenuComponent extends BaseContextMenuComponent { protected blTaskService = inject(BlTasksService); diff --git a/src/app/webapp-common/experiments/shared/components/hyper-param-metric-column/hyper-param-metric-column.component.ts b/src/app/webapp-common/experiments/shared/components/hyper-param-metric-column/hyper-param-metric-column.component.ts index e31b52e8..40f384fd 100644 --- a/src/app/webapp-common/experiments/shared/components/hyper-param-metric-column/hyper-param-metric-column.component.ts +++ b/src/app/webapp-common/experiments/shared/components/hyper-param-metric-column/hyper-param-metric-column.component.ts @@ -6,16 +6,15 @@ import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/ @Component({ - selector: 'sm-hyper-param-metric-column', - templateUrl: './hyper-param-metric-column.component.html', - styleUrls: ['./hyper-param-metric-column.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - GetParamMetricValuePipe, - GetVariantWithoutRoundPipe, - TooltipDirective -], - standalone: true + selector: 'sm-hyper-param-metric-column', + templateUrl: './hyper-param-metric-column.component.html', + styleUrls: ['./hyper-param-metric-column.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + GetParamMetricValuePipe, + GetVariantWithoutRoundPipe, + TooltipDirective + ] }) export class HyperParamMetricColumnComponent { diff --git a/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.component.html b/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.component.html index 7e5f2072..2d11109e 100644 --- a/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.component.html +++ b/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.component.html @@ -5,9 +5,9 @@ (xClicked)="closeDialog(false)" > - @if (reference) { + @if (reference()) {

- {{ reference.length > 80 ? (reference | slice:0:77) + '...' : reference }} + {{ reference().length > 80 ? (reference() | slice:0:77) + '...' : reference() }} @if (data.retryMode) { {{ data.taskIds.length > 1 ? 'have' : 'has' }} previously failed - Make sure you’ve corrected the problem before rerunning.

Select queue for execution.
@@ -17,7 +17,7 @@

} - @if (enqueueWarning$ | ngrxPush) { + @if (enqueueWarning()) {

Note: Some tasks seems to not contain any executable code.
If enqueued to run, they might produce no results. @@ -42,22 +42,22 @@ [displayWith]="displayFn" #auto="matAutocomplete" > - @if ((userAllowedToCreateQueue$ | ngrxPush) && queueControl.value && - !(($any(queueControl.value)?.name ?? queueControl.value) | stringIncludedInArray: queuesNames) && - !(($any(queueControl.value)?.name ?? queueControl.value) | stringIncludedInArray: queuesDisplays) + @if ((userAllowedToCreateQueue()) && queueControl.value && + !(($any(queueControl.value)?.name ?? queueControl.value) | stringIncludedInArray: queuesNames()) && + !(($any(queueControl.value)?.name ?? queueControl.value) | stringIncludedInArray: queuesDisplays()) ) { "{{ displayFn(queueControl.value) }}"(Create New) } - @for (option of filteredOptions$ | ngrxPush; track option.id) { + @for (option of filteredOptions(); track option.id) { - @for (part of (text.value ? split(option.caption, text.value) : [[option.caption, text.value]]); track part; let last = $last) { + @for (part of (text.value ? split(option.caption, text.value) : [[option.caption, text.value]]); track part[0] + part[1]; let last = $last) { {{ part[0] }}@if (!last) { {{ part[1] }} @@ -67,8 +67,7 @@ } @if (queueControl.hasError('requiredAutocompleteSelection') || queueControl.hasError('required')) { - + Please provide a value } diff --git a/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.component.ts b/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.component.ts index 66b95af0..c6a8cbec 100644 --- a/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.component.ts +++ b/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.component.ts @@ -1,89 +1,104 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnDestroy, OnInit} from '@angular/core'; -import {MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; +import {ChangeDetectionStrategy, Component, computed, effect, inject, OnDestroy, OnInit, Signal, signal} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {Queue} from '@common/workers-and-queues/actions/queues.actions'; import {Store} from '@ngrx/store'; import {getQueuesForEnqueue, getTaskForEnqueue, setTaskForEnqueue} from './select-queue.actions'; import {selectQueuesList, selectTaskForEnqueue} from './select-queue.reducer'; import {ConfirmDialogComponent} from '@common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component'; import {BlTasksService} from '~/business-logic/services/tasks.service'; -import {filter, map, startWith} from 'rxjs/operators'; -import {combineLatest, Observable, Subscription} from 'rxjs'; +import {startWith} from 'rxjs/operators'; import {userAllowedToCreateQueue$} from '~/core/reducers/users.reducer'; -import {FormControl} from '@angular/forms'; -import { splitLine } from '@common/shared/utils/shared-utils'; +import {FormControl, ReactiveFormsModule} from '@angular/forms'; +import {splitLine} from '@common/shared/utils/shared-utils'; +import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dialog-template/dialog-template.component'; +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {MatError, MatFormField, MatLabel} from '@angular/material/form-field'; +import {RequiredAutocompleteSelectionValidatorDirective} from '@common/shared/ui-components/template-forms-ui/required-autocomplete-selection-validator.directive'; +import {MatInput} from '@angular/material/input'; +import {MatAutocomplete, MatAutocompleteTrigger, MatOption} from '@angular/material/autocomplete'; +import {StringIncludedInArrayPipe} from '@common/shared/pipes/string-included-in-array.pipe'; +import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; +import {MatButton} from '@angular/material/button'; +import {SlicePipe} from '@angular/common'; +import {toSignal} from '@angular/core/rxjs-interop'; @Component({ - selector: 'sm-select-queue', - templateUrl: './select-queue.component.html', - styleUrls: ['./select-queue.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-select-queue', + templateUrl: './select-queue.component.html', + styleUrls: ['./select-queue.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + DialogTemplateComponent, + TooltipDirective, + MatFormField, + RequiredAutocompleteSelectionValidatorDirective, + MatInput, + ReactiveFormsModule, + MatAutocompleteTrigger, + MatAutocomplete, + StringIncludedInArrayPipe, + MatOption, + ShowTooltipIfEllipsisDirective, + MatButton, + SlicePipe, + MatError, + MatLabel + ] }) export class SelectQueueComponent implements OnInit, OnDestroy { - public queues: Queue[]; - public queues$ = this.store.select(selectQueuesList); - public enqueueWarning$ = this.store.select(selectTaskForEnqueue) - .pipe(filter(tasks => - tasks?.some(task => !(task && task.script && (task.script.diff || (task.script.repository && task.script.entry_point)))) - )); - public userAllowedToCreateQueue$: Observable; - public reference: string; - private queuesSub: Subscription; - public queuesNames: string[]; - protected queuesDisplays: string[]; + public dialogRef = inject>(MatDialogRef); + private store = inject(Store); + private blTaskService = inject(BlTasksService); + protected data = inject<{ + taskIds?: string[]; + reference?: string; + retryMode?: boolean; + }>(MAT_DIALOG_DATA); + + public queues = this.store.selectSignal(selectQueuesList); + public tasksForEnqueue = this.store.selectSignal(selectTaskForEnqueue); + public enqueueWarning = computed(() => + this.tasksForEnqueue()?.some(task => !(task && task.script && (task.script.diff || (task.script.repository && task.script.entry_point))))) + public reference = signal(''); public queueControl = new FormControl(''); split = splitLine; displayFn = (item: any): string => typeof item === 'string' ? item : item?.caption ?? item?.name; - public filteredOptions$: Observable; - defaultQueue: Queue; + public filteredOptions: Signal; + protected userAllowedToCreateQueue: Signal; + private valueChange = toSignal(this.queueControl.valueChanges.pipe(startWith(''))); - constructor( - public dialogRef: MatDialogRef, - private store: Store, - private blTaskService: BlTasksService, - private cdr: ChangeDetectorRef, - @Inject(MAT_DIALOG_DATA) public data: { - taskIds?: string[]; - reference?: string; - retryMode?: boolean; - } - ) { + protected queuesNames = computed(() => this.queues().map(q => q.name)); + protected queuesDisplays = computed(() => this.queues().map(q => q.display_name).filter(name => !!name)); + protected defaultQueue = computed(() => this.blTaskService.getDefaultQueue(this.queues()) || this.queues()[0]); + + + constructor() { this.store.dispatch(getQueuesForEnqueue()); - this.userAllowedToCreateQueue$ = userAllowedToCreateQueue$(store); + this.userAllowedToCreateQueue = toSignal(userAllowedToCreateQueue$(this.store)); - if (data && data.taskIds?.length > 0) { - this.store.dispatch(getTaskForEnqueue({taskIds: data.taskIds})); - this.reference = data.taskIds.length < 2 ? data.reference : `${data.taskIds.length} experiments `; + if (this.data?.taskIds?.length > 0) { + this.store.dispatch(getTaskForEnqueue({taskIds: this.data.taskIds})); + this.reference.set(this.data.taskIds.length < 2 ? this.data.reference : `${this.data.taskIds.length} tasks `); } + + effect(() => { + if (this.queues()) { + this.queueControl.reset(this.defaultQueue(), {emitEvent: false}); + } + }); } ngOnInit() { - this.filteredOptions$ = combineLatest([ - this.queueControl.valueChanges.pipe(startWith('')), - this.queues$ - ]) - .pipe( - map(([value, queues]) => { - if (!queues) { - return []; - } - const name = (typeof value === 'string' ? value : value?.name)?.toLowerCase(); - if (this.queueControl.pristine || !name) { - return queues; - } - return queues.filter(q => q.name.toLowerCase().includes(name) || q.display_name?.toLowerCase().includes(name)); - }), - ); - - this.queuesSub = this.queues$.subscribe(queues => { - if (queues) { - this.queues = queues; - this.queuesNames = queues.map(q => q.name); - this.queuesDisplays = queues.map(q => q.display_name).filter(name => !!name); - this.defaultQueue = this.blTaskService.getDefaultQueue(this.queues) || queues[0]; - this.queueControl.reset(this.defaultQueue, {emitEvent: false}); - this.cdr.detectChanges(); + this.filteredOptions = computed(() => { + if (!this.queues()) { + return []; } - }); + const name = (typeof this.valueChange() === 'string' ? this.valueChange() as string: (this.valueChange() as Queue)?.name)?.toLowerCase(); + if (this.queueControl.pristine || !name) { + return this.queues(); + } + return this.queues().filter(q => q.name.toLowerCase().includes(name) || q.display_name?.toLowerCase().includes(name)); + }) } closeDialog(confirmed) { @@ -91,7 +106,6 @@ export class SelectQueueComponent implements OnInit, OnDestroy { } ngOnDestroy(): void { - this.queuesSub.unsubscribe(); this.store.dispatch(setTaskForEnqueue({tasks: null})); } diff --git a/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.module.ts b/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.module.ts index 525cadb5..1c0e99ab 100644 --- a/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.module.ts +++ b/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.module.ts @@ -38,9 +38,10 @@ import {MatButton} from '@angular/material/button'; ShowTooltipIfEllipsisDirective, PushPipe, MatButton, + SelectQueueComponent ], providers : [], - declarations : [SelectQueueComponent], + declarations : [], exports : [SelectQueueComponent] }) export class SelectQueueModule { diff --git a/src/app/webapp-common/experiments/shared/experiment-output-log/experiment-output-log.module.ts b/src/app/webapp-common/experiments/shared/experiment-output-log/experiment-output-log.module.ts index c25df93b..56bbdda1 100644 --- a/src/app/webapp-common/experiments/shared/experiment-output-log/experiment-output-log.module.ts +++ b/src/app/webapp-common/experiments/shared/experiment-output-log/experiment-output-log.module.ts @@ -1,8 +1,6 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import {ExperimentOutputLogComponent} from '../../containers/experiment-output-log/experiment-output-log.component'; -import {ExperimentLogInfoComponent} from '../../dumb/experiment-log-info/experiment-log-info.component'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {ScrollingModule} from '@angular/cdk/scrolling'; import {ExperimentSharedModule} from '~/features/experiments/shared/experiment-shared.module'; import {SaferPipe} from '@common/shared/pipes/safe.pipe'; @@ -11,12 +9,13 @@ import {MatButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; import {MatFormField} from '@angular/material/form-field'; import {MatInput} from '@angular/material/input'; - +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; @NgModule({ - declarations: [ExperimentOutputLogComponent, ExperimentLogInfoComponent], - exports: [ExperimentOutputLogComponent], + declarations: [], + exports: [], imports: [ CommonModule, MatProgressSpinnerModule, @@ -27,7 +26,9 @@ import {MatInput} from '@angular/material/input'; MatButton, MatIcon, MatFormField, - MatInput + MatInput, + TooltipDirective, + ShowTooltipIfEllipsisDirective ] }) export class ExperimentOutputLogModule { } diff --git a/src/app/webapp-common/layout/appearance/appearance.component.ts b/src/app/webapp-common/layout/appearance/appearance.component.ts index a6459212..2270d431 100644 --- a/src/app/webapp-common/layout/appearance/appearance.component.ts +++ b/src/app/webapp-common/layout/appearance/appearance.component.ts @@ -14,17 +14,16 @@ interface Themes { } @Component({ - selector: 'sm-appearance', - templateUrl: './appearance.component.html', - styleUrls: ['./appearance.component.scss'], - standalone: true, - imports: [ - DialogTemplateComponent, - NgOptimizedImage, - MatSelectionList, - MatListOption, - FormsModule, - ], + selector: 'sm-appearance', + templateUrl: './appearance.component.html', + styleUrls: ['./appearance.component.scss'], + imports: [ + DialogTemplateComponent, + NgOptimizedImage, + MatSelectionList, + MatListOption, + FormsModule, + ] }) export class AppearanceComponent { themes: Themes[] = [ diff --git a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.html b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.html index 7d71b5b7..972ddb66 100644 --- a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.html +++ b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.html @@ -15,15 +15,24 @@ @if (breadcrumb.url && !(lastCrumb && lastGroup)) { + [routerLink]="breadcrumb.url" + [queryParamsHandling]="breadcrumb.queryParamsHandling" + > {{breadcrumb.name}} @if (breadcrumb.badge) { {{breadcrumb.badge}} } } @else {

-
{{breadcrumb.name}}{{breadcrumb.example ? ' (example)' : ''}}
+ @if (lastGroup && lastCrumb && breadcrumb.linkLast){ + {{breadcrumb.name}}{{breadcrumb.example ? ' (example)' : ''}} + } @else { +
{{breadcrumb.name}}{{breadcrumb.example ? ' (example)' : ''}}
+ } + @if (breadcrumb.id) { } diff --git a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.ts b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.ts index 419c8392..94ee6081 100644 --- a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.ts +++ b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.ts @@ -12,7 +12,7 @@ import { } from '@angular/core'; import {Store} from '@ngrx/store'; import {debounceTime} from 'rxjs/operators'; -import {ActivatedRoute, RouterLink} from '@angular/router'; +import {ActivatedRoute, RouterLink, UrlTree} from '@angular/router'; import {fromEvent} from 'rxjs'; import {addMessage} from '../../core/actions/layout.actions'; import {ConfigurationService} from '../../shared/services/configuration.service'; @@ -47,7 +47,9 @@ export enum CrumbTypeEnum { export interface IBreadcrumbsLink { name?: string; - url?: string; + url?: string | UrlTree; + queryParamsHandling?: 'merge' | 'preserve' | ''; + linkLast?: boolean; subCrumbs?: { name?: string; url: string; hidden?: boolean }[]; isProject?: boolean; type?: CrumbTypeEnum; @@ -76,23 +78,22 @@ export interface IBreadcrumbsOptions { } @Component({ - selector: 'sm-breadcrumbs', - templateUrl: './breadcrumbs.component.html', - styleUrls: ['./breadcrumbs.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - MatMenuModule, - TooltipDirective, - ShowTooltipIfEllipsisDirective, - ClipboardModule, - RouterLink, - ClickStopPropagationDirective, - TagListComponent, - IdBadgeComponent, - MatIcon, - MatIconButton - ], - standalone: true + selector: 'sm-breadcrumbs', + templateUrl: './breadcrumbs.component.html', + styleUrls: ['./breadcrumbs.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatMenuModule, + TooltipDirective, + ShowTooltipIfEllipsisDirective, + ClipboardModule, + RouterLink, + ClickStopPropagationDirective, + TagListComponent, + IdBadgeComponent, + MatIcon, + MatIconButton + ] }) export class BreadcrumbsComponent { private store = inject(Store); diff --git a/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs.component.html b/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs.component.html index 2f233cad..d1f42c7d 100644 --- a/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs.component.html +++ b/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs.component.html @@ -6,17 +6,13 @@ [selectedIndex]="index()" (selectedTabChange)="setFeature($event)"> @for (route of contextNavbar(); track route.header) { - + -
+
{{ route.header | uppercase }} @if (route.badge) { - - {{ route.badge }} - + }
@if (archivedMode()) { diff --git a/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs.component.scss b/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs.component.scss index ad58f76f..caae6897 100644 --- a/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs.component.scss +++ b/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs.component.scss @@ -1,13 +1,13 @@ -@import "variables"; +@use "variables"; :host { - --mdc-secondary-navigation-tab-container-height: #{$nav-bar-height}; + --mdc-secondary-navigation-tab-container-height: #{variables.$nav-bar-height}; --mat-tab-header-inactive-label-text-color: color-mix(in srgb, var(--color-on-surface-variant), transparent 40%); .trial-badge { margin-left: 10px; background-color: var(--color-primary); - color: white; + color: var(--color-on-primary); padding: 2px 6px; border-radius: 3px; font-size: 11px; diff --git a/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs.component.ts b/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs.component.ts index 1c764641..b977cc6a 100644 --- a/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs.component.ts +++ b/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs.component.ts @@ -8,21 +8,22 @@ import {CheckPermissionDirective} from '~/shared/directives/check-permission.dir import {Router} from '@angular/router'; import {UpperCasePipe} from '@angular/common'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {SafeHtmlPipe} from 'primeng/menu'; @Component({ - selector: 'sm-header-navbar-tabs', - templateUrl: './header-navbar-tabs.component.html', - styleUrls: ['./header-navbar-tabs.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, + selector: 'sm-header-navbar-tabs', + templateUrl: './header-navbar-tabs.component.html', + styleUrls: ['./header-navbar-tabs.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, imports: [ MatTabGroup, MatTab, CheckPermissionDirective, MatTabLabel, UpperCasePipe, - TooltipDirective + TooltipDirective, + SafeHtmlPipe ] }) export class HeaderNavbarTabsComponent { diff --git a/src/app/webapp-common/layout/header/header.component.html b/src/app/webapp-common/layout/header/header.component.html index 71e1e2e6..c0670081 100644 --- a/src/app/webapp-common/layout/header/header.component.html +++ b/src/app/webapp-common/layout/header/header.component.html @@ -12,29 +12,17 @@ }
- @if (showLogo() && !isLogin()) { -
- @if (!environment().whiteLabelLogo) { - logo +
+ logo - } @else { -
{{ environment().whiteLabelSlogan }}
- @if (isLogin()) { -
- logo -
- } - } +
} - @if (!showLogo() && !isLogin()) { - + @if (!isLogin() && !hideSideNav()) { + } @if (isLogin()) { @@ -43,7 +31,13 @@ @if (!hideMenus()) {
- + @if (!isShareMode()){ + } + @if (showAutoRefresh()) { + + } @@ -79,15 +73,17 @@ Logout - + - + @if (environment().platformYoutubeChannel) { + Youtube ClearML on Youtube + } Docs Online Documentation @@ -104,17 +100,8 @@ Version Notifications } - - @if (environment()?.appsYouTubeIntroVideoId && $any(environment()).appAwarenessMenu !== false) { - - } - - - lala + + Contact Us diff --git a/src/app/webapp-common/layout/header/header.component.scss b/src/app/webapp-common/layout/header/header.component.scss index 6f5d7be9..bb826638 100644 --- a/src/app/webapp-common/layout/header/header.component.scss +++ b/src/app/webapp-common/layout/header/header.component.scss @@ -1,10 +1,9 @@ -@import "../../layout/layout"; -@import "variables"; +@use "../../layout/layout"; :host { display: block; position: relative; - height: $top-bar-height; + height: layout.$top-bar-height; border-bottom: 1px solid var(--color-surface-container-high); .share-view { @@ -51,6 +50,15 @@ margin-right: 14px; } + .refresh-button { + margin-right: 10px; + ::ng-deep { + .tooltip-container, .tip { + background-color: var(--color-surface-container-lowest); + } + } + } + .menu-trigger { width: 36px; height: 36px; diff --git a/src/app/webapp-common/layout/header/header.component.ts b/src/app/webapp-common/layout/header/header.component.ts index 6cc47299..e52c72c3 100644 --- a/src/app/webapp-common/layout/header/header.component.ts +++ b/src/app/webapp-common/layout/header/header.component.ts @@ -1,11 +1,14 @@ -import {ChangeDetectionStrategy, Component, computed, inject, input, signal} from '@angular/core'; +import {ChangeDetectionStrategy, Component, inject, input, signal} from '@angular/core'; +import {ChangesService} from '@common/shared/services/changes.service'; import {Store} from '@ngrx/store'; import {selectActiveWorkspace, selectCurrentUser, selectIsAdmin} from '../../core/reducers/users-reducer'; import {logout} from '../../core/actions/users.actions'; -import {addMessage, openAppsAwarenessDialog} from '../../core/actions/layout.actions'; +import {addMessage, setAutoRefresh} from '../../core/actions/layout.actions'; import {MatDialog} from '@angular/material/dialog'; import {ConfigurationService} from '../../shared/services/configuration.service'; -import {GetCurrentUserResponseUserObjectCompany} from '~/business-logic/model/users/getCurrentUserResponseUserObjectCompany'; +import { + GetCurrentUserResponseUserObjectCompany +} from '~/business-logic/model/users/getCurrentUserResponseUserObjectCompany'; import {distinctUntilKeyChanged, filter} from 'rxjs/operators'; import {selectRouterUrl} from '../../core/reducers/router-reducer'; import {TipsService} from '../../shared/services/tips.service'; @@ -16,15 +19,18 @@ import {selectUserSettingsNotificationPath} from '~/core/reducers/view.reducer'; import {selectInvitesPending} from '~/core/reducers/users.reducer'; import {MESSAGES_SEVERITY} from '@common/constants'; import {takeUntilDestroyed, toSignal} from '@angular/core/rxjs-interop'; -import {ChangesService} from '@common/shared/services/changes.service'; import {selectDarkTheme, selectForcedTheme} from '@common/core/reducers/view.reducer'; -import { AppearanceComponent } from '../appearance/appearance.component'; +import {AppearanceComponent} from '../appearance/appearance.component'; +import { + GlobalSearchDialogComponent +} from '@common/dashboard-search/global-search-dialog/global-search-dialog.component'; @Component({ selector: 'sm-header', templateUrl: './header.component.html', styleUrls: ['./header.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class HeaderComponent { private store = inject(Store); @@ -40,7 +46,7 @@ export class HeaderComponent { isLogin = input(); hideMenus = input(); - protected environment = toSignal(this.configService.getEnvironment()); + protected environment = this.configService.configuration; protected url = this.store.selectSignal(selectRouterUrl); protected user = this.store.selectSignal(selectCurrentUser); protected isAdmin = this.store.selectSignal(selectIsAdmin); @@ -50,30 +56,50 @@ export class HeaderComponent { protected forcedTheme = this.store.selectSignal(selectForcedTheme); protected userFocus = signal(false); protected hideSideNav = signal(false); - protected dashboard = signal(false); - protected showLogo = computed(() => this.hideSideNav() || this.dashboard()); + protected showAutoRefresh = signal(false); + protected searchActive = signal(false); public activeWorkspace = toSignal(this.store.select(selectActiveWorkspace) .pipe( filter(workspace => !!workspace), distinctUntilKeyChanged('id') ) ); + private globalSearchIsOpen: boolean; - constructor( - ) { + constructor() { this.getRouteData(); + this.router.events - .pipe( - takeUntilDestroyed(), - filter((event) => event instanceof NavigationEnd) - ) - .subscribe(() => this.getRouteData()); + .pipe( + takeUntilDestroyed(), + filter((event) => event instanceof NavigationEnd) + ) + .subscribe(() => this.getRouteData()); + + this.router.events + .pipe( + filter(()=> !this.globalSearchIsOpen), + filter((event) => event instanceof NavigationEnd), + filter(() => this.activeRoute.snapshot.queryParams.gq) + ) + .subscribe(() => { + this.openGlobalSearch(); + }); } getRouteData() { this.userFocus.set(!!this.activeRoute?.firstChild?.snapshot.data?.userFocus); this.hideSideNav.set(this.activeRoute?.firstChild?.snapshot.data.hideSideNav); - this.dashboard.set(this.activeRoute?.firstChild?.snapshot.url?.[0]?.path === 'dashboard'); + let active = false; + let last = this.activeRoute; + while (last.firstChild) { + if (last.snapshot.data.search !== undefined) { + active = last.snapshot.data.search; + } + last = last.firstChild + } + this.showAutoRefresh.set(last.snapshot.data.showAutoRefresh); + this.searchActive.set(active || last.snapshot.data.search); } logout() { @@ -90,13 +116,23 @@ export class HeaderComponent { this.dialog.open(WelcomeMessageComponent, {data: {step: 2}}); } - openAppsAwareness($event: MouseEvent) { - $event.preventDefault(); - this.store.dispatch(openAppsAwarenessDialog()); - } - openAppearance(event: MouseEvent) { event.preventDefault(); - this.dialog.open(AppearanceComponent) + this.dialog.open(AppearanceComponent); + } + + toggleAutoRefresh(autoRefresh: boolean) { + this.store.dispatch(setAutoRefresh({autoRefresh})); + } + + openGlobalSearch() { + this.globalSearchIsOpen = true; + this.dialog.open(GlobalSearchDialogComponent, { + width: '90vw', + height: '90vh', + enterAnimationDuration: 0 + }).afterClosed().subscribe(() => { + this.globalSearchIsOpen = false; + }); } } diff --git a/src/app/webapp-common/layout/layout.module.ts b/src/app/webapp-common/layout/layout.module.ts index 09bbc437..bae94b29 100644 --- a/src/app/webapp-common/layout/layout.module.ts +++ b/src/app/webapp-common/layout/layout.module.ts @@ -2,12 +2,12 @@ import {NgModule} from '@angular/core'; import {CommonModule, NgOptimizedImage} from '@angular/common'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; +import {RefreshButtonComponent} from '@common/shared/components/refresh-button/refresh-button.component'; import {LoggedOutAlertComponent} from './logged-out-alert/logged-out-alert.component'; import {ServerNotificationDialogContainerComponent} from './server-notification-dialog-container/server-notification-dialog-container.component'; import {CommonSearchModule} from '../common-search/common-search.module'; import {HeaderComponent} from './header/header.component'; import { UiUpdateDialogComponent } from './ui-update-dialog/ui-update-dialog.component'; -import {HeaderUserMenuActionsComponent} from '~/layout/header/header-user-menu-actions/header-user-menu-actions.component'; import {YouTubePlayerModule} from '@angular/youtube-player'; import {BreadcrumbsComponent} from '@common/layout/breadcrumbs/breadcrumbs.component'; import {HeaderNavbarTabsComponent} from '@common/layout/header-navbar-tabs/header-navbar-tabs.component'; @@ -26,6 +26,7 @@ import {MatButton, MatIconButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; import {CommonSearchComponent} from '@common/common-search/containers/common-search/common-search.component'; import {MatDialogActions, MatDialogClose} from '@angular/material/dialog'; +import {HeaderUserMenuActionsComponent} from '~/layout/header/header-user-menu-actions/header-user-menu-actions.component'; @NgModule({ @@ -56,12 +57,14 @@ import {MatDialogActions, MatDialogClose} from '@angular/material/dialog'; HeaderNavbarTabsComponent, MatDialogActions, MatDialogClose, - MatButton + MatButton, + RefreshButtonComponent, + HeaderUserMenuActionsComponent ], declarations: [ HeaderComponent, LoggedOutAlertComponent, ServerNotificationDialogContainerComponent, - UiUpdateDialogComponent, HeaderUserMenuActionsComponent + UiUpdateDialogComponent, ], exports: [HeaderComponent, LoggedOutAlertComponent, ServerNotificationDialogContainerComponent, UiUpdateDialogComponent] }) diff --git a/src/app/webapp-common/layout/layout.scss b/src/app/webapp-common/layout/layout.scss index 32434f1a..7d8ac23c 100644 --- a/src/app/webapp-common/layout/layout.scss +++ b/src/app/webapp-common/layout/layout.scss @@ -1,6 +1,6 @@ -@import "variables"; +@use "variables"; -$top-bar-height: $nav-bar-height; +$top-bar-height: variables.$nav-bar-height; // Projects diff --git a/src/app/webapp-common/layout/logged-out-alert/logged-out-alert.component.ts b/src/app/webapp-common/layout/logged-out-alert/logged-out-alert.component.ts index 4987a59f..9bd98ffd 100644 --- a/src/app/webapp-common/layout/logged-out-alert/logged-out-alert.component.ts +++ b/src/app/webapp-common/layout/logged-out-alert/logged-out-alert.component.ts @@ -6,9 +6,10 @@ import {take} from 'rxjs/operators'; import {logout} from '@common/core/actions/users.actions'; @Component({ - selector : 'sm-logged-out-alert', - templateUrl: './logged-out-alert.component.html', - styleUrls : ['./logged-out-alert.component.scss'] + selector: 'sm-logged-out-alert', + templateUrl: './logged-out-alert.component.html', + styleUrls: ['./logged-out-alert.component.scss'], + standalone: false }) export class LoggedOutAlertComponent { diff --git a/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.scss b/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.scss index 5764250b..c114b9df 100644 --- a/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.scss +++ b/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.scss @@ -1,5 +1,3 @@ -@import 'variables'; - :host { small.text-danger { position: absolute !important; diff --git a/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.ts b/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.ts index ff0440e3..3d928a7a 100644 --- a/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.ts +++ b/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.ts @@ -17,18 +17,17 @@ import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/ import {MatButton} from '@angular/material/button'; @Component({ - selector: 'sm-s3-access-dialog', - templateUrl: './s3-access-dialog.component.html', - styleUrls: ['./s3-access-dialog.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - FormsModule, - MatInputModule, - TooltipDirective, - SaferPipe, - MatButton - ] + selector: 'sm-s3-access-dialog', + templateUrl: './s3-access-dialog.component.html', + styleUrls: ['./s3-access-dialog.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + FormsModule, + MatInputModule, + TooltipDirective, + SaferPipe, + MatButton + ] }) export class S3AccessDialogComponent implements OnChanges { public formIsSubmitted: boolean; diff --git a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.scss b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.scss index 096813af..d4234fb2 100644 --- a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.scss +++ b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.scss @@ -1,8 +1,7 @@ -@import "variables"; -@import "mixins/link"; +@use "mixins/link"; :host { - @include link(); + @include link.link(); } .gcs-note { diff --git a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.ts b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.ts index 18dd160f..207dda76 100644 --- a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.ts +++ b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.ts @@ -21,16 +21,15 @@ export interface S3AccessDialogResult extends Credentials { } @Component({ - selector: 'sm-s3-access-resolver', - templateUrl: './s3-access-resolver.component.html', - styleUrls: ['./s3-access-resolver.component.scss'], - standalone: true, - imports: [ - DialogTemplateComponent, - MatCheckboxModule, - FormsModule, - S3AccessDialogComponent - ] + selector: 'sm-s3-access-resolver', + templateUrl: './s3-access-resolver.component.html', + styleUrls: ['./s3-access-resolver.component.scss'], + imports: [ + DialogTemplateComponent, + MatCheckboxModule, + FormsModule, + S3AccessDialogComponent + ] }) export class S3AccessResolverComponent { show: Observable; diff --git a/src/app/webapp-common/layout/server-notification-dialog-container/server-notification-dialog-container.component.ts b/src/app/webapp-common/layout/server-notification-dialog-container/server-notification-dialog-container.component.ts index 4adef312..b5ca639a 100644 --- a/src/app/webapp-common/layout/server-notification-dialog-container/server-notification-dialog-container.component.ts +++ b/src/app/webapp-common/layout/server-notification-dialog-container/server-notification-dialog-container.component.ts @@ -8,10 +8,11 @@ import {Subscription} from 'rxjs'; import {ConfirmDialogComponent} from '../../shared/ui-components/overlay/confirm-dialog/confirm-dialog.component'; @Component({ - selector : 'sm-server-notification-dialog-container', - templateUrl: './server-notification-dialog-container.component.html', - styleUrls : ['./server-notification-dialog-container.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-server-notification-dialog-container', + templateUrl: './server-notification-dialog-container.component.html', + styleUrls: ['./server-notification-dialog-container.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ServerNotificationDialogContainerComponent implements OnInit, OnDestroy { private notificationSubscription: Subscription; diff --git a/src/app/webapp-common/layout/side-navbar/side-navbar.scss b/src/app/webapp-common/layout/side-navbar/side-navbar.scss index 4238c27b..9bc08b10 100644 --- a/src/app/webapp-common/layout/side-navbar/side-navbar.scss +++ b/src/app/webapp-common/layout/side-navbar/side-navbar.scss @@ -1,4 +1,4 @@ -@import "variables"; +@use "variables"; $link-item-size-height: 36px; $link-item-size-width: 40px; @@ -9,7 +9,7 @@ $item-margin: 20px; display: flex; flex-direction: column; height: 100%; - width: $side-bar-close-width; + width: variables.$side-bar-close-width; background-color: color-mix(in srgb, var(--color-surface), transparent 5%); border-right: 1px solid var(--color-surface-container-high); .logo { diff --git a/src/app/webapp-common/layout/tip-of-the-day-modal/tip-of-the-day-modal.component.scss b/src/app/webapp-common/layout/tip-of-the-day-modal/tip-of-the-day-modal.component.scss index 6a3c268f..2122cc99 100644 --- a/src/app/webapp-common/layout/tip-of-the-day-modal/tip-of-the-day-modal.component.scss +++ b/src/app/webapp-common/layout/tip-of-the-day-modal/tip-of-the-day-modal.component.scss @@ -11,7 +11,8 @@ flex: 0 0 372px; height: 233px; background-repeat: no-repeat; - box-shadow: 0 0 0 1px var(--color-on-surface), 0 0 0 2px var(--color-surface-container-highest); + border: 1px solid var(--color-outline-variant); + border-radius: 4px; background-size: contain; &.full-width { diff --git a/src/app/webapp-common/layout/tip-of-the-day-modal/tip-of-the-day-modal.component.ts b/src/app/webapp-common/layout/tip-of-the-day-modal/tip-of-the-day-modal.component.ts index bed0867c..aa293023 100644 --- a/src/app/webapp-common/layout/tip-of-the-day-modal/tip-of-the-day-modal.component.ts +++ b/src/app/webapp-common/layout/tip-of-the-day-modal/tip-of-the-day-modal.component.ts @@ -20,19 +20,18 @@ export interface TipsModalData { @Component({ - selector: 'sm-tip-of-the-day-modal', - templateUrl: './tip-of-the-day-modal.component.html', - styleUrls: ['./tip-of-the-day-modal.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - DialogTemplateComponent, - ClickStopPropagationDirective, - SaferPipe, - TooltipDirective, - MatCheckbox, - FormsModule - ], - standalone: true + selector: 'sm-tip-of-the-day-modal', + templateUrl: './tip-of-the-day-modal.component.html', + styleUrls: ['./tip-of-the-day-modal.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + DialogTemplateComponent, + ClickStopPropagationDirective, + SaferPipe, + TooltipDirective, + MatCheckbox, + FormsModule + ] }) export class TipOfTheDayModalComponent { public matDialogRef = inject>(MatDialogRef); diff --git a/src/app/webapp-common/layout/ui-update-dialog/ui-update-dialog.component.ts b/src/app/webapp-common/layout/ui-update-dialog/ui-update-dialog.component.ts index 3fa186dd..5cd127ee 100644 --- a/src/app/webapp-common/layout/ui-update-dialog/ui-update-dialog.component.ts +++ b/src/app/webapp-common/layout/ui-update-dialog/ui-update-dialog.component.ts @@ -1,9 +1,10 @@ import {Component} from '@angular/core'; @Component({ - selector: 'sm-ui-update-dialog', - templateUrl: './ui-update-dialog.component.html', - styleUrls: ['./ui-update-dialog.component.scss'] + selector: 'sm-ui-update-dialog', + templateUrl: './ui-update-dialog.component.html', + styleUrls: ['./ui-update-dialog.component.scss'], + standalone: false }) export class UiUpdateDialogComponent { diff --git a/src/app/webapp-common/layout/version-changes-modal/version-changes-modal.component.ts b/src/app/webapp-common/layout/version-changes-modal/version-changes-modal.component.ts index 9caed1a3..1a8349b3 100644 --- a/src/app/webapp-common/layout/version-changes-modal/version-changes-modal.component.ts +++ b/src/app/webapp-common/layout/version-changes-modal/version-changes-modal.component.ts @@ -6,8 +6,6 @@ import {MESSAGES_SEVERITY} from '@common/constants'; import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dialog-template/dialog-template.component'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; import {SaferPipe} from '@common/shared/pipes/safe.pipe'; -import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; -import {MatCheckbox} from '@angular/material/checkbox'; import {FormsModule} from '@angular/forms'; import {Change} from '@common/shared/services/changes.service'; import {MatButton} from '@angular/material/button'; @@ -20,22 +18,19 @@ export interface ChangesModalData { @Component({ - selector: 'sm-version-changes-modal', - templateUrl: './version-changes-modal.component.html', - styleUrls: ['./version-changes-modal.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - DialogTemplateComponent, - ClickStopPropagationDirective, - SaferPipe, - TooltipDirective, - MatCheckbox, - FormsModule, - MatDialogActions, - MatButton, - MatDialogClose - ], - standalone: true + selector: 'sm-version-changes-modal', + templateUrl: './version-changes-modal.component.html', + styleUrls: ['./version-changes-modal.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + DialogTemplateComponent, + ClickStopPropagationDirective, + SaferPipe, + FormsModule, + MatDialogActions, + MatButton, + MatDialogClose + ] }) export class VersionChangesModalComponent { protected matDialogRef = inject(MatDialogRef); diff --git a/src/app/webapp-common/layout/welcome-message/welcome-message.component.html b/src/app/webapp-common/layout/welcome-message/welcome-message.component.html index 6f2955bd..b87a9226 100644 --- a/src/app/webapp-common/layout/welcome-message/welcome-message.component.html +++ b/src/app/webapp-common/layout/welcome-message/welcome-message.component.html @@ -56,7 +56,7 @@
@if (queue) {
- {{entityName}} have been enqueued on the {{queue?.display_name ?? queue?.name}} queue, which is currently not serviced by any worker. They will remain in the 'pending' state until a ClearML worker services this queue. + {{entityName}} have been enqueued on the {{queue?.display_name || queue?.name}} queue, which is currently not serviced by any worker. They will remain in the 'pending' state until a ClearML worker services this queue.
} @if (!currentLink || currentLink === links[0]) { @@ -82,8 +82,8 @@ @if (step.subNote || (isJupyter() && ((queue && $index === 2) || (!queue && $index === 1)))) {
@if ((isJupyter() && ((queue && $index === 2) || (!queue && $index === 1)))) { - @if (accessKey) { - Manage your app credentials in the workspace settings page + @if (accessKey()) { + Manage your API credentials in the workspace settings page } @else { Fill in your API credentials (if you don’t have any, create new credentials) } @@ -97,50 +97,48 @@ }
} -
+
@if (!isJupyter()) {
Complete the clearml configuration information as prompted.
} - @if (!credentialsCreated) { + @if (!credentialsCreated()) { } -
+
-
-
- api { - @if (credentialsComment()) { -
- # {{credentialsComment()}} -
- } +
+ api { + @if (credentialsComment()) {
- web_server : {{WEB_SERVER_URL}} + # {{credentialsComment()}}
+ } +
+ web_server : {{WEB_SERVER_URL}} +
+
+ api_server: {{configService.apiServerUrl()}} +
+ @if (configService.fileServerUrl()) {
- api_server: {{configService.apiServerUrl()}} -
- @if (configService.fileServerUrl()) { -
- files_server: {{configService.fileServerUrl()}} -
- } -
- credentials { -
-
- "access_key"="{{accessKey}}" -
-
- "secret_key"="{{secretKey}}" -
-
- } + files_server: {{configService.fileServerUrl()}}
+ } +
+ credentials { +
+
+ "access_key"="{{accessKey()}}" +
+
+ "secret_key"="{{secretKey()}}" +
+
}
+ }
@if (!showTabs) { -
Manage your app credentials in theworkspace settings page
+
Manage your API credentials in theworkspace settings page
}
diff --git a/src/app/webapp-common/layout/welcome-message/welcome-message.component.scss b/src/app/webapp-common/layout/welcome-message/welcome-message.component.scss index d9afdc9b..99c0adaf 100644 --- a/src/app/webapp-common/layout/welcome-message/welcome-message.component.scss +++ b/src/app/webapp-common/layout/welcome-message/welcome-message.component.scss @@ -1,9 +1,15 @@ -@import "variables"; -@import "mixins/link"; +@use "variables"; $credentialBaseHeight: 238px; + :host { + ::ng-deep .mat-mdc-tab-nav-bar, .mat-mdc-tab-group { + --mat-tab-header-divider-height: 1px; + } + + --mat-tab-header-divider-color: var(--color-surface-container-high); + ::ng-deep .sub-header { padding: 0 32px; } @@ -115,12 +121,11 @@ $credentialBaseHeight: 238px; .code { position: relative; - margin: 1px 0 2px; width: 100%; - color: var(--color-on-surface-variant); - background-color: var(--color-surface); + background-color: var(--color-surface-container-low); border-radius: 4px; + border: 1px solid var(--color-outline-variant); &:hover { @@ -134,7 +139,7 @@ $credentialBaseHeight: 238px; overflow: auto; margin-right: 16px; white-space: pre; - font-family: $font-family-monospace; + font-family: variables.$font-family-monospace; font-size: 11px; line-height: 18px; } diff --git a/src/app/webapp-common/layout/welcome-message/welcome-message.component.ts b/src/app/webapp-common/layout/welcome-message/welcome-message.component.ts index 820db83d..37a8a602 100644 --- a/src/app/webapp-common/layout/welcome-message/welcome-message.component.ts +++ b/src/app/webapp-common/layout/welcome-message/welcome-message.component.ts @@ -1,16 +1,21 @@ import {LocationStrategy} from '@angular/common'; -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, computed, signal, inject } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + computed, + signal, + inject, + DestroyRef +} from '@angular/core'; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {setSelectedWorkspaceTab} from '@common/core/actions/users.actions'; import {selectActiveWorkspace, selectGettingStarted} from '@common/core/reducers/users-reducer'; -import {filter} from 'rxjs/operators'; import {Store} from '@ngrx/store'; import {createCredential, resetCredential} from '@common/core/actions/common-auth.actions'; import {selectNewCredential} from '@common/core/reducers/common-auth-reducer'; import {ConfigurationService} from '@common/shared/services/configuration.service'; import {Queue} from '~/business-logic/model/queues/queue'; import {GettingStartedContext} from '../../../../environments/base'; -import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dialog-template/dialog-template.component'; import {CopyClipboardComponent} from '@common/shared/ui-components/indicators/copy-clipboard/copy-clipboard.component'; import {YouTubePlayerModule} from '@angular/youtube-player'; @@ -39,34 +44,31 @@ export interface WelcomeMessageData { @Component({ - selector: 'sm-welcome-message', - templateUrl: './welcome-message.component.html', - styleUrls: ['./welcome-message.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - DialogTemplateComponent, - CopyClipboardComponent, - YouTubePlayerModule, - MatCheckbox, - MatButton, - MatIcon, - FormsModule, - MatTabGroup, - MatTab - ] + selector: 'sm-welcome-message', + templateUrl: './welcome-message.component.html', + styleUrls: ['./welcome-message.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + DialogTemplateComponent, + CopyClipboardComponent, + YouTubePlayerModule, + MatCheckbox, + MatButton, + MatIcon, + FormsModule, + MatTabGroup, + MatTab + ] }) export class WelcomeMessageComponent { private store = inject(Store); private dialogRef = inject>(MatDialogRef); public data = inject(MAT_DIALOG_DATA); protected configService = inject(ConfigurationService); - private cdr = inject(ChangeDetectorRef); + private destroyRef = inject(DestroyRef); private locationStrategy = inject(LocationStrategy); - public step = signal(this.data?.step ?? 1); - accessKey: string; - secretKey: string; - credentialsCreated = false; + protected step = signal(this.data?.step ?? 1); + protected credentialsCreated = signal(false); WEB_SERVER_URL = window.location.origin + this.locationStrategy.getBaseHref(); @@ -108,6 +110,9 @@ export class WelcomeMessageComponent { public workspace = this.store.selectSignal(selectActiveWorkspace); private companyGettingStarted = this.store.selectSignal(selectGettingStarted); + protected credentials = this.store.selectSignal(selectNewCredential); + protected accessKey = computed(() => this.credentials()?.access_key); + protected secretKey = computed(() => this.credentials()?.secret_key); protected target = signal(0); protected credentialsComment = computed(() => this.community() && this.workspace()?.name); protected isJupyter = computed(() => this.target() === 1); @@ -120,7 +125,7 @@ export class WelcomeMessageComponent { if (this.queue) { steps[0].code = `clearml-agent daemon --queue ${this.queue.name}`; - steps[0].header = `To assign a worker to the ${this.queue.name} queue, run:`; + steps[0].header = `To assign a worker to the ${this.queue.display_name || this.queue.name} queue, run:`; steps[1].code = `pip install clearml-agent`; steps[2].code = `clearml-agent init`; } else { @@ -142,14 +147,13 @@ export class WelcomeMessageComponent { if(this.credentialsLabel) { steps[this.queue ? 2 : 1].code += `# ${this.credentialsLabel}\n`; } - steps[this.queue ? 2 : 1].code += `%env CLEARML_API_ACCESS_KEY=${this.accessKey || ''} -%env CLEARML_API_SECRET_KEY=${this.secretKey || ''}`; + steps[this.queue ? 2 : 1].code += `%env CLEARML_API_ACCESS_KEY=${this.accessKey() || ''} +%env CLEARML_API_SECRET_KEY=${this.secretKey() || ''}`; } return steps; }); - constructor( - ) { + constructor() { this.dialogRef.beforeClosed().subscribe(res => this.doNotShowAgain && !res? this.dialogRef.close(this.doNotShowAgain) : false); @@ -157,18 +161,7 @@ export class WelcomeMessageComponent { this.loadYoutubeApi(this.data?.newExperimentYouTubeVideoId); } - this.store.select(selectNewCredential) - .pipe( - takeUntilDestroyed(), - filter(credential => credential && Object.keys(credential).length > 0) - ) - .subscribe(credential => { - this.accessKey = credential.access_key; - this.secretKey = credential.secret_key; - this.store.dispatch(resetCredential()); - this.cdr.markForCheck(); - }); - + this.destroyRef.onDestroy(() => this.store.dispatch(resetCredential())); } closeDialog() { @@ -181,7 +174,7 @@ export class WelcomeMessageComponent { } createCredentials() { - this.credentialsCreated = true; + this.credentialsCreated.set(true); this.store.dispatch(setSelectedWorkspaceTab({workspace: {id: this.workspace().id}})); this.store.dispatch(createCredential({workspace: this.workspace(), label: this.credentialsLabel})); } @@ -215,8 +208,8 @@ export class WelcomeMessageComponent { res += ` files_server: ${filesServer}\n`; } res += ` credentials { - "access_key" = "${this.accessKey}" - "secret_key" = "${this.secretKey}" + "access_key" = "${this.accessKey()}" + "secret_key" = "${this.secretKey()}" } }`; return res; diff --git a/src/app/webapp-common/login/login.actions.ts b/src/app/webapp-common/login/login.actions.ts index 8cb1c675..da634cf0 100644 --- a/src/app/webapp-common/login/login.actions.ts +++ b/src/app/webapp-common/login/login.actions.ts @@ -1,12 +1,6 @@ import {createAction, props} from '@ngrx/store'; -import {User} from '~/business-logic/model/users/user'; -export const setUserLoginState = createAction( - '[login] set user login state', - props<{ user: User; inviteId: string; crmForm: any }>() -); - export const getTOU = createAction('[login] get TOU'); export const setTOU = createAction( diff --git a/src/app/webapp-common/login/login/login.component.html b/src/app/webapp-common/login/login/login.component.html index d18518cd..159c4b30 100644 --- a/src/app/webapp-common/login/login/login.component.html +++ b/src/app/webapp-common/login/login/login.component.html @@ -1,10 +1,10 @@ @if (projectsList()?.length !== 0 || searching()) { - @for (project of projectsList(); track $index) { + @for (project of projectsList(); track project.id + $index + projectsList().length) { @if ($index + totalVirtualCards() < projectsList().length || noMoreProjects() || searching()) { diff --git a/src/app/webapp-common/pipelines-controller/controllers.component.scss b/src/app/webapp-common/pipelines-controller/controllers.component.scss index 9316677d..36a05f27 100644 --- a/src/app/webapp-common/pipelines-controller/controllers.component.scss +++ b/src/app/webapp-common/pipelines-controller/controllers.component.scss @@ -1,12 +1,12 @@ -@import "./../layout/layout.scss"; +@use "./../layout/layout.scss"; :host { .experiment-body { width: 100%; - height: calc(100% - #{$project-header-height}); + height: calc(100% - #{layout.$project-header-height}); transition: height 0.3s; &.footer-visible { - height: calc(100% - #{$project-header-height + $project-footer-height}); + height: calc(100% - #{layout.$project-header-height + layout.$project-footer-height}); } } diff --git a/src/app/webapp-common/pipelines-controller/controllers.component.ts b/src/app/webapp-common/pipelines-controller/controllers.component.ts index efbdff62..e11d7a31 100644 --- a/src/app/webapp-common/pipelines-controller/controllers.component.ts +++ b/src/app/webapp-common/pipelines-controller/controllers.component.ts @@ -6,7 +6,8 @@ import {Observable} from 'rxjs'; import { CountAvailableAndIsDisableSelectedFiltered, MenuItems, - selectionDisabledContinue + selectionDisabledContinue, + selectionDisabledPipelineRun } from '@common/shared/entity-page/items.utils'; import {ShowItemsFooterSelected} from '@common/shared/entity-page/footer-items/show-items-footer-selected'; import {CompareFooterItem} from '@common/shared/entity-page/footer-items/compare-footer-item'; @@ -28,9 +29,10 @@ import {ExperimentMenuComponent} from '@common/experiments/shared/components/exp import {EXPERIMENTS_TABLE_COL_FIELDS} from '~/features/experiments/shared/experiments.const'; @Component({ - selector: 'sm-controllers', - templateUrl: './controllers.component.html', - styleUrls: ['./controllers.component.scss'] + selector: 'sm-controllers', + templateUrl: './controllers.component.html', + styleUrls: ['./controllers.component.scss'], + standalone: false }) export class ControllersComponent extends ExperimentsComponent implements OnInit { @@ -99,7 +101,8 @@ export class ControllersComponent extends ExperimentsComponent implements OnInit override getSingleSelectedDisableAvailable(experiment) { return { ...(super.getSingleSelectedDisableAvailable(experiment)), - [MenuItems.continue]: selectionDisabledContinue([experiment]) + [MenuItems.continue]: selectionDisabledContinue([experiment]), + [MenuItems.run]: selectionDisabledPipelineRun([experiment]) }; } diff --git a/src/app/webapp-common/pipelines-controller/controllers.consts.ts b/src/app/webapp-common/pipelines-controller/controllers.consts.ts index 7ab2925a..5c83f124 100644 --- a/src/app/webapp-common/pipelines-controller/controllers.consts.ts +++ b/src/app/webapp-common/pipelines-controller/controllers.consts.ts @@ -61,7 +61,7 @@ export const INITIAL_CONTROLLER_TABLE_COLS: ISmCol[] = [ headerType: ColHeaderTypeEnum.sortFilter, filterable: true, header: 'STATUS', - style: {width: '115px'}, + style: {width: '130px', minWidth: '130px'}, showInCardFilters: true }, { diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.html b/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.html index 3c7a9210..255ecee5 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.html +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.html @@ -9,10 +9,10 @@
- + @if (!focusOnStageId() && hasStages()) {
} @else {
- +

NO CODE

} diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.scss b/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.scss index 3fe47df2..0e11b85f 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.scss +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.scss @@ -4,7 +4,7 @@ $log-header-height: 48px; :host { .stage-title { position: absolute; - z-index: 10; + z-index: 3; padding: 6px 24px 6px 0; gap: 12px; background: var(--color-primary-container); @@ -92,6 +92,11 @@ $log-header-height: 48px; &.toggle { grid-template-columns: 1fr auto 1fr; } + + .t-btns { + border-radius: 36px; + background-color: var(--color-surface-container-low); + } } .content { @@ -205,14 +210,10 @@ sm-pipeline-controller-step { left: 50%; transform: translateY(-50%) translateX(-50%); text-align: center; + color: var(--color-empty-state); - h3 { + h4 { font-weight: 500; - font-size: 14px; - } - - .icon { - width: 100px; - height: 100px; + font-size: 16px; } } diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.ts b/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.ts index fb36969e..c2168ee9 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.ts +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.ts @@ -60,28 +60,23 @@ export enum StatusOption { @Component({ - selector: 'sm-pipeline-controller-diagram', - templateUrl: './pipeline-controller-info.component.html', - styleUrls: ['./pipeline-controller-info.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - providers: [DagManagerUnsortedService], - animations: [ - trigger('shrinkRegular', [ - state( - 'shrink', - style({ - opacity: '0', - }), - ), - state( - 'regular', - style({ - opacity: '1', - }), - ), - transition('shrink => regular', [animate('1s')]), - ]), - ], + selector: 'sm-pipeline-controller-diagram', + templateUrl: './pipeline-controller-info.component.html', + styleUrls: ['./pipeline-controller-info.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + providers: [DagManagerUnsortedService], + animations: [ + trigger('shrinkRegular', [ + state('shrink', style({ + opacity: '0', + })), + state('regular', style({ + opacity: '1', + })), + transition('shrink => regular', [animate('1s')]), + ]), + ], + standalone: false }) export class PipelineControllerInfoComponent implements OnDestroy { @@ -167,6 +162,7 @@ export class PipelineControllerInfoComponent implements OnDestroy { .subscribe(([task,]) => { if (task?.id !== this.infoData?.id) { this.enableStaging.set(false); + this.focusOnStage.set(false); this.selectedEntity.set(null); this.stepDiff.set(null); this.detailsPanelMode.set(this.getPanelMode()); @@ -417,8 +413,10 @@ export class PipelineControllerInfoComponent implements OnDestroy { } else if (!this.dragging) { this.stepDiff.set(null); this.detailsPanelMode.set(this.defaultDetailsMode); - this.store.dispatch(setSelectedPipelineStep({step: this.focusOnStage()?.id ? this.focusOnStage() : null})); - this.selectedEntity.set(this.focusOnStage()?.id ? this.focusOnStage() : null); + if(!this.focusOnStage()){ + this.store.dispatch(setSelectedPipelineStep({step: null})); + this.selectedEntity.set(null); + } } else { this.dragging = false; } diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/abort-controller-dialog/abort-controller-dialog.component.ts b/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/abort-controller-dialog/abort-controller-dialog.component.ts index 24fa03b4..c5c609e3 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/abort-controller-dialog/abort-controller-dialog.component.ts +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/abort-controller-dialog/abort-controller-dialog.component.ts @@ -5,17 +5,16 @@ import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dial import {MatButton} from '@angular/material/button'; @Component({ - selector: 'sm-abort-controller-dialog', - templateUrl: './abort-controller-dialog.component.html', - styleUrls: ['./abort-controller-dialog.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - DialogTemplateComponent, - MatDialogActions, - MatButton, - MatDialogClose - ], - standalone: true + selector: 'sm-abort-controller-dialog', + templateUrl: './abort-controller-dialog.component.html', + styleUrls: ['./abort-controller-dialog.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + DialogTemplateComponent, + MatDialogActions, + MatButton, + MatDialogClose + ] }) export class AbortControllerDialogComponent { protected data = inject<{ diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/pipeline-controller-menu.component.ts b/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/pipeline-controller-menu.component.ts index 5e15c363..9ed8c9ef 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/pipeline-controller-menu.component.ts +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/pipeline-controller-menu.component.ts @@ -13,10 +13,11 @@ import {ISelectedExperiment} from '~/features/experiments/shared/experiment-info @Component({ - selector: 'sm-controller-menu', - templateUrl: './pipeline-controller-menu.component.html', - styleUrls: ['./pipeline-controller-menu.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, + selector: 'sm-controller-menu', + templateUrl: './pipeline-controller-menu.component.html', + styleUrls: ['./pipeline-controller-menu.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class PipelineControllerMenuComponent extends ExperimentMenuComponent { entityTypeEnum = EntityTypeEnum; diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.scss b/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.scss index d6636353..d595b2e1 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.scss +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.scss @@ -51,8 +51,10 @@ &.stage-step{ background-color: var(--color-primary); color: var(--color-on-primary); - --mdc-icon-button-icon-color: var(--color-on-primary); - --mat-icon-button-state-layer-color: var(--color-on-primary); + .mat-mdc-button-base{ + --mdc-icon-button-icon-color: var(--color-on-primary); + --mat-icon-button-state-layer-color: var(--color-on-primary); + } } } diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.ts b/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.ts index ad251aee..3dba2606 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.ts +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.ts @@ -13,28 +13,23 @@ import {map} from 'rxjs/operators'; import {animate, state, style, transition, trigger} from '@angular/animations'; @Component({ - selector: 'sm-pipeline-controller-step', - templateUrl: './pipeline-controller-step.component.html', - styleUrls: ['./pipeline-controller-step.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - animations: [ - trigger('openClose', [ - state( - 'open', - style({ - transform: 'scale(3)', - opacity: 0 - }), - ), - state( - 'closed', - style({ - opacity: 1, - }), - ), - transition('closed => open', [animate('0.35s')]), - ]), - ], + selector: 'sm-pipeline-controller-step', + templateUrl: './pipeline-controller-step.component.html', + styleUrls: ['./pipeline-controller-step.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + animations: [ + trigger('openClose', [ + state('open', style({ + transform: 'scale(3)', + opacity: 0 + })), + state('closed', style({ + opacity: 1, + })), + transition('closed => open', [animate('0.35s')]), + ]), + ], + standalone: false }) export class PipelineControllerStepComponent { step = input(); diff --git a/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.html b/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.html index 2b3dc353..f957cd16 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.html +++ b/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.html @@ -1,4 +1,4 @@ - +
{{ controller() ? 'RUN INFO' : stepWithStatus()?.data?.isStage ? 'STAGE INFO' : 'STEP INFO' }}
 @@ -95,7 +95,7 @@ } @if (stepWithStatus()?.data?.isStage) {
-
Steps status count
+
Step count by status
@for (status of stepWithStatus().data.statusCount | keyvalue; track $index) { @if (status.value > 0) {
diff --git a/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.scss b/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.scss index 5cae3243..6d51fa97 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.scss +++ b/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.scss @@ -1,4 +1,4 @@ -@import "variables"; +@use "variables"; :host { width: 260px; @@ -39,7 +39,7 @@ .header { color: var(--color-primary); - font-size: $font-size-small; + font-size: variables.$font-size-small; font-weight: 500; display: flex; justify-content: space-between; @@ -110,7 +110,7 @@ .empty-msg { text-align: center; padding-top: 12px; - font-size: $font-size-small; + font-size: variables.$font-size-small; } footer { diff --git a/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.ts b/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.ts index 27d077d3..faa76bbf 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.ts +++ b/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.ts @@ -11,9 +11,10 @@ import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.mod import {StepStatusEnum} from '@common/experiments/actions/common-experiments-info.actions'; @Component({ - selector: 'sm-pipeline-info', - templateUrl: './pipeline-info.component.html', - styleUrls: ['./pipeline-info.component.scss'] + selector: 'sm-pipeline-info', + templateUrl: './pipeline-info.component.html', + styleUrls: ['./pipeline-info.component.scss'], + standalone: false }) export class PipelineInfoComponent { private store = inject(Store); diff --git a/src/app/webapp-common/pipelines-controller/pipeline-diagram/pipeline-diagram.component.ts b/src/app/webapp-common/pipelines-controller/pipeline-diagram/pipeline-diagram.component.ts index 91b4a9db..703eb128 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-diagram/pipeline-diagram.component.ts +++ b/src/app/webapp-common/pipelines-controller/pipeline-diagram/pipeline-diagram.component.ts @@ -3,14 +3,13 @@ import {PipelinesControllerModule} from '@common/pipelines-controller/pipelines- import {PushPipe} from '@ngrx/component'; @Component({ - selector: 'sm-pipeline-diagram', - standalone: true, - imports: [ - PipelinesControllerModule, - PushPipe - ], - templateUrl: './pipeline-diagram.component.html', - styleUrl: './pipeline-diagram.component.scss' + selector: 'sm-pipeline-diagram', + imports: [ + PipelinesControllerModule, + PushPipe + ], + templateUrl: './pipeline-diagram.component.html', + styleUrl: './pipeline-diagram.component.scss' }) export class PipelineDiagramComponent { diff --git a/src/app/webapp-common/pipelines-controller/pipelines-controller.module.ts b/src/app/webapp-common/pipelines-controller/pipelines-controller.module.ts index 15be0ed4..9f8a43dc 100644 --- a/src/app/webapp-common/pipelines-controller/pipelines-controller.module.ts +++ b/src/app/webapp-common/pipelines-controller/pipelines-controller.module.ts @@ -74,6 +74,7 @@ import {CodeEditorComponent} from '@common/shared/ui-components/data/code-editor import {MatButtonToggle} from '@angular/material/button-toggle'; import {MatSlideToggle} from '@angular/material/slide-toggle'; import {provideAnimations} from '@angular/platform-browser/animations'; +import {ExperimentOutputLogComponent} from '@common/experiments/containers/experiment-output-log/experiment-output-log.component'; export const routes: Routes = [ { @@ -175,7 +176,8 @@ export const routes: Routes = [ MatIconButton, CodeEditorComponent, MatButtonToggle, - MatSlideToggle + MatSlideToggle, + ExperimentOutputLogComponent ], providers: [ ControllersComponent, diff --git a/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.html b/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.html index 64e28b86..961ca93f 100644 --- a/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.html +++ b/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.html @@ -4,7 +4,7 @@ @if (params?.length > 0) { -
Parameters
+
Parameters
} @for (param of params; track param.name) {
diff --git a/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.scss b/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.scss index 825f7b87..b889c134 100644 --- a/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.scss +++ b/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.scss @@ -2,11 +2,15 @@ .section-title { color: var(--color-on-surface-variant); font-size: 14px; - margin-top: 14px; + margin-top: 32px; + font-weight: 500; + &.first { + margin-top: 0; + } } .param-line{ - margin-top: 24px; + margin-top: 16px; display: flex; align-items: center; justify-content: space-between; diff --git a/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.ts b/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.ts index d8263595..bf84f09a 100644 --- a/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.ts +++ b/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.ts @@ -25,9 +25,10 @@ export interface RunPipelineResult { } @Component({ - selector: 'sm-run-pipeline-controller-dialog', - templateUrl: './run-pipeline-controller-dialog.component.html', - styleUrls: ['./run-pipeline-controller-dialog.component.scss'] + selector: 'sm-run-pipeline-controller-dialog', + templateUrl: './run-pipeline-controller-dialog.component.html', + styleUrls: ['./run-pipeline-controller-dialog.component.scss'], + standalone: false }) export class RunPipelineControllerDialogComponent implements OnDestroy { public dialogRef = inject>(MatDialogRef); diff --git a/src/app/webapp-common/pipelines/nested-pipeline-page/nested-pipeline-page.component.html b/src/app/webapp-common/pipelines/nested-pipeline-page/nested-pipeline-page.component.html index 51b2cc75..bd8db19b 100644 --- a/src/app/webapp-common/pipelines/nested-pipeline-page/nested-pipeline-page.component.html +++ b/src/app/webapp-common/pipelines/nested-pipeline-page/nested-pipeline-page.component.html @@ -25,7 +25,7 @@
- +
NO PIPELINES TO SHOW
Run your first pipeline to see it displayed here diff --git a/src/app/webapp-common/pipelines/nested-pipeline-page/nested-pipeline-page.component.ts b/src/app/webapp-common/pipelines/nested-pipeline-page/nested-pipeline-page.component.ts index c7042105..5fd4de02 100644 --- a/src/app/webapp-common/pipelines/nested-pipeline-page/nested-pipeline-page.component.ts +++ b/src/app/webapp-common/pipelines/nested-pipeline-page/nested-pipeline-page.component.ts @@ -4,7 +4,6 @@ import {ProjectTypeEnum} from '@common/nested-project-view/nested-project-view-p import {CircleTypeEnum} from '~/shared/constants/non-common-consts'; import {showExamplePipelines} from '@common/projects/common-projects.actions'; import {ProjectsSharedModule} from '~/features/projects/shared/projects-shared.module'; -import { AsyncPipe } from '@angular/common'; import {setDefaultNestedModeForFeature} from '@common/core/actions/projects.actions'; import {CircleCounterComponent} from '@common/shared/ui-components/indicators/circle-counter/circle-counter.component'; import {TagListComponent} from '@common/shared/ui-components/tags/tag-list/tag-list.component'; @@ -14,20 +13,18 @@ import {MatButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-nested-pipeline-page', - templateUrl: './nested-pipeline-page.component.html', - styleUrls: ['../../nested-project-view/nested-project-view-page/nested-project-view-page.component.scss'], - imports: [ - ProjectsSharedModule, - AsyncPipe, - CircleCounterComponent, - TagListComponent, - ClickStopPropagationDirective, - PushPipe, - MatButton, - MatIcon - ], - standalone: true + selector: 'sm-nested-pipeline-page', + templateUrl: './nested-pipeline-page.component.html', + styleUrls: ['../../nested-project-view/nested-project-view-page/nested-project-view-page.component.scss'], + imports: [ + ProjectsSharedModule, + CircleCounterComponent, + TagListComponent, + ClickStopPropagationDirective, + PushPipe, + MatButton, + MatIcon + ] }) export class NestedPipelinePageComponent extends PipelinesPageComponent { circleTypeEnum = CircleTypeEnum; diff --git a/src/app/webapp-common/pipelines/pipeline-card-menu/pipeline-card-menu.component.ts b/src/app/webapp-common/pipelines/pipeline-card-menu/pipeline-card-menu.component.ts index 0d9bbc0e..1f7049bd 100644 --- a/src/app/webapp-common/pipelines/pipeline-card-menu/pipeline-card-menu.component.ts +++ b/src/app/webapp-common/pipelines/pipeline-card-menu/pipeline-card-menu.component.ts @@ -3,9 +3,10 @@ import { ICONS } from '@common/constants'; import {Project} from '~/business-logic/model/projects/project'; @Component({ - selector: 'sm-pipeline-card-menu', - templateUrl: './pipeline-card-menu.component.html', - styleUrls: ['./pipeline-card-menu.component.scss'] + selector: 'sm-pipeline-card-menu', + templateUrl: './pipeline-card-menu.component.html', + styleUrls: ['./pipeline-card-menu.component.scss'], + standalone: false }) export class PipelineCardMenuComponent { readonly icons = ICONS; diff --git a/src/app/webapp-common/pipelines/pipeline-card/pipeline-card.component.html b/src/app/webapp-common/pipelines/pipeline-card/pipeline-card.component.html index 96a5d74d..3bd16c34 100644 --- a/src/app/webapp-common/pipelines/pipeline-card/pipeline-card.component.html +++ b/src/app/webapp-common/pipelines/pipeline-card/pipeline-card.component.html @@ -41,7 +41,7 @@ class="al-icon al-ico-project-path sm ms-2"> } - @if (!hideMenu) { + @if (!hideMenu()) {
- @if (!hideMenu) { + @if (!hideMenu()) {
-
-
- Run this code for a quick example (Requires ClearML 1.3 or above)
- For more details see the documentation -
-
+

+ Run this code for a quick example (Requires ClearML 1.3 or above)
+ For more details see the documentation +

@if (initPipelineCode()) { } @@ -25,13 +23,11 @@
-
-
+

Run this code for a quick example (Requires ClearML 1.3 or above)
- For more details see the documentation -

-
+

@if (initPipelineCode()) { } diff --git a/src/app/webapp-common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component.scss b/src/app/webapp-common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component.scss index 920d5043..89fa21ec 100644 --- a/src/app/webapp-common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component.scss +++ b/src/app/webapp-common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component.scss @@ -10,6 +10,10 @@ display: flex; flex: 1; flex-direction: column; + p { + color: var(--color-on-surface); + text-align: left; + } sm-code-editor { display: block; @@ -18,6 +22,7 @@ margin-top: 6px; border-radius: 6px; overflow: hidden; + border: 1px solid var(--color-outline-variant); } } diff --git a/src/app/webapp-common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component.ts b/src/app/webapp-common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component.ts index 65e9e4f3..743fe436 100644 --- a/src/app/webapp-common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component.ts +++ b/src/app/webapp-common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component.ts @@ -1,13 +1,16 @@ import {ChangeDetectionStrategy, Component, inject, input, model} from '@angular/core'; import {MAT_DIALOG_DATA} from '@angular/material/dialog'; +import {ConfigurationService} from '@common/shared/services/configuration.service'; @Component({ - selector: 'sm-pipelines-empty-state', - templateUrl: './pipelines-empty-state.component.html', - styleUrls: ['./pipelines-empty-state.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, + selector: 'sm-pipelines-empty-state', + templateUrl: './pipelines-empty-state.component.html', + styleUrls: ['./pipelines-empty-state.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class PipelinesEmptyStateComponent{ + protected readonly confService = inject(ConfigurationService); public data = inject<{pipelineCode?: string}>(MAT_DIALOG_DATA, { optional: true }); initPipelineCode = model(); diff --git a/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.html b/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.html index 72196984..421ae666 100644 --- a/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.html +++ b/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.html @@ -17,14 +17,14 @@ (valueChanged)="!(!!projectId && $event) && toggleNestedView($any($event))" >
-
@if (((projectsList$ | ngrxPush)?.length !== 0 && (!allExamples || (showExamples$ | ngrxPush))) || searching) { - @for (project of projectsList$ | ngrxPush; track project.id) { + @for (project of projectsList$ | ngrxPush; track project.id + $index) {
- +
NO PIPELINES TO SHOW
Run your first pipeline to see it displayed here diff --git a/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.scss b/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.scss index e1154a54..9256ec9c 100644 --- a/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.scss +++ b/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.scss @@ -1,5 +1,5 @@ -@import "variables"; -@import "mixins/empty"; +@use "variables"; +@use "mixins/empty"; :host { display: block; @@ -14,7 +14,7 @@ } sm-projects-header { - height: $nav-bar-height; + height: variables.$nav-bar-height; grid-column: 1 / -1; position: sticky; top: 0; @@ -24,5 +24,5 @@ } - @include empty-card-mixin(); + @include empty.empty-card-mixin(); } diff --git a/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.ts b/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.ts index 8af7f1e2..2e0439cc 100644 --- a/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.ts +++ b/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.ts @@ -2,7 +2,6 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {pageSize} from '@common/projects/common-projects.consts'; import {CommonProjectsPageComponent} from '@common/projects/containers/projects-page/common-projects-page.component'; import {isExample} from '@common/shared/utils/shared-utils'; -import {trackById} from '@common/shared/utils/forms-track-by'; import { addProjectTags, getProjectsTags, setBreadcrumbsOptions, @@ -34,9 +33,10 @@ import {debounceTime, skip, withLatestFrom} from 'rxjs/operators'; import {ProjectTypeEnum} from '@common/nested-project-view/nested-project-view-page/nested-project-view-page.component'; @Component({ - selector: 'sm-pipelines-page', - templateUrl: './pipelines-page.component.html', - styleUrls: ['./pipelines-page.component.scss'] + selector: 'sm-pipelines-page', + templateUrl: './pipelines-page.component.html', + styleUrls: ['./pipelines-page.component.scss'], + standalone: false }) export class PipelinesPageComponent extends CommonProjectsPageComponent implements OnInit, OnDestroy { initPipelineCode = `from clearml import PipelineDecorator @@ -67,7 +67,6 @@ if __name__ == '__main__': pageSize = pageSize; protected entityType = ProjectTypeEnum.pipelines; isExample = isExample; - trackById = trackById; public projectsTags$: Observable; public showExamples$: Observable; private headerUserFocusSub: Subscription; diff --git a/src/app/webapp-common/project-info/conteiners/metric-for-stats-dialog/metric-for-stats-dialog.component.ts b/src/app/webapp-common/project-info/conteiners/metric-for-stats-dialog/metric-for-stats-dialog.component.ts index 34b3717f..38cd7a72 100644 --- a/src/app/webapp-common/project-info/conteiners/metric-for-stats-dialog/metric-for-stats-dialog.component.ts +++ b/src/app/webapp-common/project-info/conteiners/metric-for-stats-dialog/metric-for-stats-dialog.component.ts @@ -13,10 +13,11 @@ export interface MetricForStatsData { @Component({ - selector: 'sm-metric-for-stats-dialog', - templateUrl: './metric-for-stats-dialog.component.html', - styleUrls: ['./metric-for-stats-dialog.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-metric-for-stats-dialog', + templateUrl: './metric-for-stats-dialog.component.html', + styleUrls: ['./metric-for-stats-dialog.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class MetricForStatsDialogComponent { public variants: MetricVariantResult[]; diff --git a/src/app/webapp-common/project-info/conteiners/project-stats/project-stats.component.scss b/src/app/webapp-common/project-info/conteiners/project-stats/project-stats.component.scss index 0580ad50..0d8e60fb 100644 --- a/src/app/webapp-common/project-info/conteiners/project-stats/project-stats.component.scss +++ b/src/app/webapp-common/project-info/conteiners/project-stats/project-stats.component.scss @@ -1,9 +1,8 @@ -@import "mixins/link"; -@import "../../../layout/layout"; +@use "../../../layout/layout"; :host{ display: block; - height: $graph-height; + height: layout.$graph-height; background-color: var(--color-surface-container-low); .header { @@ -31,6 +30,7 @@ } .overview-placeholder { + color: var(--color-empty-state); .no-data-title { margin: 24px 0; } diff --git a/src/app/webapp-common/project-info/conteiners/project-stats/project-stats.component.ts b/src/app/webapp-common/project-info/conteiners/project-stats/project-stats.component.ts index 7e802094..933ecbaa 100644 --- a/src/app/webapp-common/project-info/conteiners/project-stats/project-stats.component.ts +++ b/src/app/webapp-common/project-info/conteiners/project-stats/project-stats.component.ts @@ -31,10 +31,11 @@ import {presetColors} from '@common/shared/ui-components/inputs/color-picker/col import {selectMetricVariants} from '@common/experiments/reducers'; @Component({ - selector: 'sm-project-stats', - templateUrl: './project-stats.component.html', - styleUrls: ['./project-stats.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-project-stats', + templateUrl: './project-stats.component.html', + styleUrls: ['./project-stats.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ProjectStatsComponent implements OnDestroy { private store = inject(Store); diff --git a/src/app/webapp-common/project-info/project-info-routing.module.ts b/src/app/webapp-common/project-info/project-info-routing.module.ts index 12f189a2..83f2c3fa 100644 --- a/src/app/webapp-common/project-info/project-info-routing.module.ts +++ b/src/app/webapp-common/project-info/project-info-routing.module.ts @@ -1,14 +1,12 @@ import {RouterModule, Routes} from '@angular/router'; import {NgModule} from '@angular/core'; import {ProjectInfoComponent} from './project-info.component'; -import {generalLeavingBeforeSaveAlertGuard} from '../shared/guards/general-leaving-before-save-alert.guard'; export const routes: Routes = [ { path : '', component: ProjectInfoComponent, data: {search: false, archiveLabel: ''}, - canDeactivate: [generalLeavingBeforeSaveAlertGuard], } ]; diff --git a/src/app/webapp-common/project-info/project-info.component.html b/src/app/webapp-common/project-info/project-info.component.html index eccf00e1..3e479018 100644 --- a/src/app/webapp-common/project-info/project-info.component.html +++ b/src/app/webapp-common/project-info/project-info.component.html @@ -22,7 +22,7 @@ > @if (!example()) {
- +
THERE’S NOTHING HERE YET…
-
+
diff --git a/src/app/webapp-common/projects/dumb/projects-header/projects-header.component.scss b/src/app/webapp-common/projects/dumb/projects-header/projects-header.component.scss index e69de29b..7e2a4f77 100644 --- a/src/app/webapp-common/projects/dumb/projects-header/projects-header.component.scss +++ b/src/app/webapp-common/projects/dumb/projects-header/projects-header.component.scss @@ -0,0 +1,5 @@ +.right-buttons { + display: flex; + align-items: center; + justify-content: flex-end; +} diff --git a/src/app/webapp-common/projects/dumb/projects-header/projects-header.component.ts b/src/app/webapp-common/projects/dumb/projects-header/projects-header.component.ts index d00ff1f1..a0006617 100644 --- a/src/app/webapp-common/projects/dumb/projects-header/projects-header.component.ts +++ b/src/app/webapp-common/projects/dumb/projects-header/projects-header.component.ts @@ -2,9 +2,10 @@ import {Component, input, output, computed} from '@angular/core'; import {TableSortOrderEnum} from '@common/shared/ui-components/data/table/table.consts'; @Component({ - selector: 'sm-projects-header', - templateUrl: './projects-header.component.html', - styleUrls: ['./projects-header.component.scss'] + selector: 'sm-projects-header', + templateUrl: './projects-header.component.html', + styleUrls: ['./projects-header.component.scss'], + standalone: false }) export class ProjectsHeaderComponent { searchQuery = input(); diff --git a/src/app/webapp-common/projects/dumb/projects-list/projects-list.component.html b/src/app/webapp-common/projects/dumb/projects-list/projects-list.component.html index 3bd855d6..fb6bed74 100644 --- a/src/app/webapp-common/projects/dumb/projects-list/projects-list.component.html +++ b/src/app/webapp-common/projects/dumb/projects-list/projects-list.component.html @@ -1,6 +1,6 @@
- @for (project of projects(); track project.id) { + @for (project of projects(); track project.id + $index) { @if ($index + totalVirtualCards() < projects().length || noMoreProjects() || showLast()) { (); createNewProjectClicked = output(); projectEditClicked = output(); + projectSettingsClicked = output(); + protected projectsNames = computed(() => this.projects()?.map(p => p.basename)); protected totalVirtualCards = computed(() => this.projects()?.[1]?.['isRoot'] ? 2 : 1); diff --git a/src/app/webapp-common/reports/nested-reports-page/nested-reports-page.component.html b/src/app/webapp-common/reports/nested-reports-page/nested-reports-page.component.html index 304a0be6..ead699f3 100644 --- a/src/app/webapp-common/reports/nested-reports-page/nested-reports-page.component.html +++ b/src/app/webapp-common/reports/nested-reports-page/nested-reports-page.component.html @@ -27,10 +27,8 @@
-
- -
-
NO REPORTS TO SHOW
+ +

NO REPORTS TO SHOW

}
diff --git a/src/app/webapp-common/reports/reports-filters/reports-header.component.ts b/src/app/webapp-common/reports/reports-filters/reports-header.component.ts index f1155ff1..827f086d 100644 --- a/src/app/webapp-common/reports/reports-filters/reports-header.component.ts +++ b/src/app/webapp-common/reports/reports-filters/reports-header.component.ts @@ -2,10 +2,11 @@ import {ChangeDetectionStrategy, Component, computed, input, output} from '@angu import {TableSortOrderEnum} from '@common/shared/ui-components/data/table/table.consts'; @Component({ - selector: 'sm-reports-header', - templateUrl: './reports-header.component.html', - styleUrls: ['./reports-header.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-reports-header', + templateUrl: './reports-header.component.html', + styleUrls: ['./reports-header.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ReportsHeaderComponent { diff --git a/src/app/webapp-common/reports/reports-list/reports-list.component.html b/src/app/webapp-common/reports/reports-list/reports-list.component.html index 76f86e44..4ebd0c42 100644 --- a/src/app/webapp-common/reports/reports-list/reports-list.component.html +++ b/src/app/webapp-common/reports/reports-list/reports-list.component.html @@ -1,7 +1,7 @@
@if (!newReport.observed || reports() === null || reports()?.length > 0) { - @for (report of reports(); track trackByFn($index, report)) { + @for (report of reports(); track report.id + $index) { - -

NO REPORTS TO SHOW

+ +

NO REPORTS TO SHOW

@if (!archive()) {
+
@if (!minimizedView()) { } - +
+ +
diff --git a/src/app/webapp-common/serving/serving-header/serving-header.component.scss b/src/app/webapp-common/serving/serving-header/serving-header.component.scss index d5d5d275..6e99511f 100644 --- a/src/app/webapp-common/serving/serving-header/serving-header.component.scss +++ b/src/app/webapp-common/serving/serving-header/serving-header.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { .header-container { diff --git a/src/app/webapp-common/serving/serving-header/serving-header.component.ts b/src/app/webapp-common/serving/serving-header/serving-header.component.ts index 69a2795d..402e2d54 100644 --- a/src/app/webapp-common/serving/serving-header/serving-header.component.ts +++ b/src/app/webapp-common/serving/serving-header/serving-header.component.ts @@ -8,9 +8,10 @@ import { } from '@common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component'; @Component({ - selector : 'sm-serving-header', - templateUrl: './serving-header.component.html', - styleUrls : ['./serving-header.component.scss'] + selector: 'sm-serving-header', + templateUrl: './serving-header.component.html', + styleUrls: ['./serving-header.component.scss'], + standalone: false }) export class ServingHeaderComponent extends BaseEntityHeaderComponent { diff --git a/src/app/webapp-common/serving/serving-info/serving-info.component.ts b/src/app/webapp-common/serving/serving-info/serving-info.component.ts index 98a1c5b0..e588be45 100644 --- a/src/app/webapp-common/serving/serving-info/serving-info.component.ts +++ b/src/app/webapp-common/serving/serving-info/serving-info.component.ts @@ -3,8 +3,6 @@ import {ActivatedRoute, Router} from '@angular/router'; import {Store} from '@ngrx/store'; import {Observable, Subscription} from 'rxjs'; import {filter} from 'rxjs/operators'; -import {selectBackdropActive} from '@common/core/reducers/view.reducer'; -import {isReadOnly} from '@common/shared/utils/is-read-only'; import {Link} from '@common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component'; import {selectIsSharedAndNotOwner} from '~/features/experiments/reducers'; import {getCompanyTags, setBreadcrumbsOptions, setSelectedProject} from '@common/core/actions/projects.actions'; @@ -15,10 +13,11 @@ import {ServingActions} from '@common/serving/serving.actions'; @Component({ - selector: 'sm-serving-info', - templateUrl: './serving-info.component.html', - styleUrls: ['./serving-info.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, + selector: 'sm-serving-info', + templateUrl: './serving-info.component.html', + styleUrls: ['./serving-info.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ServingInfoComponent implements OnInit, OnDestroy { public minimized: boolean; @@ -26,9 +25,6 @@ export class ServingInfoComponent implements OnInit, OnDestroy { public selectedModel: EndpointStats; private sub = new Subscription(); public selectedModel$: Observable; - public isExample: boolean; - public backdropActive$: Observable; - public selectedTableModel$: Observable; public splitSize$: Observable; links = [ {name: 'details', url: ['general']}, @@ -43,8 +39,6 @@ export class ServingInfoComponent implements OnInit, OnDestroy { private route: ActivatedRoute, private cdr: ChangeDetectorRef ) { - this.backdropActive$ = this.store.select(selectBackdropActive); - this.selectedTableModel$ = this.store.select(servingFeature.selectSelectedEndpoint); this.splitSize$ = this.store.select(servingFeature.selectSplitSize); this.isSharedAndNotOwner$ = this.store.select((selectIsSharedAndNotOwner)); this.modelsFeature = this.route.snapshot.data?.setAllProject; @@ -62,7 +56,6 @@ export class ServingInfoComponent implements OnInit, OnDestroy { this.sub.add(this.store.select(servingFeature.selectSelectedEndpoint) .subscribe(model => { this.selectedModel = model; - this.isExample = isReadOnly(model); this.cdr.detectChanges(); }) ); diff --git a/src/app/webapp-common/serving/serving-loading.component.ts b/src/app/webapp-common/serving/serving-loading.component.ts index df7ba043..dfdfa79a 100644 --- a/src/app/webapp-common/serving/serving-loading.component.ts +++ b/src/app/webapp-common/serving/serving-loading.component.ts @@ -2,9 +2,8 @@ import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {setAutoRefresh} from '@common/core/actions/layout.actions'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {Observable, of} from 'rxjs'; -import {SortMeta} from 'primeng/api'; import {ISmCol, TableSortOrderEnum} from '@common/shared/ui-components/data/table/table.consts'; -import {SearchState, selectSearchQuery} from '@common/common-search/common-search.reducer'; +import {selectSearchQuery} from '@common/common-search/common-search.reducer'; import {FilterMetadata} from 'primeng/api/filtermetadata'; import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; import {distinctUntilChanged, filter, skip} from 'rxjs/operators'; @@ -22,9 +21,10 @@ import {headerActions} from '@common/core/actions/router.actions'; import {EndpointStats} from '~/business-logic/model/serving/endpointStats'; @Component({ - selector: 'sm-serving-loading', - templateUrl: './serving.component.html', - styleUrl: './serving.component.scss' + selector: 'sm-serving-loading', + templateUrl: './serving.component.html', + styleUrl: './serving.component.scss', + standalone: false }) export class ServingLoadingComponent extends BaseEntityPageComponent implements OnInit, OnDestroy { public readonly originalTableColumns = servingLoadingTableCols; @@ -32,60 +32,47 @@ export class ServingLoadingComponent extends BaseEntityPageComponent implements protected override entityType = EntityTypeEnum.endpointsContainer; protected override inEditMode$: Observable = of(false); public override showAllSelectedIsActive$: Observable = of(false); - public endpoints$: Observable; - public tableSortFields$: Observable; public tableSortOrder$: Observable; - public selectedEndpoints$: Observable; - public selectedEndpoint$: Observable; - public searchValue$: Observable; - public tableFilters$: Observable>; - public tableColsOrder$: Observable; public tags$: Observable; - public tableMode$: Observable<'table' | 'info'>; public systemTags$: Observable; - public tableCols$: Observable; - public filteredTableCols$: Observable; - public firstEndpoint: EndpointStats; - public metricVariants$: Observable; + protected firstEndpoint: EndpointStats; + protected metricVariants$: Observable; protected override setSplitSizeAction = ServingActions.setSplitSize; protected setTableModeAction = ServingActions.setTableViewMode; private selectedEndpoints: EndpointStats[]; - private searchQuery$: Observable; private readonly tagsFilter$: Observable; private readonly companyTags$: Observable; + protected selectedEndpoints$: Observable; + protected selectedEndpoint$: Observable; modelNamesOptions$ = this.store.select(servingFeature.modelLoadingNamesOptions); inputTypesOptions$ = this.store.select(servingFeature.inputTypesOptions); preprocessArtifactOptions$ = this.store.select(servingFeature.preprocessArtifactOptions); + protected override selectSplitSize$ = this.store.select(servingFeature.selectSplitSize); + protected tableSortFields$ = this.store.select(servingFeature.selectLoadingTableSortFields); + protected tableFilters$ = this.store.select(servingFeature.selectLoadingColumnFilters); + protected searchValue$ = this.store.select(servingFeature.selectGlobalFilter); + protected searchQuery$ = this.store.select(selectSearchQuery); + protected tableColsOrder$ = this.store.select(servingFeature.selectLoadingColsOrder); + protected tableMode$ = this.store.select(servingFeature.selectTableMode); + protected filteredTableCols$ = this.store.select(servingFeature.selectLoadingServingTableColumns); + protected tableCols$ = this.filteredTableCols$.pipe( + distinctUntilChanged(isEqual) + ); + protected endpoints$ = this.store.select(servingFeature.selectLoadingSortedFilteredEndpoints).pipe( + filter(endpoints => endpoints !== null)) as Observable; @ViewChild('endpointsTable') private table: ServingTableComponent; viewMode = this.route.snapshot.url[0].path; constructor() { super(); - this.selectSplitSize$ = this.store.select(servingFeature.selectSplitSize); - this.tableSortFields$ = this.store.select(servingFeature.selectLoadingTableSortFields); - this.tableFilters$ = this.store.select(servingFeature.selectLoadingColumnFilters); - this.searchValue$ = this.store.select(servingFeature.selectGlobalFilter); - - this.searchQuery$ = this.store.select(selectSearchQuery); - this.tableColsOrder$ = this.store.select(servingFeature.selectLoadingColsOrder); - this.tableMode$ = this.store.select(servingFeature.selectTableMode); - this.filteredTableCols$ = this.store.select(servingFeature.selectLoadingServingTableColumns); - - this.tableCols$ = this.filteredTableCols$.pipe( - distinctUntilChanged(isEqual) - ); - - this.endpoints$ = this.store.select(servingFeature.selectLoadingSortedFilteredEndpoints).pipe( - filter(endpoints => endpoints !== null)) as Observable; this.syncAppSearch(); - this.setContextMenu(); } override ngOnInit() { super.ngOnInit(); - this.store.dispatch(ServingActions.fetchServingLoadingEndpoints()); + this.store.dispatch(ServingActions.fetchLoadingEndpoints()); let prevQueryParams: Params; this.sub.add(this.route.queryParams @@ -146,14 +133,9 @@ export class ServingLoadingComponent extends BaseEntityPageComponent implements syncAppSearch() { this.store.dispatch(initSearch({payload: 'Search for endpoints'})); - this.sub.add(this.searchQuery$.pipe(skip(1)).subscribe(query => this.store.dispatch(ServingActions.globalFilterChanged(query)))); + this.sub.add(this.searchQuery$.pipe(skip(1),filter(query => query !== null)).subscribe(query => this.store.dispatch(ServingActions.globalFilterChanged(query)))); } - getNextEndpoints() { - this.store.dispatch(ServingActions.getNextServingEndpoints()); - } - - endpointsSelectionChanged(endpoints: EndpointStats[]) { this.store.dispatch(ServingActions.setSelectedServingEndpoint({endpoint: endpoints[0]})); } diff --git a/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.html b/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.html index 20c1bcc9..e6b0e0f2 100644 --- a/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.html +++ b/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.html @@ -4,22 +4,19 @@
- - + >
- @@ -34,15 +31,15 @@
@for (params of chartParamOptions; track params.label) { - @if (!hiddenCharts().includes(params.label)) { + @defer (on viewport) { - } @placeholder {
} - } + }
diff --git a/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.scss b/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.scss index 81edb51b..19898cc1 100644 --- a/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.scss +++ b/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.scss @@ -2,7 +2,7 @@ display: block; height: 100%; - sm-selectable-filter-list{ + sm-selectable-grouped-filter-list{ padding: 24px 16px; } } diff --git a/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.ts b/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.ts index b5213f50..77453c53 100644 --- a/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.ts +++ b/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.ts @@ -1,8 +1,5 @@ import {ChangeDetectionStrategy, Component, computed, ElementRef, inject, signal, viewChild} from '@angular/core'; import {MatDrawer, MatDrawerContainer, MatDrawerContent} from '@angular/material/sidenav'; -import { - SelectableFilterListComponent -} from '@common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component'; import {Store} from '@ngrx/store'; import {AngularSplitModule} from 'angular-split'; import {ServingStatsComponent} from '@common/serving/serving-stats/serving-stats.component'; @@ -17,33 +14,33 @@ import { ServingGetEndpointMetricsHistoryRequest } from '~/business-logic/model/serving/servingGetEndpointMetricsHistoryRequest'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; -import {SelectableListItem} from '@common/shared/ui-components/data/selectable-list/selectable-list.model'; import {MatButton, MatIconButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; import MetricTypeEnum = ServingGetEndpointMetricsHistoryRequest.MetricTypeEnum; +import {SelectableGroupedFilterListComponent} from '@common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component'; +import {GroupedList} from '@common/tasks/tasks.model'; @Component({ - selector: 'sm-serving-monitor', - templateUrl: './serving-monitor.component.html', - styleUrl: './serving-monitor.component.scss', - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - MatDrawerContent, - SelectableFilterListComponent, - MatDrawerContainer, - MatDrawer, - AngularSplitModule, - ServingStatsComponent, - MatFormField, - MatOption, - MatSelect, - FormsModule, - TooltipDirective, - MatButton, - MatIcon, - MatIconButton - ], + selector: 'sm-serving-monitor', + templateUrl: './serving-monitor.component.html', + styleUrl: './serving-monitor.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatDrawerContent, + MatDrawerContainer, + MatDrawer, + AngularSplitModule, + ServingStatsComponent, + MatFormField, + MatOption, + MatSelect, + FormsModule, + TooltipDirective, + MatButton, + MatIcon, + MatIconButton, + SelectableGroupedFilterListComponent + ] }) export class ServingMonitorComponent { private store = inject(Store); @@ -73,7 +70,10 @@ export class ServingMonitorComponent { {label: 'NETWORK THROUGHPUT TX (MBps)', value: MetricTypeEnum.NetworkTx} ]; - chartsList: SelectableListItem[] = this.chartParamOptions.map(option => ({name: option.label, value: option.label})); + chartsList: GroupedList = this.chartParamOptions.reduce((acc, curr) => { + acc[curr.label] = {}; + return acc; + }, {}); searchTermChanged(searchTerm: string) { this.searchTerm.set(searchTerm); diff --git a/src/app/webapp-common/serving/serving-stats/serving-stats.component.html b/src/app/webapp-common/serving/serving-stats/serving-stats.component.html index 657f9c0c..e53af532 100644 --- a/src/app/webapp-common/serving/serving-stats/serving-stats.component.html +++ b/src/app/webapp-common/serving/serving-stats/serving-stats.component.html @@ -6,7 +6,7 @@
this.allChartsData()?.[this.metricType().value] ?? null); private selectedWorkerId: string | undefined; - protected presetColors = presetColorsDark; + // Keep same series (topics) in same colors in all plots even if different order (plot has color persistent when order changes) + legends = computed(() => this.chartData()?.map(a => a.topicName)) + protected presetColors = computed(() => this.legends()?.map(series => presetColorsDark[this.allSeriesLegends().findIndex(leg => leg === series)])); protected yAxisLabels = { 'cpu_usage;gpu_usage': 'Usage %', @@ -61,7 +63,7 @@ export class ServingStatsComponent { } } this.selectedWorkerId = this.selectedEndpoint()?.id; - }, {allowSignalWrites: true}); + }); effect(() => { if (!!this.currentTimeFrame() && !!this.metricType() && this.selectedEndpoint()) { @@ -72,13 +74,13 @@ export class ServingStatsComponent { this.previousEndpoint = this.selectedEndpoint(); this.previousTimeFrame = this.currentTimeFrame(); } - }, {allowSignalWrites: true}); + }); effect(() => { if (this.chartData()) { this.refreshChart.set(false); } - }, {allowSignalWrites: true}); + }); this.autoRefreshSubscription(); } diff --git a/src/app/webapp-common/serving/serving-table/serving-table.component.ts b/src/app/webapp-common/serving/serving-table/serving-table.component.ts index c87c95ff..a19850fa 100644 --- a/src/app/webapp-common/serving/serving-table/serving-table.component.ts +++ b/src/app/webapp-common/serving/serving-table/serving-table.component.ts @@ -19,33 +19,23 @@ import { EntityTypeEnum } from '~/shared/constants/non-common-consts'; import {fileSizeConfigCount, fileSizeConfigStorage} from '@common/shared/pipes/filesize.pipe'; @Component({ - selector: 'sm-serving-table', - templateUrl: './serving-table.component.html', - styleUrl: './serving-table.component.scss', - changeDetection: ChangeDetectionStrategy.OnPush, - animations: [ - trigger( - 'inOutAnimation', - [ - transition( - ':enter', - [ - style({opacity: 0}), - animate('0.25s ease-in', - style({opacity: 1})) - ] - ), - transition( - ':leave', - [ - style({opacity: 1}), - animate('0.2s ease-in', - style({opacity: 0})) - ] - ) - ] - ) - ] + selector: 'sm-serving-table', + templateUrl: './serving-table.component.html', + styleUrl: './serving-table.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, + animations: [ + trigger('inOutAnimation', [ + transition(':enter', [ + style({ opacity: 0 }), + animate('0.25s ease-in', style({ opacity: 1 })) + ]), + transition(':leave', [ + style({ opacity: 1 }), + animate('0.2s ease-in', style({ opacity: 0 })) + ]) + ]) + ], + standalone: false }) export class ServingTableComponent extends BaseTableView implements OnChanges { readonly endpointsTableColFields = servingTableColFields; diff --git a/src/app/webapp-common/serving/serving.actions.ts b/src/app/webapp-common/serving/serving.actions.ts index 62d06b80..f5b77dd3 100644 --- a/src/app/webapp-common/serving/serving.actions.ts +++ b/src/app/webapp-common/serving/serving.actions.ts @@ -61,14 +61,14 @@ export const ServingActions = createActionGroup({ source: 'serving', events: { 'fetch serving endpoints': emptyProps(), - 'fetch serving loading endpoints': emptyProps(), + 'fetch loading endpoints': emptyProps(), 'refresh endpoints': props<{ hideLoader: boolean; autoRefresh: boolean }>(), 'refresh loading endpoints': props<{ hideLoader: boolean; autoRefresh: boolean }>(), 'get next servingEndpoints': emptyProps(), 'get next servingEndpoint with page size': props<{ pageSize: number }>(), - 'set servingEndpoints': props<{ servingEndpoints: EndpointStats[] }>(), - 'set loading servingEndpoints': props<{ servingEndpoints: EndpointStats[] }>(), - 'set servingEndpoints in place': props<{ servingEndpoints: EndpointStats[] }>(), + 'set serving endpoints': props<{ servingEndpoints: EndpointStats[] }>(), + 'set loading endpoints': props<{ servingEndpoints: EndpointStats[] }>(), + 'set serving endpoints in place': props<{ servingEndpoints: EndpointStats[] }>(), 'set no more servingEndpoints': props<{ payload: boolean }>(), 'toggle col hidden': props<{ columnId: string }>(), 'set hidden cols': props<{ hiddenCols: Record }>(), diff --git a/src/app/webapp-common/serving/serving.component.html b/src/app/webapp-common/serving/serving.component.html index be82669c..0f34aea1 100644 --- a/src/app/webapp-common/serving/serving.component.html +++ b/src/app/webapp-common/serving/serving.component.html @@ -65,7 +65,6 @@ (columnResized)="columnResized($event)" (filterChanged)="filterChanged($event)" (filterSearchChanged)="filterSearchChanged($event)" - (loadMoreEndpoints)="getNextEndpoints()" (clearAllFilters)="clearTableFiltersHandler($event)" (cardsCollapsedChanged)="cardsCollapsedToggle()" > diff --git a/src/app/webapp-common/serving/serving.component.scss b/src/app/webapp-common/serving/serving.component.scss index 48d1ac3c..e5634256 100644 --- a/src/app/webapp-common/serving/serving.component.scss +++ b/src/app/webapp-common/serving/serving.component.scss @@ -1,10 +1,10 @@ -@import "../layout/layout.scss"; +@use "../layout/layout.scss"; :host { .models-body { width: 100%; - height: calc(100% - #{$project-header-height}); + height: calc(100% - #{layout.$project-header-height}); transition: height 0.3s; } diff --git a/src/app/webapp-common/serving/serving.component.ts b/src/app/webapp-common/serving/serving.component.ts index c08feb30..ad3cff5f 100644 --- a/src/app/webapp-common/serving/serving.component.ts +++ b/src/app/webapp-common/serving/serving.component.ts @@ -2,13 +2,10 @@ import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {setAutoRefresh} from '@common/core/actions/layout.actions'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {combineLatest, Observable, of} from 'rxjs'; -import {SortMeta} from 'primeng/api'; import {ISmCol, TableSortOrderEnum} from '@common/shared/ui-components/data/table/table.consts'; -import {SearchState, selectSearchQuery} from '@common/common-search/common-search.reducer'; import {FilterMetadata} from 'primeng/api/filtermetadata'; -import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; -import {selectCompanyTags, selectProjectSystemTags, selectTagsFilterByProject} from '@common/core/reducers/projects.reducer'; -import {debounceTime, distinctUntilChanged, filter, map, skip, tap, withLatestFrom} from 'rxjs/operators'; +import {selectCompanyTags, selectProjectSystemTags} from '@common/core/reducers/projects.reducer'; +import {debounceTime, distinctUntilChanged, filter, map, take, withLatestFrom} from 'rxjs/operators'; import {isEqual} from 'lodash-es'; import {Params} from '@angular/router'; import {createMetricColumn, decodeColumns, decodeFilter, decodeOrder} from '@common/shared/utils/tableParamEncode'; @@ -27,9 +24,10 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; type EndpointsTableViewMode = 'active' | 'loading'; @Component({ - selector: 'sm-serving', - templateUrl: './serving.component.html', - styleUrl: './serving.component.scss' + selector: 'sm-serving', + templateUrl: './serving.component.html', + styleUrl: './serving.component.scss', + standalone: false }) export class ServingComponent extends BaseEntityPageComponent implements OnInit, OnDestroy { public readonly originalTableColumns = servingTableCols; @@ -37,71 +35,54 @@ export class ServingComponent extends BaseEntityPageComponent implements OnInit, protected override entityType = EntityTypeEnum.endpoint; protected override inEditMode$: Observable = of(false); public override showAllSelectedIsActive$: Observable = of(false); - public endpoints$: Observable; - public tableSortFields$: Observable; - public tableSortOrder$: Observable; - public selectedEndpoints$: Observable; - public selectedEndpoint$: Observable; - public searchValue$: Observable; - public tableFilters$: Observable>; - public tableColsOrder$: Observable; - public tags$: Observable; - public tableMode$: Observable<'table' | 'info'>; - public systemTags$: Observable; - public tableCols$: Observable; - public filteredTableCols$: Observable; public firstEndpoint: EndpointStats; - public metricVariants$: Observable; protected override setSplitSizeAction = ServingActions.setSplitSize; protected setTableModeAction = ServingActions.setTableViewMode; private selectedEndpoints: EndpointStats[]; - private searchQuery$: Observable; // private isAppVisible$: Observable; - private readonly tagsFilter$: Observable; - private readonly companyTags$: Observable; - modelNamesOptions$ = this.store.select(servingFeature.modelNamesOptions); - inputTypesOptions$ = this.store.select(servingFeature.inputTypesOptions); - preprocessArtifactOptions$ = this.store.select(servingFeature.preprocessArtifactOptions); + protected tableSortOrder$: Observable; + protected modelNamesOptions$ = this.store.select(servingFeature.modelNamesOptions); + protected inputTypesOptions$ = this.store.select(servingFeature.inputTypesOptions); + protected preprocessArtifactOptions$ = this.store.select(servingFeature.preprocessArtifactOptions); + protected override selectSplitSize$ = this.store.select(servingFeature.selectSplitSize); + protected tableSortFields$ = this.store.select(servingFeature.selectTableSortFields); + protected selectedEndpoint$ = this.store.select(servingFeature.selectSelectedEndpoint); + protected selectedEndpoints$ = this.store.select(servingFeature.selectSelectedEndpoints); + protected tableFilters$ = this.store.select(servingFeature.selectColumnFilters); + + protected tableColsOrder$ = this.store.select(servingFeature.selectColsOrder); + protected tags$ = this.store.select(servingFeature.selectTags); + protected companyTags$ = this.store.select(selectCompanyTags); + protected systemTags$ = this.store.select(selectProjectSystemTags); + protected tableMode$ = this.store.select(servingFeature.selectTableMode); + protected filteredTableCols$ = this.store.select(servingFeature.selectFilteredTableCols); + + protected tableCols$ = this.filteredTableCols$.pipe( + distinctUntilChanged(isEqual), + map(cols => cols.filter(col => !col.hidden)) + ); + + protected endpoints$ = this.store.select(servingFeature.selectSortedFilteredEndpoints) + .pipe(filter(endpoints => endpoints !== null)); @ViewChild('endpointsTable') private table: ServingTableComponent; viewMode: EndpointsTableViewMode = this.route.snapshot.url[0].path as EndpointsTableViewMode; constructor() { super(); - this.selectSplitSize$ = this.store.select(servingFeature.selectSplitSize); - this.tableSortFields$ = this.store.select(servingFeature.selectTableSortFields); - this.selectedEndpoint$ = this.store.select(servingFeature.selectSelectedEndpoint); - this.selectedEndpoints$ = this.store.select(servingFeature.selectSelectedEndpoints); - this.tableFilters$ = this.store.select(servingFeature.selectColumnFilters); - this.searchValue$ = this.store.select(servingFeature.selectGlobalFilter); - this.metricVariants$ = this.store.select(servingFeature.selectMetricVariants); - - this.searchQuery$ = this.store.select(selectSearchQuery); - this.tableColsOrder$ = this.store.select(servingFeature.selectColsOrder); - this.tags$ = this.store.select(servingFeature.selectTags); - this.tagsFilter$ = this.store.select(selectTagsFilterByProject); - this.companyTags$ = this.store.select(selectCompanyTags); - this.systemTags$ = this.store.select(selectProjectSystemTags); - this.tableMode$ = this.store.select(servingFeature.selectTableMode); - this.filteredTableCols$ = this.store.select(servingFeature.selectFilteredTableCols); - - this.tableCols$ = this.filteredTableCols$.pipe( - distinctUntilChanged(isEqual), - map(cols => cols.filter(col => !col.hidden)) - ); - - this.endpoints$ = this.store.select(servingFeature.selectSortedFilteredEndpoints).pipe( - filter(endpoints => endpoints !== null), - tap(endpoints => { - if (endpoints.length === 0) { - this.router.navigate(['..', 'active'], {relativeTo: this.route, queryParamsHandling: 'preserve'}); - } - }) - ) as Observable; this.syncAppSearch(); - this.setContextMenu(); + + this.endpoints$ + .pipe( + filter(endpoints => !!endpoints), + take(1), + filter(endpoints => endpoints.length === 0), + ) + .subscribe (() => { + this.router.navigate(['..', 'active'], {relativeTo: this.route, queryParamsHandling: 'preserve'}); + }); } override ngOnInit() { @@ -183,11 +164,7 @@ export class ServingComponent extends BaseEntityPageComponent implements OnInit, syncAppSearch() { this.store.dispatch(initSearch({payload: 'Search for endpoints'})); - this.sub.add(this.searchQuery$.pipe(skip(1)).subscribe(query => this.store.dispatch(ServingActions.globalFilterChanged(query)))); - } - - getNextEndpoints() { - this.store.dispatch(ServingActions.getNextServingEndpoints()); + // this.sub.add(this.searchQuery$.pipe(skip(1)).subscribe(query => this.store.dispatch(ServingActions.globalFilterChanged(query)))); } selectEndpointFromUrl() { diff --git a/src/app/webapp-common/serving/serving.consts.ts b/src/app/webapp-common/serving/serving.consts.ts index e1e14d13..1bda6ee7 100644 --- a/src/app/webapp-common/serving/serving.consts.ts +++ b/src/app/webapp-common/serving/serving.consts.ts @@ -4,7 +4,7 @@ import {HeaderNavbarTabConfig} from '@common/layout/header-navbar-tabs/header-na import {EndpointStats} from '~/business-logic/model/serving/endpointStats'; import {FilterMetadata} from 'primeng/api/filtermetadata'; import {SortMeta} from 'primeng/api'; -import {parseInt} from 'lodash-es'; +import {escapeRegExp, get, parseInt} from 'lodash-es'; import { ContainerInfo } from '~/business-logic/model/serving/containerInfo'; export const servingTableCols: ISmCol[] = [ @@ -144,8 +144,8 @@ export const endpointsStatsParamInfo = { }; export const modelServingRoutes = [ - {header: 'ACTIVE', subHeader: '', link: ['endpoints', 'active']}, - {header: 'LOADING', subHeader: '', link: ['endpoints', 'loading']} + {header: 'ACTIVE', subHeader: '', link: 'endpoints/active'}, + {header: 'LOADING', subHeader: '', link: 'endpoints/loading'} ] as HeaderNavbarTabConfig[]; export function sortAndFilterEndpoints(endpoints: EndpointStats[] | ContainerInfo[], filters: Record, sortFields: SortMeta[]): EndpointStats[] | ContainerInfo[] { @@ -177,3 +177,19 @@ export function sortAndFilterEndpoints(endpoints: EndpointStats[] | ContainerInf return res; }); } + +export const filterEndpoints = (endpoints, sq ) => { + let query = sq?.query.toLowerCase(); + try { + if (!sq?.regExp) { + query = escapeRegExp(query) + } + const exp = new RegExp(query, 'i'); + return endpoints?.filter(endpoint => + ['endpoint', 'model', 'id'].some(col => exp.test(get(endpoint, col) as unknown as string)) + ); + } + catch { + return endpoints; + } +} diff --git a/src/app/webapp-common/serving/serving.effects.ts b/src/app/webapp-common/serving/serving.effects.ts index 398fdb74..903078f4 100644 --- a/src/app/webapp-common/serving/serving.effects.ts +++ b/src/app/webapp-common/serving/serving.effects.ts @@ -52,7 +52,7 @@ export class ServingEffects { private tasksApi = inject(ApiTasksService); activeLoader = createEffect(() => this.actions$.pipe( - ofType(ServingActions.getNextServingEndpoints, ServingActions.fetchServingEndpoints, ServingActions.fetchServingLoadingEndpoints), + ofType(ServingActions.getNextServingEndpoints, ServingActions.fetchServingEndpoints, ServingActions.fetchLoadingEndpoints), filter((action) => !(action as unknown as ReturnType).hideLoader), map(() => activeLoader('Fetch Endpoint')) )); @@ -87,7 +87,7 @@ export class ServingEffects { reFetchEndpoint = createEffect(() => this.actions$.pipe( ofType( - ServingActions.fetchServingEndpoints, ServingActions.getNextServingEndpoints, ServingActions.fetchServingLoadingEndpoints + ServingActions.fetchServingEndpoints, ServingActions.fetchLoadingEndpoints ), switchMap((action) => this.store.select(selectActiveWorkspaceReady).pipe( filter(ready => ready), @@ -98,7 +98,7 @@ export class ServingEffects { .pipe( mergeMap(res => [ action.type === ServingActions.fetchServingEndpoints.type ? - ServingActions.setServingEndpoints({servingEndpoints: res.endpoints}) : ServingActions.setLoadingServingEndpoints({servingEndpoints: res.endpoints}), + ServingActions.setServingEndpoints({servingEndpoints: res.endpoints}) : ServingActions.setLoadingEndpoints({servingEndpoints: res.endpoints}), deactivateLoader('Fetch Endpoint') ]), catchError(error => [ @@ -158,7 +158,7 @@ export class ServingEffects { if (action.type === ServingActions.refreshEndpoints.type) { resActions.push(ServingActions.setServingEndpoints({servingEndpoints: res.endpoints})); } else { - resActions.push(ServingActions.setLoadingServingEndpoints({servingEndpoints: res.endpoints})); + resActions.push(ServingActions.setLoadingEndpoints({servingEndpoints: res.endpoints})); } } return resActions; @@ -416,13 +416,13 @@ export class ServingEffects { fromDate = now - range; } return this.servingApi.servingGetEndpointMetricsHistory({ - /* eslint-disable @typescript-eslint/naming-convention */ + endpoint_url: endpoint.url, metric_type: action.metricType, from_date: fromDate, to_date: now, interval: granularity - /* eslint-enable @typescript-eslint/naming-convention */ + }).pipe( map((res: ServingGetEndpointMetricsHistoryResponse) => { let result = []; diff --git a/src/app/webapp-common/serving/serving.module.ts b/src/app/webapp-common/serving/serving.module.ts index a3d6224f..5a9d2dab 100644 --- a/src/app/webapp-common/serving/serving.module.ts +++ b/src/app/webapp-common/serving/serving.module.ts @@ -47,6 +47,7 @@ import {IsRowSelectedPipe} from '@common/shared/ui-components/data/table/is-rwo- import {FileSizePipe} from '@common/shared/pipes/filesize.pipe'; import {MatIconButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; +import {CommonSearchComponent} from '@common/common-search/containers/common-search/common-search.component'; export const servingSyncedKeys = [ @@ -128,7 +129,8 @@ const getInitState = (userPreferences: UserPreferences) => ({ IsRowSelectedPipe, FileSizePipe, MatIconButton, - MatIcon + MatIcon, + CommonSearchComponent ], providers: [ SmFormBuilderService, DatePipe, diff --git a/src/app/webapp-common/serving/serving.reducer.ts b/src/app/webapp-common/serving/serving.reducer.ts index cc654a58..38830c52 100644 --- a/src/app/webapp-common/serving/serving.reducer.ts +++ b/src/app/webapp-common/serving/serving.reducer.ts @@ -2,12 +2,17 @@ import {createFeature, createReducer, createSelector, on} from '@ngrx/store'; import {ServingActions, servingLoadingTableColFields, servingTableColFields} from './serving.actions'; import {FilterMetadata} from 'primeng/api/filtermetadata'; import {SortMeta} from 'primeng/api'; -import {SearchState} from '@common/common-search/common-search.reducer'; +import {SearchState, selectSearchQuery} from '@common/common-search/common-search.reducer'; import {ISmCol, TABLE_SORT_ORDER} from '@common/shared/ui-components/data/table/table.consts'; import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; import {setSelectedProject} from '@common/core/actions/projects.actions'; import {TableFilter} from '@common/shared/utils/tableParamEncode'; -import {servingLoadingTableCols, servingTableCols, sortAndFilterEndpoints} from '@common/serving/serving.consts'; +import { + filterEndpoints, + servingLoadingTableCols, + servingTableCols, + sortAndFilterEndpoints +} from '@common/serving/serving.consts'; import {Topic} from '@common/shared/utils/statistics'; import {ServingGetEndpointDetailsResponse} from '~/business-logic/model/serving/servingGetEndpointDetailsResponse'; import {TIME_INTERVALS} from '@common/workers-and-queues/workers-and-queues.consts'; @@ -106,7 +111,7 @@ export const reducer = createReducer( })), on(ServingActions.setServingEndpoints, (state, action): State => ({...state, endpoints: action.servingEndpoints})), - on(ServingActions.setLoadingServingEndpoints, (state, action): State => + on(ServingActions.setLoadingEndpoints, (state, action): State => ({...state, loadingEndpoints: action.servingEndpoints})), on(ServingActions.setServingEndpointsInPlace, (state, action): State => ({ @@ -119,7 +124,7 @@ export const reducer = createReducer( on(ServingActions.setServingEndpointDetails, (state, action): State => ({...state, endpointDetails: action.endpoint})), on(ServingActions.globalFilterChanged, (state, action): State => - ({...state, globalFilter: action as ReturnType})), + ({...state, globalFilter: action})), on(ServingActions.resetGlobalFilter, (state): State => ({...state, globalFilter: initialState.globalFilter})), on(ServingActions.toggleColHidden, (state, action): State => @@ -263,21 +268,24 @@ export const servingFeature = createFeature({ order: TABLE_SORT_ORDER.DESC }] ); - const modelNamesOptions = createSelector(selectEndpoints, (endpoints) => - Array.from(new Set(endpoints?.map(endpoint => endpoint.model).filter(i => !!i) ?? []))) + const modelNamesOptions = createSelector(selectEndpoints,endpoints => + Array.from(new Set(endpoints?.map(endpoint => endpoint.model).filter(i => !!i) ?? []))); const modelLoadingNamesOptions = createSelector(selectLoadingEndpoints, (endpoints) => - Array.from(new Set(endpoints?.map(endpoint => endpoint.model).filter(i => !!i) ?? []))) + Array.from(new Set(endpoints?.map(endpoint => endpoint.model).filter(i => !!i) ?? []))); const inputTypesOptions = createSelector(selectLoadingEndpoints, (endpoints) => - Array.from(new Set(endpoints?.map(endpoint => endpoint.input_type).filter(i => !!i) ?? []))) + Array.from(new Set(endpoints?.map(endpoint => endpoint.input_type).filter(i => !!i) ?? []))); const preprocessArtifactOptions = createSelector(selectLoadingEndpoints, (endpoints) => - Array.from(new Set(endpoints?.map(endpoint => endpoint.preprocess_artifact).filter(i => !!i) ?? []))) - const selectSortedFilteredEndpoints = createSelector(selectEndpoints, selectColumnFilters, selectTableSortFields1, (endpoints, filters, sortFields) => { - return sortAndFilterEndpoints(endpoints, filters, sortFields); - }) - const selectLoadingSortedFilteredEndpoints = createSelector(selectLoadingEndpoints, selectLoadingColumnFilters, selectLoadingTableSortFields1, (endpoints, filters, sortFields) => { - return sortAndFilterEndpoints(endpoints, filters, sortFields); - }) + Array.from(new Set(endpoints?.map(endpoint => endpoint.preprocess_artifact).filter(i => !!i) ?? []))); + const selectSortedFilteredEndpoints = createSelector(selectEndpoints, selectColumnFilters, selectTableSortFields1, selectSearchQuery, + (endpoints, filters, sortFields, sq) => + filterEndpoints(sortAndFilterEndpoints(endpoints, filters, sortFields), sq) + ); + const selectLoadingSortedFilteredEndpoints = createSelector(selectLoadingEndpoints, selectLoadingColumnFilters, selectLoadingTableSortFields1, selectSearchQuery, + (endpoints, filters, sortFields, sq) => + filterEndpoints(sortAndFilterEndpoints(endpoints, filters, sortFields), sq) + ); const selectStatsFormMetric = (metricType: MetricTypeEnum) => createSelector(selectStats, (stats) => stats?.[metricType]); + const selectAllSeriesLegends = createSelector(selectStats, (stats) => Array.from(new Set(Object.values(stats).flat().map(a => a.topicName)))); return { selectServingTableColumns, selectLoadingServingTableColumns, @@ -290,7 +298,8 @@ export const servingFeature = createFeature({ inputTypesOptions, preprocessArtifactOptions, selectSortedFilteredEndpoints, - selectLoadingSortedFilteredEndpoints + selectLoadingSortedFilteredEndpoints, + selectAllSeriesLegends }; } }); diff --git a/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.html b/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.html index f8b9d967..f124404a 100644 --- a/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.html +++ b/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.html @@ -18,8 +18,8 @@
diff --git a/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.scss b/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.scss index 440b5ac0..913762b9 100644 --- a/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.scss +++ b/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - .admin-table { width: 100%; margin-top: 10px; diff --git a/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.ts b/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.ts index b9ebb2c5..8da76e90 100644 --- a/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.ts +++ b/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.ts @@ -4,9 +4,10 @@ import {TIME_FORMAT_STRING} from '@common/constants'; @Component({ - selector : 'sm-admin-credential-table', - templateUrl: './admin-credential-table.component.html', - styleUrls : ['./admin-credential-table.component.scss'] + selector: 'sm-admin-credential-table', + templateUrl: './admin-credential-table.component.html', + styleUrls: ['./admin-credential-table.component.scss'], + standalone: false }) export class AdminCredentialTableComponent extends AdminCredentialTableBaseDirective { timeFormatString = TIME_FORMAT_STRING; diff --git a/src/app/webapp-common/settings/admin/admin-dialog-template/admin-dialog-template.component.html b/src/app/webapp-common/settings/admin/admin-dialog-template/admin-dialog-template.component.html index 7f33a98e..97f055f9 100644 --- a/src/app/webapp-common/settings/admin/admin-dialog-template/admin-dialog-template.component.html +++ b/src/app/webapp-common/settings/admin/admin-dialog-template/admin-dialog-template.component.html @@ -18,7 +18,7 @@
@if (!serviceUserMode) { - + @@ -58,10 +58,10 @@ credentials {
- "access_key"="{{newCredential?.access_key}}" + "access_key"="{{newCredential?.access_key}}"
- "secret_key"="{{newCredential?.secret_key}}" + "secret_key"="{{newCredential?.secret_key}}"
} @@ -107,7 +107,7 @@ }
-
Add the below to your notebook to configure ClearML
+
Add the below to your notebook to configure ClearML
{{jupyterCode}}
= {}; private revokeSucceed = this.store.selectSignal(selectRevokeSucceed); + protected preSignServices = this.store.selectSignal(selectCompanyPreSignServices); private environment = this.confService.configuration; - private credentials = this.getCredentialsObservable() + private credentials = this.getCredentials(); private deleteS3FilesSubject: Subject<{ success: boolean; files: string[] }>; private localServerWorking = false; @@ -52,7 +54,7 @@ export class BaseAdminService { }); } - protected getCredentialsObservable() { + protected getCredentials() { return this.store.selectSignal(selectS3BucketCredentialsBucketCredentials); } @@ -85,6 +87,13 @@ export class BaseAdminService { return of({type: 'sign', signed: this.redirectToLocalServer(url), expires: Number.MAX_VALUE}); } + if (this.preSignServices().length > 0) { + const signed = this.redirectToSignServer(url); + if (signed !== url) { + return of({type: 'sign', signed, expires: Number.MAX_VALUE}); + } + } + if (this.isAzureUrl(url)) { const azureBucket = this.credentials().find((b) => b.Bucket && b.Bucket.toLowerCase() == 'azure'); if (azureBucket) { @@ -105,7 +114,7 @@ export class BaseAdminService { return from(getSignedUrl(s3, command, { expiresIn: FOUR_DAYS, unhoistableHeaders: new Set(['x-amz-content-sha256', 'x-id']), - unsignableHeaders: new Set(['x-amz-content-sha256', 'x-id']), + unsignableHeaders: new Set(['x-amz-content-sha256', 'x-id']) })) .pipe(map(signed => ({type: 'sign', signed, expires: (new Date()).getTime() + FOUR_DAYS * 1000}))); } else if (isGoogleCloudUrl(url) && !previousSignedUrl?.signed) { @@ -120,9 +129,9 @@ export class BaseAdminService { } findS3CredentialsInStore(bucketKeyEndpoint: Credentials) { - const endpoint = bucketKeyEndpoint.Endpoint?.replace(HTTP_REGEX,'') ?? ''; + const endpoint = bucketKeyEndpoint.Endpoint?.replace(HTTP_REGEX, '') ?? ''; return this.credentials() - .find(bucket => bucket?.Bucket === bucketKeyEndpoint.Bucket && (bucket?.Endpoint?.replace(HTTP_REGEX,'') ?? '') === endpoint); + .find(bucket => bucket?.Bucket === bucketKeyEndpoint.Bucket && (bucket?.Endpoint?.replace(HTTP_REGEX, '') ?? '') === endpoint); } findOrInitBucketS3(bucketKeyEndpoint: Credentials) { @@ -140,7 +149,7 @@ export class BaseAdminService { createS3Service(set) { // const [hostPort, path] = set.Endpoint?.split('/'); - const [hostname, port] = set.Endpoint?.replace(HTTP_REGEX,'')?.split(':') || ['', '']; + const [hostname, port] = set.Endpoint?.replace(HTTP_REGEX, '')?.split(':') || ['', '']; const config = { region: set.Region || DEFAULT_REGION, credentials: { @@ -153,11 +162,11 @@ export class BaseAdminService { protocol: set.Endpoint?.startsWith('https') ? 'https:' : 'http:', hostname, ...(!['80', '443'].includes(port) && {port}), - path: '', + path: '' }, forcePathStyle: true, - tls: false, - }), + tls: false + }) } as S3ClientConfig; return new S3Client(config); } @@ -175,6 +184,10 @@ export class BaseAdminService { return `http://localhost:${LOCAL_SERVER_PORT}${url.replace('file://', '/')}`; } + redirectToSignServer(url: string): string { + return url; + } + isLocalFile(url: string): boolean { return url && (url.startsWith('/') || url.startsWith('file://') || url.startsWith(':\\', 1) || url.startsWith('\\\\')); @@ -195,7 +208,7 @@ export class BaseAdminService { } signGoogleCloudUrl(url: string): string { - let result = url.slice(5); + let result = url.slice(5); if (result.search(/[ !"#$&'()*+,;<=>?@\[\\\]^]/) > -1) { result = result.split('/').map(part => encodeURIComponent(part)).join('/'); } @@ -254,7 +267,7 @@ export class BaseAdminService { try { const parsed = new URL(url); parsed.searchParams.append('X-Amz-Date', `${timestamp}`); - return parsed.toString(); + return parsed.toString(); } catch { return url; } diff --git a/src/app/webapp-common/settings/admin/profile-key-storage/profile-key-storage.component.scss b/src/app/webapp-common/settings/admin/profile-key-storage/profile-key-storage.component.scss index 60740003..17a2792a 100644 --- a/src/app/webapp-common/settings/admin/profile-key-storage/profile-key-storage.component.scss +++ b/src/app/webapp-common/settings/admin/profile-key-storage/profile-key-storage.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { display: grid; grid-template-rows: 70px minmax(0, 1fr); diff --git a/src/app/webapp-common/settings/admin/profile-key-storage/profile-key-storage.component.ts b/src/app/webapp-common/settings/admin/profile-key-storage/profile-key-storage.component.ts index d7cedb01..82c59c8a 100644 --- a/src/app/webapp-common/settings/admin/profile-key-storage/profile-key-storage.component.ts +++ b/src/app/webapp-common/settings/admin/profile-key-storage/profile-key-storage.component.ts @@ -8,15 +8,14 @@ import {FormsModule} from '@angular/forms'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; @Component({ - selector: 'sm-profile-key-storage', - templateUrl: './profile-key-storage.component.html', - styleUrls: ['./profile-key-storage.component.scss'], - standalone: true, - imports: [ - S3AccessComponent, - FormsModule, - TooltipDirective - ] + selector: 'sm-profile-key-storage', + templateUrl: './profile-key-storage.component.html', + styleUrls: ['./profile-key-storage.component.scss'], + imports: [ + S3AccessComponent, + FormsModule, + TooltipDirective + ] }) export class ProfileKeyStorageComponent { externalCredentials = input([]); diff --git a/src/app/webapp-common/settings/admin/profile-name/profile-name.component.html b/src/app/webapp-common/settings/admin/profile-name/profile-name.component.html index 0ad434ff..4738cafa 100644 --- a/src/app/webapp-common/settings/admin/profile-name/profile-name.component.html +++ b/src/app/webapp-common/settings/admin/profile-name/profile-name.component.html @@ -24,7 +24,13 @@
@if (currentUser().company?.id){
-
COMPANY
+
+ @if (config.configuration().communityServer) { + WORKSPACE + } @else { + COMPANY + } +
{{ currentUser().company.name }} diff --git a/src/app/webapp-common/settings/admin/profile-name/profile-name.component.scss b/src/app/webapp-common/settings/admin/profile-name/profile-name.component.scss index 9cc96703..6deaba2f 100644 --- a/src/app/webapp-common/settings/admin/profile-name/profile-name.component.scss +++ b/src/app/webapp-common/settings/admin/profile-name/profile-name.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { .header { gap: 24px; diff --git a/src/app/webapp-common/settings/admin/profile-name/profile-name.component.ts b/src/app/webapp-common/settings/admin/profile-name/profile-name.component.ts index 2109b6be..72a30c1d 100644 --- a/src/app/webapp-common/settings/admin/profile-name/profile-name.component.ts +++ b/src/app/webapp-common/settings/admin/profile-name/profile-name.component.ts @@ -1,23 +1,27 @@ -import {ChangeDetectionStrategy, Component, effect, signal, untracked} from '@angular/core'; +import {ChangeDetectionStrategy, Component, effect, inject, signal, untracked} from '@angular/core'; import {Store} from '@ngrx/store'; import {selectCurrentUser} from '@common/core/reducers/users-reducer'; import {getAllCredentials} from '@common/core/actions/common-auth.actions'; import {updateCurrentUser} from '@common/core/actions/users.actions'; import {GetCurrentUserResponseUserObject} from '~/business-logic/model/users/getCurrentUserResponseUserObject'; import {addMessage} from '@common/core/actions/layout.actions'; +import {ConfigurationService} from '@common/shared/services/configuration.service'; @Component({ - selector: 'sm-profile-name', - templateUrl: './profile-name.component.html', - styleUrls: ['./profile-name.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-profile-name', + templateUrl: './profile-name.component.html', + styleUrls: ['./profile-name.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ProfileNameComponent { + private store = inject(Store); + protected readonly config = inject(ConfigurationService); currentUser = this.store.selectSignal(selectCurrentUser); active = signal(false); - constructor(private store: Store) { + constructor() { effect(() => { if (this.currentUser()) { untracked(() => this.store.dispatch(getAllCredentials({}))); diff --git a/src/app/webapp-common/settings/admin/profile-preferences/profile-preferences.component.html b/src/app/webapp-common/settings/admin/profile-preferences/profile-preferences.component.html index 9e29a727..4a9434a0 100644 --- a/src/app/webapp-common/settings/admin/profile-preferences/profile-preferences.component.html +++ b/src/app/webapp-common/settings/admin/profile-preferences/profile-preferences.component.html @@ -59,7 +59,6 @@ >
-
Edit
-
- diff --git a/src/app/webapp-common/settings/admin/profile-preferences/profile-preferences.component.scss b/src/app/webapp-common/settings/admin/profile-preferences/profile-preferences.component.scss index ebf4cfd0..a2aead8f 100644 --- a/src/app/webapp-common/settings/admin/profile-preferences/profile-preferences.component.scss +++ b/src/app/webapp-common/settings/admin/profile-preferences/profile-preferences.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { display: block; diff --git a/src/app/webapp-common/settings/admin/profile-preferences/profile-preferences.component.ts b/src/app/webapp-common/settings/admin/profile-preferences/profile-preferences.component.ts index 6b9ebd8c..d355e7b7 100644 --- a/src/app/webapp-common/settings/admin/profile-preferences/profile-preferences.component.ts +++ b/src/app/webapp-common/settings/admin/profile-preferences/profile-preferences.component.ts @@ -22,18 +22,17 @@ import {MatButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-profile-preferences', - templateUrl: './profile-preferences.component.html', - styleUrls: ['./profile-preferences.component.scss'], - standalone: true, - imports: [ - MatSlideToggle, - TooltipDirective, - UsageStatsComponent, - MatButton, - MatIcon - ], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-profile-preferences', + templateUrl: './profile-preferences.component.html', + styleUrls: ['./profile-preferences.component.scss'], + imports: [ + MatSlideToggle, + TooltipDirective, + UsageStatsComponent, + MatButton, + MatIcon + ], + changeDetection: ChangeDetectionStrategy.OnPush }) export class ProfilePreferencesComponent { diff --git a/src/app/webapp-common/settings/admin/redacted-arguments-dialog/redacted-arguments-dialog.component.html b/src/app/webapp-common/settings/admin/redacted-arguments-dialog/redacted-arguments-dialog.component.html index d7e1d1f3..fd2ff2d5 100644 --- a/src/app/webapp-common/settings/admin/redacted-arguments-dialog/redacted-arguments-dialog.component.html +++ b/src/app/webapp-common/settings/admin/redacted-arguments-dialog/redacted-arguments-dialog.component.html @@ -15,8 +15,8 @@ [(ngModel)]="redactedArgument.key" placeholder="Argument"> - } diff --git a/src/app/webapp-common/settings/admin/redacted-arguments-dialog/redacted-arguments-dialog.component.ts b/src/app/webapp-common/settings/admin/redacted-arguments-dialog/redacted-arguments-dialog.component.ts index 5adc780e..305b4e3d 100644 --- a/src/app/webapp-common/settings/admin/redacted-arguments-dialog/redacted-arguments-dialog.component.ts +++ b/src/app/webapp-common/settings/admin/redacted-arguments-dialog/redacted-arguments-dialog.component.ts @@ -8,9 +8,10 @@ import {cloneDeep} from 'lodash-es'; @Component({ - selector: 'sm-redacted-arguments-dialog', - templateUrl: './redacted-arguments-dialog.component.html', - styleUrls: ['./redacted-arguments-dialog.component.scss'] + selector: 'sm-redacted-arguments-dialog', + templateUrl: './redacted-arguments-dialog.component.html', + styleUrls: ['./redacted-arguments-dialog.component.scss'], + standalone: false }) export class RedactedArgumentsDialogComponent implements OnInit, OnDestroy { diff --git a/src/app/webapp-common/settings/admin/s3-access/s3-access.component.html b/src/app/webapp-common/settings/admin/s3-access/s3-access.component.html index b1ea80fc..ba62916f 100644 --- a/src/app/webapp-common/settings/admin/s3-access/s3-access.component.html +++ b/src/app/webapp-common/settings/admin/s3-access/s3-access.component.html @@ -44,8 +44,8 @@ } - diff --git a/src/app/webapp-common/settings/admin/s3-access/s3-access.component.scss b/src/app/webapp-common/settings/admin/s3-access/s3-access.component.scss index 634f7a13..a49f5818 100644 --- a/src/app/webapp-common/settings/admin/s3-access/s3-access.component.scss +++ b/src/app/webapp-common/settings/admin/s3-access/s3-access.component.scss @@ -1,7 +1,6 @@ -@import "variables"; -@import "mixins/link"; +@use "mixins/link"; -@include link(); +@include link.link(); ::ng-deep body sm-s3-access .editable { padding: 0; background-color: var(--color-on-surface); diff --git a/src/app/webapp-common/settings/admin/s3-access/s3-access.component.ts b/src/app/webapp-common/settings/admin/s3-access/s3-access.component.ts index f571df1a..da8c7e1e 100644 --- a/src/app/webapp-common/settings/admin/s3-access/s3-access.component.ts +++ b/src/app/webapp-common/settings/admin/s3-access/s3-access.component.ts @@ -12,28 +12,27 @@ import {MatIcon} from '@angular/material/icon'; import {MAT_FORM_FIELD_DEFAULT_OPTIONS, MatFormFieldDefaultOptions} from '@angular/material/form-field'; @Component({ - selector: 'sm-s3-access', - templateUrl: './s3-access.component.html', - styleUrls: ['./s3-access.component.scss'], - standalone: true, - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - ReactiveFormsModule, - TooltipDirective, - MatInput, - MatFormField, - MatButton, - MatIcon, - MatIconButton - ], - providers: [ - { - provide: NG_VALUE_ACCESSOR, - useExisting: forwardRef(() => S3AccessComponent), - multi: true - }, - {provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: {subscriptSizing: 'dynamic'} as MatFormFieldDefaultOptions} - ] + selector: 'sm-s3-access', + templateUrl: './s3-access.component.html', + styleUrls: ['./s3-access.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + ReactiveFormsModule, + TooltipDirective, + MatInput, + MatFormField, + MatButton, + MatIcon, + MatIconButton + ], + providers: [ + { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => S3AccessComponent), + multi: true + }, + { provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { subscriptSizing: 'dynamic' } as MatFormFieldDefaultOptions } + ] }) export class S3AccessComponent implements ControlValueAccessor { private formBuilder = inject(FormBuilder); diff --git a/src/app/webapp-common/settings/settings.component.scss b/src/app/webapp-common/settings/settings.component.scss index 67b8227b..17639516 100644 --- a/src/app/webapp-common/settings/settings.component.scss +++ b/src/app/webapp-common/settings/settings.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { .settings-container mat-nav-list { diff --git a/src/app/webapp-common/settings/storage-credentials/aws-storage-credentials/aws-storage-credentials.component.scss b/src/app/webapp-common/settings/storage-credentials/aws-storage-credentials/aws-storage-credentials.component.scss index 5f51a01d..3f7ae8a7 100644 --- a/src/app/webapp-common/settings/storage-credentials/aws-storage-credentials/aws-storage-credentials.component.scss +++ b/src/app/webapp-common/settings/storage-credentials/aws-storage-credentials/aws-storage-credentials.component.scss @@ -1,6 +1,6 @@ -@import "variables"; -@import "mixins/link"; -@include link(); +@use "mixins/link"; + +@include link.link(); mat-checkbox { margin-bottom: 24px; diff --git a/src/app/webapp-common/settings/storage-credentials/aws-storage-credentials/aws-storage-credentials.component.ts b/src/app/webapp-common/settings/storage-credentials/aws-storage-credentials/aws-storage-credentials.component.ts index 40c9e7f1..5ac49a0c 100644 --- a/src/app/webapp-common/settings/storage-credentials/aws-storage-credentials/aws-storage-credentials.component.ts +++ b/src/app/webapp-common/settings/storage-credentials/aws-storage-credentials/aws-storage-credentials.component.ts @@ -1,6 +1,5 @@ import {ChangeDetectorRef, Component, inject, input, OnInit, output} from '@angular/core'; import {FormArray, FormBuilder, FormControl, FormGroup, FormGroupDirective, FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {MatExpansionPanel, MatExpansionPanelHeader, MatExpansionPanelTitle} from '@angular/material/expansion'; import {MatFormFieldModule, MatLabel} from '@angular/material/form-field'; import {MatInputModule} from '@angular/material/input'; import {MatCheckboxModule} from '@angular/material/checkbox'; @@ -32,26 +31,22 @@ type AWSForm = FormGroup<{ }> @Component({ - selector: 'sm-aws-storage-credentials', - standalone: true, - imports: [ - FormsModule, - MatExpansionPanel, - MatExpansionPanelHeader, - MatExpansionPanelTitle, - MatFormFieldModule, - MatInputModule, - MatLabel, - ReactiveFormsModule, - MatCheckboxModule, - TooltipDirective, - CopyClipboardComponent, - MatButton, - MatIcon, - MatIconButton, - ], - templateUrl: './aws-storage-credentials.component.html', - styleUrls: ['./aws-storage-credentials.component.scss', '../storage-credentials.scss'] + selector: 'sm-aws-storage-credentials', + imports: [ + FormsModule, + MatFormFieldModule, + MatInputModule, + MatLabel, + ReactiveFormsModule, + MatCheckboxModule, + TooltipDirective, + CopyClipboardComponent, + MatButton, + MatIcon, + MatIconButton, + ], + templateUrl: './aws-storage-credentials.component.html', + styleUrls: ['./aws-storage-credentials.component.scss', '../storage-credentials.scss'] }) export class AwsStorageCredentialsComponent implements OnInit { diff --git a/src/app/webapp-common/settings/storage-credentials/azure-storage-credentials/azure-storage-credentials.component.scss b/src/app/webapp-common/settings/storage-credentials/azure-storage-credentials/azure-storage-credentials.component.scss index 918b5c05..985e1d6e 100644 --- a/src/app/webapp-common/settings/storage-credentials/azure-storage-credentials/azure-storage-credentials.component.scss +++ b/src/app/webapp-common/settings/storage-credentials/azure-storage-credentials/azure-storage-credentials.component.scss @@ -1,6 +1,6 @@ -@import "variables"; -@import "mixins/link"; -@include link(); +@use "mixins/link"; + +@include link.link(); mat-form-field { min-width: 300px !important; diff --git a/src/app/webapp-common/settings/storage-credentials/azure-storage-credentials/azure-storage-credentials.component.ts b/src/app/webapp-common/settings/storage-credentials/azure-storage-credentials/azure-storage-credentials.component.ts index 3ddd5042..ba7392fe 100644 --- a/src/app/webapp-common/settings/storage-credentials/azure-storage-credentials/azure-storage-credentials.component.ts +++ b/src/app/webapp-common/settings/storage-credentials/azure-storage-credentials/azure-storage-credentials.component.ts @@ -1,9 +1,7 @@ import {ChangeDetectorRef, Component, inject, input, OnInit, output} from '@angular/core'; import {FormArray, FormBuilder, FormControl, FormGroup, FormGroupDirective, FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {MatExpansionPanel, MatExpansionPanelHeader, MatExpansionPanelTitle} from '@angular/material/expansion'; import {MatFormFieldModule, MatLabel} from '@angular/material/form-field'; import {MatInputModule} from '@angular/material/input'; -import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import {MatButton, MatIconButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; @@ -16,24 +14,19 @@ type AzureForm = FormGroup<{ }> @Component({ - selector: 'sm-azure-storage-credentials', - standalone: true, - imports: [ - FormsModule, - MatExpansionPanel, - MatExpansionPanelHeader, - MatExpansionPanelTitle, - MatFormFieldModule, - MatInputModule, - MatLabel, - ReactiveFormsModule, - TooltipDirective, - MatButton, - MatIcon, - MatIconButton - ], - templateUrl: './azure-storage-credentials.component.html', - styleUrls: ['./azure-storage-credentials.component.scss', '../storage-credentials.scss'] + selector: 'sm-azure-storage-credentials', + imports: [ + FormsModule, + MatFormFieldModule, + MatInputModule, + MatLabel, + ReactiveFormsModule, + MatButton, + MatIcon, + MatIconButton + ], + templateUrl: './azure-storage-credentials.component.html', + styleUrls: ['./azure-storage-credentials.component.scss', '../storage-credentials.scss'] }) export class AzureStorageCredentialsComponent implements OnInit { diff --git a/src/app/webapp-common/settings/storage-credentials/google-storage-credentials/google-storage-credentials.component.scss b/src/app/webapp-common/settings/storage-credentials/google-storage-credentials/google-storage-credentials.component.scss index 343018a4..1bbf435a 100644 --- a/src/app/webapp-common/settings/storage-credentials/google-storage-credentials/google-storage-credentials.component.scss +++ b/src/app/webapp-common/settings/storage-credentials/google-storage-credentials/google-storage-credentials.component.scss @@ -1,6 +1,6 @@ -@import "variables"; -@import "mixins/link"; -@include link(); +@use "mixins/link"; + +@include link.link(); mat-form-field { min-width: 300px !important; @@ -9,6 +9,7 @@ mat-form-field { .file-upload { display: inline-block; margin-bottom: 24px; + margin-right: 24px; width: 450px; &-input { diff --git a/src/app/webapp-common/settings/storage-credentials/google-storage-credentials/google-storage-credentials.component.ts b/src/app/webapp-common/settings/storage-credentials/google-storage-credentials/google-storage-credentials.component.ts index 1ad3d195..c62e8d05 100644 --- a/src/app/webapp-common/settings/storage-credentials/google-storage-credentials/google-storage-credentials.component.ts +++ b/src/app/webapp-common/settings/storage-credentials/google-storage-credentials/google-storage-credentials.component.ts @@ -1,6 +1,5 @@ import {ChangeDetectorRef, Component, inject, input, OnInit, output} from '@angular/core'; import {FormArray, FormBuilder, FormControl, FormGroup, FormGroupDirective, FormsModule, ReactiveFormsModule, Validators} from '@angular/forms'; -import {MatExpansionPanel, MatExpansionPanelHeader, MatExpansionPanelTitle} from '@angular/material/expansion'; import {MatFormFieldModule, MatLabel} from '@angular/material/form-field'; import {MatInputModule} from '@angular/material/input'; import {fromEvent} from 'rxjs'; @@ -22,23 +21,19 @@ type GoogleForm = FormGroup<{ }> @Component({ - selector: 'sm-google-storage-credentials', - standalone: true, - imports: [ - FormsModule, - MatExpansionPanel, - MatExpansionPanelHeader, - MatExpansionPanelTitle, - MatFormFieldModule, - MatInputModule, - MatLabel, - ReactiveFormsModule, - MatButton, - MatIcon, - MatIconButton, - ], - templateUrl: './google-storage-credentials.component.html', - styleUrls: ['./google-storage-credentials.component.scss', '../storage-credentials.scss'] + selector: 'sm-google-storage-credentials', + imports: [ + FormsModule, + MatFormFieldModule, + MatInputModule, + MatLabel, + ReactiveFormsModule, + MatButton, + MatIcon, + MatIconButton, + ], + templateUrl: './google-storage-credentials.component.html', + styleUrls: ['./google-storage-credentials.component.scss', '../storage-credentials.scss'] }) export class GoogleStorageCredentialsComponent implements OnInit { diff --git a/src/app/webapp-common/settings/storage-credentials/storage-credentials.component.scss b/src/app/webapp-common/settings/storage-credentials/storage-credentials.component.scss index f8238a79..99fa3c29 100644 --- a/src/app/webapp-common/settings/storage-credentials/storage-credentials.component.scss +++ b/src/app/webapp-common/settings/storage-credentials/storage-credentials.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - header { position: sticky; top: 0; diff --git a/src/app/webapp-common/settings/storage-credentials/storage-credentials.component.ts b/src/app/webapp-common/settings/storage-credentials/storage-credentials.component.ts index 0d4bc42c..04cf3e21 100644 --- a/src/app/webapp-common/settings/storage-credentials/storage-credentials.component.ts +++ b/src/app/webapp-common/settings/storage-credentials/storage-credentials.component.ts @@ -2,45 +2,35 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, effect, inject, s import {CredentialsSettingsActions} from '~/features/settings/settings.actions'; import {Store} from '@ngrx/store'; import {selectCredentials} from '~/features/settings/settings.selectors'; -import {TitleCasePipe, UpperCasePipe} from '@angular/common'; +import {UpperCasePipe} from '@angular/common'; import {MatFormFieldModule} from '@angular/material/form-field'; import {MatCheckboxModule} from '@angular/material/checkbox'; import {FormArray, FormBuilder, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms'; import {MatInputModule} from '@angular/material/input'; -import {MatExpansionPanel, MatExpansionPanelHeader, MatExpansionPanelTitle} from '@angular/material/expansion'; import {AzureStorageCredentialsComponent} from '@common/settings/storage-credentials/azure-storage-credentials/azure-storage-credentials.component'; import {GoogleStorageCredentialsComponent} from '@common/settings/storage-credentials/google-storage-credentials/google-storage-credentials.component'; import {AwsStorageCredentialsComponent} from '@common/settings/storage-credentials/aws-storage-credentials/aws-storage-credentials.component'; -import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import {MatButton, MatIconButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; -import {MatDialogClose} from '@angular/material/dialog'; @Component({ - selector: 'sm-storage-credentials', - templateUrl: './storage-credentials.component.html', - styleUrl: './storage-credentials.component.scss', - standalone: true, - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - MatFormFieldModule, - MatCheckboxModule, - MatInputModule, - ReactiveFormsModule, - MatExpansionPanel, - MatExpansionPanelHeader, - MatExpansionPanelTitle, - AzureStorageCredentialsComponent, - GoogleStorageCredentialsComponent, - AwsStorageCredentialsComponent, - TitleCasePipe, - UpperCasePipe, - TooltipDirective, - MatIconButton, - MatIcon, - MatButton, - MatDialogClose - ] + selector: 'sm-storage-credentials', + templateUrl: './storage-credentials.component.html', + styleUrl: './storage-credentials.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatFormFieldModule, + MatCheckboxModule, + MatInputModule, + ReactiveFormsModule, + AzureStorageCredentialsComponent, + GoogleStorageCredentialsComponent, + AwsStorageCredentialsComponent, + UpperCasePipe, + MatIconButton, + MatIcon, + MatButton, + ] }) export class StorageCredentialsComponent { diff --git a/src/app/webapp-common/settings/storage-credentials/storage-credentials.scss b/src/app/webapp-common/settings/storage-credentials/storage-credentials.scss index 21ebf272..c4fde7cd 100644 --- a/src/app/webapp-common/settings/storage-credentials/storage-credentials.scss +++ b/src/app/webapp-common/settings/storage-credentials/storage-credentials.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { border: 1px solid var(--color-surface-container-high); padding: 32px 24px; @@ -25,7 +23,7 @@ .trash { position: absolute; - right: 12px; + right: 6px; top: 6px; } diff --git a/src/app/webapp-common/settings/workspace-configuration/workspace-configuration.component.ts b/src/app/webapp-common/settings/workspace-configuration/workspace-configuration.component.ts index c9762f3e..65a7af3a 100644 --- a/src/app/webapp-common/settings/workspace-configuration/workspace-configuration.component.ts +++ b/src/app/webapp-common/settings/workspace-configuration/workspace-configuration.component.ts @@ -3,9 +3,10 @@ import {selectCurrentUser} from '@common/core/reducers/users-reducer'; import {Store} from '@ngrx/store'; @Component({ - selector: 'sm-workspace-configuration', - templateUrl: './workspace-configuration.component.html', - styleUrls: ['./workspace-configuration.component.scss'] + selector: 'sm-workspace-configuration', + templateUrl: './workspace-configuration.component.html', + styleUrls: ['./workspace-configuration.component.scss'], + standalone: false }) export class WorkspaceConfigurationComponent { diff --git a/src/app/webapp-common/shared/components/charts/donut/donut.component.ts b/src/app/webapp-common/shared/components/charts/donut/donut.component.ts index e158e7ec..64413f1a 100644 --- a/src/app/webapp-common/shared/components/charts/donut/donut.component.ts +++ b/src/app/webapp-common/shared/components/charts/donut/donut.component.ts @@ -17,16 +17,15 @@ export interface DonutChartData { } @Component({ - selector: 'sm-donut', - templateUrl: './donut.component.html', - styleUrls: ['./donut.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - BaseChartDirective, - ChooseColorModule, - PushPipe - ], + selector: 'sm-donut', + templateUrl: './donut.component.html', + styleUrls: ['./donut.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + BaseChartDirective, + ChooseColorModule, + PushPipe + ] }) export class DonutComponent { public doughnutChartType: ChartType = 'doughnut'; diff --git a/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.scss b/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.scss index a86875ea..5e85643a 100644 --- a/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.scss +++ b/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.scss @@ -1,12 +1,7 @@ -@import "variables"; - :host { - $chart-bar-height: 68px; - display: block; position: relative; background-color: transparent; - // background-color: var(--color-surface); border-radius: 6px; overflow: hidden; @@ -21,7 +16,6 @@ .loading { display: flex; align-items: center; - // transform: translateY(#{-1 * $chart-bar-height * 0.5}); } .text { diff --git a/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.ts b/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.ts index a0ea5399..0cd546c0 100644 --- a/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.ts +++ b/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.ts @@ -16,7 +16,7 @@ import 'chartjs-adapter-date-fns'; import {fileSizeConfigCount} from '@common/shared/pipes/filesize.pipe'; import {filesize} from 'filesize'; import {Store} from '@ngrx/store'; -import {selectThemeMode} from '@common/core/reducers/view.reducer'; +import {selectDarkTheme} from '@common/core/reducers/view.reducer'; declare module 'chart.js' { @@ -43,15 +43,14 @@ export interface concatLatestFrom { } @Component({ - selector: 'sm-line-chart', - templateUrl: './line-chart.component.html', - styleUrls: ['./line-chart.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - BaseChartDirective, - MatProgressSpinnerModule - ] + selector: 'sm-line-chart', + templateUrl: './line-chart.component.html', + styleUrls: ['./line-chart.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + BaseChartDirective, + MatProgressSpinnerModule + ] }) export class LineChartComponent { private readonly store = inject(Store); @@ -100,7 +99,7 @@ export class LineChartComponent { showLoadingOverlay = input(false); data = input(); - theme = this.store.selectSignal(selectThemeMode); + darkTheme = this.store.selectSignal(selectDarkTheme); chartData = computed>(() => { const topics = this.data(); @@ -138,7 +137,7 @@ export class LineChartComponent { autoSkip: true, autoSkipPadding: 50, maxRotation: 0, - ...(this.theme() === 'dark' && {color: '#c1cdf3'}), + ...(this.darkTheme() && {color: '#c1cdf3'}), }, time: { tooltipFormat: 'P pp', @@ -149,12 +148,16 @@ export class LineChartComponent { minute: 'p', second: 'pp' } + }, + grid: { + display: true, + ...(this.darkTheme() && {color: '#39405f'}), } }, y: { title: { display: !!this.yLabel(), text: this.yLabel(), - ...(this.theme() === 'dark' && {color: '#c1cdf3'}), + ...(this.darkTheme() && {color: '#c1cdf3'}), }, position: 'left', suggestedMin: 0, @@ -163,12 +166,12 @@ export class LineChartComponent { autoSkip: true, count: 5, precision: 0, - ...(this.theme() === 'dark' && {color: '#c1cdf3'}), + ...(this.darkTheme() && {color: '#c1cdf3'}), callback: value => typeof value === 'number' ? this.yTickFormatter()(value) : value }, grid: { display: true, - ...(this.theme() === 'dark' && {color: '#39405f'}), + ...(this.darkTheme() && {color: '#39405f'}), } } }, @@ -178,7 +181,7 @@ export class LineChartComponent { display: true, position: 'bottom', labels: { - ...(this.theme() === 'dark' && {color: '#dce0ee'}), + ...(this.darkTheme() && {color: '#dce0ee'}), font: {weight: 'normal', size: 12}, padding: 20, usePointStyle: true @@ -188,7 +191,7 @@ export class LineChartComponent { tooltip: { backgroundColor: '#1a1e2c', borderWidth: 1, - ...(this.theme() === 'dark' && { + ...(this.darkTheme() && { borderColor: '#8492c2', bodyColor: '#c3cdf0', }), @@ -201,7 +204,7 @@ export class LineChartComponent { }, hoverLine: { dash: [6, 6], - ...(this.theme() === 'dark' && { color: '#8492c2'}), + ...(this.darkTheme() && { color: '#8492c2'}), width: 1 } }, diff --git a/src/app/webapp-common/shared/components/charts/scatter-plot/scatter-plot.component.ts b/src/app/webapp-common/shared/components/charts/scatter-plot/scatter-plot.component.ts index 9f8cbb3c..327abcd9 100644 --- a/src/app/webapp-common/shared/components/charts/scatter-plot/scatter-plot.component.ts +++ b/src/app/webapp-common/shared/components/charts/scatter-plot/scatter-plot.component.ts @@ -17,15 +17,14 @@ Chart.register(zoomPlugin); @Component({ - selector: 'sm-scatter-plot', - templateUrl: './scatter-plot.component.html', - styleUrls: ['./scatter-plot.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - MatProgressSpinnerModule, - BaseChartDirective - ], - standalone: true + selector: 'sm-scatter-plot', + templateUrl: './scatter-plot.component.html', + styleUrls: ['./scatter-plot.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatProgressSpinnerModule, + BaseChartDirective + ] }) export class ScatterPlotComponent { public scatterChartType: ChartType = 'scatter'; diff --git a/src/app/webapp-common/shared/components/clear-filters-button/clear-filters-button.component.ts b/src/app/webapp-common/shared/components/clear-filters-button/clear-filters-button.component.ts index 10b4c026..c7875e22 100644 --- a/src/app/webapp-common/shared/components/clear-filters-button/clear-filters-button.component.ts +++ b/src/app/webapp-common/shared/components/clear-filters-button/clear-filters-button.component.ts @@ -1,19 +1,16 @@ import {ChangeDetectionStrategy, Component, computed, input, output} from '@angular/core'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import {MatIconButton} from '@angular/material/button'; -import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-clear-filters-button', - templateUrl: `./clear-filters-button.component.html`, - styleUrls: ['./clear-filters-button.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - TooltipDirective, - MatIconButton, - MatIcon - ] + selector: 'sm-clear-filters-button', + templateUrl: `./clear-filters-button.component.html`, + styleUrls: ['./clear-filters-button.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + TooltipDirective, + MatIconButton, + ] }) export class ClearFiltersButtonComponent { tableFilters = input(); diff --git a/src/app/webapp-common/shared/components/custom-columns-list/custom-columns-list.component.scss b/src/app/webapp-common/shared/components/custom-columns-list/custom-columns-list.component.scss index 74d0b1fb..fb8c9dfe 100644 --- a/src/app/webapp-common/shared/components/custom-columns-list/custom-columns-list.component.scss +++ b/src/app/webapp-common/shared/components/custom-columns-list/custom-columns-list.component.scss @@ -1,5 +1,3 @@ -@import 'variables'; - .list-container { overflow: auto; max-height: 60vh; diff --git a/src/app/webapp-common/shared/components/custom-columns-list/custom-columns-list.component.ts b/src/app/webapp-common/shared/components/custom-columns-list/custom-columns-list.component.ts index 46a082fb..80fefde7 100644 --- a/src/app/webapp-common/shared/components/custom-columns-list/custom-columns-list.component.ts +++ b/src/app/webapp-common/shared/components/custom-columns-list/custom-columns-list.component.ts @@ -4,15 +4,14 @@ import {MenuItemComponent} from '@common/shared/ui-components/panel/menu-item/me import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; @Component({ - selector: 'sm-custom-columns-list', - templateUrl: './custom-columns-list.component.html', - styleUrls: ['./custom-columns-list.component.scss'], - imports: [ - MenuItemComponent, - MatProgressSpinnerModule, -], - standalone: true, - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-custom-columns-list', + templateUrl: './custom-columns-list.component.html', + styleUrls: ['./custom-columns-list.component.scss'], + imports: [ + MenuItemComponent, + MatProgressSpinnerModule, + ], + changeDetection: ChangeDetectionStrategy.OnPush }) export class CustomColumnsListComponent { tableCols = input(); diff --git a/src/app/webapp-common/shared/components/dynamic-label-list/dynamic-label-list.component.html b/src/app/webapp-common/shared/components/dynamic-label-list/dynamic-label-list.component.html new file mode 100644 index 00000000..a83b8396 --- /dev/null +++ b/src/app/webapp-common/shared/components/dynamic-label-list/dynamic-label-list.component.html @@ -0,0 +1,12 @@ +@for (label of items(); track label) { +
+ +
+} +@if (hiddenLabels.length > 0) { +
+ +{{hiddenLabels.length}} +
+} diff --git a/src/app/webapp-common/shared/components/dynamic-label-list/dynamic-label-list.component.scss b/src/app/webapp-common/shared/components/dynamic-label-list/dynamic-label-list.component.scss new file mode 100644 index 00000000..668af804 --- /dev/null +++ b/src/app/webapp-common/shared/components/dynamic-label-list/dynamic-label-list.component.scss @@ -0,0 +1,21 @@ +:host { + display: flex; + gap: 4px; + align-items: center; + width: 100%; +} + +.measure { + opacity: 0; +} + +.hidden-items { + color: var(--color-on-surface); + padding: 2px 8px 2px 6px; + border-radius: 45%; + transition: background-color 0.3s ease-in-out; + + &:hover { + background-color: var(--color-surface-container-highest); + } +} diff --git a/src/app/webapp-common/shared/components/dynamic-label-list/dynamic-label-list.component.ts b/src/app/webapp-common/shared/components/dynamic-label-list/dynamic-label-list.component.ts new file mode 100644 index 00000000..c1142600 --- /dev/null +++ b/src/app/webapp-common/shared/components/dynamic-label-list/dynamic-label-list.component.ts @@ -0,0 +1,72 @@ +import { + ChangeDetectorRef, + Component, + ElementRef, + inject, + input, + TemplateRef, + viewChildren +} from '@angular/core'; +import {injectResize} from 'ngxtension/resize'; +import {combineLatest, map, distinctUntilChanged} from 'rxjs'; +import {takeUntilDestroyed, toObservable} from '@angular/core/rxjs-interop'; +import {NgTemplateOutlet} from '@angular/common'; +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {debounceTime} from 'rxjs/operators'; + +@Component({ + selector: 'sm-dynamic-label-list', + imports: [ + NgTemplateOutlet, + TooltipDirective + ], + templateUrl: './dynamic-label-list.component.html', + styleUrl: './dynamic-label-list.component.scss' +}) +export class DynamicLabelListComponent { + private readonly ref = inject(ElementRef); + private readonly cdr = inject(ChangeDetectorRef); + private overflowTrigger = injectResize() + .pipe( + map(res => res.width), + distinctUntilChanged() + ); + items = input(); + itemTemplate= input>(); + + private itemContainers = viewChildren>('itemContainer'); + + protected visibleLabelsLen = 0; + protected hiddenLabels = []; + protected measure = true; + + constructor() { + combineLatest([ + toObservable(this.itemContainers), + this.overflowTrigger + ]) + .pipe( + takeUntilDestroyed(), + debounceTime(0) + ) + .subscribe(([containers, resize]) => { + if (containers && resize) { + this.visibleLabelsLen = containers.length; + this.measure = true; + this.cdr.detectChanges(); + const itemsLengths = containers.map(container => container.nativeElement.offsetWidth); + let totalWidth = 32; + let len = 0 + const offsetWidth = this.ref.nativeElement.offsetWidth; + while (totalWidth < offsetWidth) { + totalWidth += itemsLengths[len]; + len++; + } + this.visibleLabelsLen = len - 2; + this.hiddenLabels = this.items().slice(len - 1); + this.measure = false; + this.cdr.markForCheck(); + } + }); + } +} diff --git a/src/app/webapp-common/shared/components/experiment-settings/experiment-settings.ts b/src/app/webapp-common/shared/components/experiment-settings/experiment-settings.ts index b8c8ea8d..c326633a 100644 --- a/src/app/webapp-common/shared/components/experiment-settings/experiment-settings.ts +++ b/src/app/webapp-common/shared/components/experiment-settings/experiment-settings.ts @@ -1,9 +1,10 @@ import {Component, input, output } from '@angular/core'; @Component({ - selector : 'sm-experiment-settings', - templateUrl: './experiment-settings.html', - styleUrls : ['./experiment-settings.scss'] + selector: 'sm-experiment-settings', + templateUrl: './experiment-settings.html', + styleUrls: ['./experiment-settings.scss'], + standalone: false }) export class ExperimentSettingsComponent { diff --git a/src/app/webapp-common/shared/components/id-badge/id-badge.component.ts b/src/app/webapp-common/shared/components/id-badge/id-badge.component.ts index 86eef464..0f9ea0fc 100644 --- a/src/app/webapp-common/shared/components/id-badge/id-badge.component.ts +++ b/src/app/webapp-common/shared/components/id-badge/id-badge.component.ts @@ -5,15 +5,14 @@ import {ClipboardModule} from 'ngx-clipboard'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; @Component({ - selector: 'sm-id-badge', - templateUrl: './id-badge.component.html', - styleUrls: ['./id-badge.component.scss'], - standalone: true, - imports: [ - TooltipDirective, - ClipboardModule, - ClickStopPropagationDirective - ] + selector: 'sm-id-badge', + templateUrl: './id-badge.component.html', + styleUrls: ['./id-badge.component.scss'], + imports: [ + TooltipDirective, + ClipboardModule, + ClickStopPropagationDirective + ] }) export class IdBadgeComponent { trigger = viewChild.required(MatMenuTrigger); diff --git a/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.scss b/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.scss index 7c1c92d6..2b6a82ca 100644 --- a/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.scss +++ b/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.scss @@ -1,5 +1,5 @@ -@import "variables"; -@import "src/app/webapp-common/assets/fonts/variables"; +@use "variables"; +@use "src/app/webapp-common/assets/fonts/variables" as font; $type-colors: ( string: #FF6B6B, @@ -38,8 +38,8 @@ $type-colors: ( } &::after { display: inline-block; - font-family: $icomoon-font-family; - content: $al-ico-ico-chevron-down; + font-family: font.$icomoon-font-family; + content: font.$al-ico-ico-chevron-down; font-size: 18px; transform: rotate(-90deg); transition: transform 0.1s ease-in, color 0.1s ease-in; @@ -81,12 +81,13 @@ $type-colors: ( background-color: var(--color-tertiary-container); border-radius: 4px; padding: 0 2px; - &.current { - background-color: var(--color-warning); - &::selection { - background-color: var(--color-surface-container-lowest); - color: var(--color-warning); - } + } + + .current .found { + background-color: var(--color-warning); + &::selection { + background-color: var(--color-surface-container-lowest); + color: var(--color-warning); } } @@ -121,7 +122,7 @@ $type-colors: ( mat-tree-node { --mat-tree-node-text-size: 12px; - --mat-tree-node-text-font: #{$font-family-monospace}; + --mat-tree-node-text-font: #{variables.$font-family-monospace}; line-height: normal; } } diff --git a/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.ts b/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.ts index b869fbe6..e465b5b4 100644 --- a/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.ts +++ b/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.ts @@ -2,7 +2,7 @@ import {ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, Out import {MatTreeFlatDataSource, MatTreeFlattener, MatTreeModule} from '@angular/material/tree'; import {FlatTreeControl} from '@angular/cdk/tree'; import {MatButtonModule} from '@angular/material/button'; -import { NgClass, NgTemplateOutlet } from '@angular/common'; +import {NgTemplateOutlet} from '@angular/common'; import {orderJson} from '@common/shared/utils/shared-utils'; export interface Segment { @@ -24,17 +24,15 @@ interface JsonChild { } @Component({ - selector: 'sm-json-viewer', - templateUrl: './json-viewer.component.html', - styleUrls: ['./json-viewer.component.scss'], - standalone: true, - imports: [ - MatButtonModule, - MatTreeModule, - NgClass, - NgTemplateOutlet -], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-json-viewer', + templateUrl: './json-viewer.component.html', + styleUrls: ['./json-viewer.component.scss'], + imports: [ + MatButtonModule, + MatTreeModule, + NgTemplateOutlet + ], + changeDetection: ChangeDetectionStrategy.OnPush }) export class JsonViewerComponent { private readonly treeFlattener: MatTreeFlattener; diff --git a/src/app/webapp-common/shared/components/main-pages-header-filter/main-pages-header-filter.component.html b/src/app/webapp-common/shared/components/main-pages-header-filter/main-pages-header-filter.component.html index 7743e8d1..656bc626 100644 --- a/src/app/webapp-common/shared/components/main-pages-header-filter/main-pages-header-filter.component.html +++ b/src/app/webapp-common/shared/components/main-pages-header-filter/main-pages-header-filter.component.html @@ -30,8 +30,8 @@
- Any - All + +
- +
(); smallIcon = input(false); position = input('below'); + wordBreak = input(false); } diff --git a/src/app/webapp-common/shared/components/paginated-entity-selector/paginated-entity-selector.component.html b/src/app/webapp-common/shared/components/paginated-entity-selector/paginated-entity-selector.component.html index b0274538..0d190602 100644 --- a/src/app/webapp-common/shared/components/paginated-entity-selector/paginated-entity-selector.component.html +++ b/src/app/webapp-common/shared/components/paginated-entity-selector/paginated-entity-selector.component.html @@ -1,6 +1,6 @@ - + @if (label(); as label) { - {{label}} + {{ label }} } (Create New) } - @for (entity of data() ; track entity.id) { + @for (entity of data(); track entity.id) {
{{ entity[this.displayField()] }}
 @@ -40,6 +40,6 @@
} - + diff --git a/src/app/webapp-common/shared/components/paginated-entity-selector/paginated-entity-selector.component.ts b/src/app/webapp-common/shared/components/paginated-entity-selector/paginated-entity-selector.component.ts index a764b156..b80ed187 100644 --- a/src/app/webapp-common/shared/components/paginated-entity-selector/paginated-entity-selector.component.ts +++ b/src/app/webapp-common/shared/components/paginated-entity-selector/paginated-entity-selector.component.ts @@ -1,17 +1,13 @@ -import { - ChangeDetectionStrategy, - Component, computed, - effect, - forwardRef, - input, - output, signal -} from '@angular/core'; +import {ChangeDetectionStrategy, Component, computed, effect, forwardRef, input, output, signal} from '@angular/core'; import { ControlValueAccessor, - NG_VALUE_ACCESSOR, FormControl, + NG_VALIDATORS, + NG_VALUE_ACCESSOR, ReactiveFormsModule, - NG_VALIDATORS, ValidationErrors, Validator, Validators + ValidationErrors, + Validator, + Validators } from '@angular/forms'; import {MatAutocompleteModule} from '@angular/material/autocomplete'; import {MatInputModule} from '@angular/material/input'; @@ -21,6 +17,7 @@ import {SearchTextDirective} from '@common/shared/ui-components/directives/searc import {DotsLoadMoreComponent} from '@common/shared/ui-components/indicators/dots-load-more/dots-load-more.component'; import {rootProjectsPageSize} from '@common/constants'; import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; +import {uniqueNameValidator} from '@common/shared/ui-components/template-forms-ui/unique-name-validator.directive'; export interface baseEntity { id?: string; @@ -28,32 +25,31 @@ export interface baseEntity { } @Component({ - selector: 'sm-paginated-entity-selector', - templateUrl: './paginated-entity-selector.component.html', - styleUrls: ['./paginated-entity-selector.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - providers: [ - { - provide: NG_VALUE_ACCESSOR, - useExisting: forwardRef(() => PaginatedEntitySelectorComponent), - multi: true - }, - { - provide: NG_VALIDATORS, - useExisting: forwardRef(() => PaginatedEntitySelectorComponent), - multi: true - } - ], - imports: [ - MatInputModule, - MatAutocompleteModule, - ReactiveFormsModule, - ClickStopPropagationDirective, - SearchTextDirective, - MatProgressSpinner, - DotsLoadMoreComponent, - ], + selector: 'sm-paginated-entity-selector', + templateUrl: './paginated-entity-selector.component.html', + styleUrls: ['./paginated-entity-selector.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + providers: [ + { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => PaginatedEntitySelectorComponent), + multi: true + }, + { + provide: NG_VALIDATORS, + useExisting: forwardRef(() => PaginatedEntitySelectorComponent), + multi: true + } + ], + imports: [ + MatInputModule, + MatAutocompleteModule, + ReactiveFormsModule, + ClickStopPropagationDirective, + SearchTextDirective, + MatProgressSpinner, + DotsLoadMoreComponent, + ] }) export class PaginatedEntitySelectorComponent implements ControlValueAccessor, Validator { protected control = new FormControl(null); @@ -66,7 +62,11 @@ export class PaginatedEntitySelectorComponent implements ControlValueAccessor, V label = input(); placeHolder = input(''); createNewSuffix = input(false); - isRequired = input(false) + isRequired = input(false); + minLength = input(); + emptyNameValidator = input(); + embeddedErrors = input(false); + getEntities = output(); loadMore = output(); @@ -99,6 +99,16 @@ export class PaginatedEntitySelectorComponent implements ControlValueAccessor, V } else { this.control.removeValidators([Validators.required]); } + if(this.minLength()) { + this.control.addValidators([Validators.minLength(this.minLength())]); + } else { + this.control.removeValidators([Validators.minLength(this.minLength())]); + } + if(this.emptyNameValidator()) { + this.control.addValidators([uniqueNameValidator([])]); + } else { + this.control.removeValidators([uniqueNameValidator([])]); + } this.control.updateValueAndValidity(); }); } @@ -141,7 +151,10 @@ export class PaginatedEntitySelectorComponent implements ControlValueAccessor, V } validate(/*control: AbstractControl*/): ValidationErrors | null { - return this.isRequired() && !this.control.value ? {required: true} : null; + return this.isRequired() && !this.control.value ? {required: true} : + (this.minLength() && this.control.value.length< this.minLength() ? { minlength: true} : + (this.emptyNameValidator() && this.control.value?.length > 0 && this.control.value.trim().length === 0 ? { emptyName: true} + : null)); } registerOnValidatorChange(fn) { diff --git a/src/app/webapp-common/shared/components/refresh-button/refresh-button.component.html b/src/app/webapp-common/shared/components/refresh-button/refresh-button.component.html index 137c94ec..7b076acc 100644 --- a/src/app/webapp-common/shared/components/refresh-button/refresh-button.component.html +++ b/src/app/webapp-common/shared/components/refresh-button/refresh-button.component.html @@ -42,11 +42,19 @@ (smHesitate)="showMenu.set(false)" #hesitateMenu="hesitate" > - - AUTO REFRESH - -
•
- + @if (showMenu()) { + + AUTO REFRESH + +
•
+ + }
-
+ @if (showMenu()) { +
+ } diff --git a/src/app/webapp-common/shared/components/refresh-button/refresh-button.component.scss b/src/app/webapp-common/shared/components/refresh-button/refresh-button.component.scss index aa401f59..cc19178e 100644 --- a/src/app/webapp-common/shared/components/refresh-button/refresh-button.component.scss +++ b/src/app/webapp-common/shared/components/refresh-button/refresh-button.component.scss @@ -6,28 +6,22 @@ justify-content: center; .refresh-wrapper { + position: relative; &.show-menu { - .tooltip-container, .tip { - opacity: 1; - pointer-events: auto; + .tooltip-container { + padding: 4px 6px 4px 12px; } } } .mdc-icon-button { .path_arrows { - fill: var(--color-outline); + fill: var(--color-primary); } .path_play, .path_pause { fill: var(--color-tertiary); } - - &:hover { - .path_arrows { - fill: var(--color-on-surface-variant); - } - } } .refresh { @@ -47,20 +41,16 @@ } .tooltip-container { - opacity: 0; - pointer-events: none; position: absolute; - right: 64px; + right: 42px; display: flex; align-items: center; - padding: 4px 12px; border-radius: 48px; background-color: var(--color-surface-container-low); line-height: normal; font-size: 12px; font-weight: 600; z-index: 10; - transition: opacity 0.3s 0.3s; .toggle-label { color: var(--color-on-primary-container); @@ -72,16 +62,18 @@ color: var(--color-primary); } } + + .dot { + margin: 0 3px 0 12px; + } } .tip { - opacity: 0; - pointer-events: none; content: ''; width: 16px; height: 16px; position: absolute; - right: 60px; + right: 38px; transform: rotate(45deg); background-color: var(--color-surface-container-low); transition: opacity 0.3s 0.3s; diff --git a/src/app/webapp-common/shared/components/refresh-button/refresh-button.component.ts b/src/app/webapp-common/shared/components/refresh-button/refresh-button.component.ts index 2b142ef6..ee9dc9b3 100644 --- a/src/app/webapp-common/shared/components/refresh-button/refresh-button.component.ts +++ b/src/app/webapp-common/shared/components/refresh-button/refresh-button.component.ts @@ -1,11 +1,10 @@ +import {animate, state, style, transition, trigger} from '@angular/animations'; import {Component, input, output, inject, signal} from '@angular/core'; import {RefreshService} from '@common/core/services/refresh.service'; import {Store} from '@ngrx/store'; import {selectAutoRefresh} from '@common/core/reducers/view.reducer'; -import { AsyncPipe } from '@angular/common'; import {FormsModule} from '@angular/forms'; import {HesitateDirective} from '@common/shared/ui-components/directives/hesitate.directive'; -import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; import {MatSlideToggle} from '@angular/material/slide-toggle'; import {MatButton, MatIconButton} from '@angular/material/button'; @@ -13,15 +12,20 @@ import {MatButton, MatIconButton} from '@angular/material/button'; selector: 'sm-refresh-button', templateUrl: './refresh-button.component.html', styleUrls: ['./refresh-button.component.scss'], - standalone: true, imports: [ - AsyncPipe, FormsModule, HesitateDirective, - ClickStopPropagationDirective, MatSlideToggle, MatIconButton, - MatButton + MatButton, + ], + animations: [ + trigger('fadeInOut', [ + state('void', style({ opacity: 0 })), // state when element is not present + state('*', style({ opacity: 1 })), // state when element is present + transition('void => *', animate('0.3s ease-in')), + transition('* => void', animate('0.3s ease-out')) + ]) ] }) export class RefreshButtonComponent { diff --git a/src/app/webapp-common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component.scss b/src/app/webapp-common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component.scss index b05251e8..5eb43fca 100644 --- a/src/app/webapp-common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component.scss +++ b/src/app/webapp-common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component.scss @@ -1,5 +1,3 @@ -@import 'variables'; - nav { --mat-tab-header-label-text-size: 12px; --mat-tab-header-label-text-letter-spacing: 0.03em; diff --git a/src/app/webapp-common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component.ts b/src/app/webapp-common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component.ts index 57994e13..53110764 100644 --- a/src/app/webapp-common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component.ts +++ b/src/app/webapp-common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component.ts @@ -1,12 +1,11 @@ import {Component, inject, viewChild, effect, input, ChangeDetectionStrategy} from '@angular/core'; import {BehaviorSubject} from 'rxjs'; import {MatTabNav, MatTabsModule} from '@angular/material/tabs'; -import { AsyncPipe, UpperCasePipe } from '@angular/common'; +import {UpperCasePipe} from '@angular/common'; import {Store} from '@ngrx/store'; import {selectRouterConfig} from '@common/core/reducers/router-reducer'; import {RouterLink, RouterLinkActive} from '@angular/router'; import {debounceTime} from 'rxjs/operators'; -import {PushPipe} from '@ngrx/component'; import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; export interface Link { @@ -16,19 +15,16 @@ export interface Link { } @Component({ - selector: 'sm-router-tab-nav-bar', - templateUrl: './router-tab-nav-bar.component.html', - styleUrls: ['./router-tab-nav-bar.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - AsyncPipe, - MatTabsModule, - RouterLink, - UpperCasePipe, - RouterLinkActive, - PushPipe -], - standalone: true + selector: 'sm-router-tab-nav-bar', + templateUrl: './router-tab-nav-bar.component.html', + styleUrls: ['./router-tab-nav-bar.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatTabsModule, + RouterLink, + UpperCasePipe, + RouterLinkActive, + ] }) export class RouterTabNavBarComponent { private store = inject(Store); diff --git a/src/app/webapp-common/shared/components/scroll-textarea/scroll-textarea.component.scss b/src/app/webapp-common/shared/components/scroll-textarea/scroll-textarea.component.scss index 48ae0f68..1b7776b9 100644 --- a/src/app/webapp-common/shared/components/scroll-textarea/scroll-textarea.component.scss +++ b/src/app/webapp-common/shared/components/scroll-textarea/scroll-textarea.component.scss @@ -1,4 +1,4 @@ -@import "variables"; +@use "variables"; :host { .diff-container { @@ -12,7 +12,7 @@ position: absolute; z-index: 100; top: 0; - right: 6px; + right: 10px; display: none; gap: 12px; padding: 12px; @@ -35,7 +35,7 @@ color: var(--color-on-surface-variant); } overflow-x: scroll; - font-family: $font-family-monospace; + font-family: variables.$font-family-monospace; .line { height: 20px; diff --git a/src/app/webapp-common/shared/components/scroll-textarea/scroll-textarea.component.ts b/src/app/webapp-common/shared/components/scroll-textarea/scroll-textarea.component.ts index 98449c84..1c5bca10 100644 --- a/src/app/webapp-common/shared/components/scroll-textarea/scroll-textarea.component.ts +++ b/src/app/webapp-common/shared/components/scroll-textarea/scroll-textarea.component.ts @@ -6,19 +6,18 @@ import {SearchComponent} from '@common/shared/ui-components/inputs/search/search import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; @Component({ - selector: 'sm-scroll-textarea', - templateUrl: './scroll-textarea.component.html', - styleUrls: ['./scroll-textarea.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - CopyClipboardComponent, - SearchComponent, - CdkVirtualScrollViewport, - CdkVirtualForOf, - MatProgressSpinnerModule, - CdkFixedSizeVirtualScroll, - ] + selector: 'sm-scroll-textarea', + templateUrl: './scroll-textarea.component.html', + styleUrls: ['./scroll-textarea.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + CopyClipboardComponent, + SearchComponent, + CdkVirtualScrollViewport, + CdkVirtualForOf, + MatProgressSpinnerModule, + CdkFixedSizeVirtualScroll, + ] }) export class ScrollTextareaComponent { search = ''; @@ -64,7 +63,7 @@ export class ScrollTextareaComponent { } } } - this.scroll().scrollToIndex(this.indexes[this.index]); + this.scroll().scrollToIndex(this.indexes[this.index] - 3); } resetSearch(value?: string) { diff --git a/src/app/webapp-common/shared/components/section-header/section-header.component.scss b/src/app/webapp-common/shared/components/section-header/section-header.component.scss index 6d9d6153..b59be554 100644 --- a/src/app/webapp-common/shared/components/section-header/section-header.component.scss +++ b/src/app/webapp-common/shared/components/section-header/section-header.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { display: flex; justify-content: space-between; diff --git a/src/app/webapp-common/shared/components/section-header/section-header.component.ts b/src/app/webapp-common/shared/components/section-header/section-header.component.ts index 1c34a622..1086e5bd 100644 --- a/src/app/webapp-common/shared/components/section-header/section-header.component.ts +++ b/src/app/webapp-common/shared/components/section-header/section-header.component.ts @@ -4,13 +4,12 @@ import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/ @Component({ - selector: 'sm-section-header', - templateUrl: './section-header.component.html', - styleUrls: ['./section-header.component.scss'], - standalone: true, - imports: [ - TooltipDirective -] + selector: 'sm-section-header', + templateUrl: './section-header.component.html', + styleUrls: ['./section-header.component.scss'], + imports: [ + TooltipDirective + ] }) export class SectionHeaderComponent { diff --git a/src/app/webapp-common/shared/components/select-metadata-keys-custom-cols/select-metadata-keys-custom-cols.component.scss b/src/app/webapp-common/shared/components/select-metadata-keys-custom-cols/select-metadata-keys-custom-cols.component.scss index 190e38df..a9101907 100644 --- a/src/app/webapp-common/shared/components/select-metadata-keys-custom-cols/select-metadata-keys-custom-cols.component.scss +++ b/src/app/webapp-common/shared/components/select-metadata-keys-custom-cols/select-metadata-keys-custom-cols.component.scss @@ -1,5 +1,3 @@ -@import 'variables'; - :host { display: block; diff --git a/src/app/webapp-common/shared/components/select-metadata-keys-custom-cols/select-metadata-keys-custom-cols.component.ts b/src/app/webapp-common/shared/components/select-metadata-keys-custom-cols/select-metadata-keys-custom-cols.component.ts index 9d24a648..04a1cbfd 100644 --- a/src/app/webapp-common/shared/components/select-metadata-keys-custom-cols/select-metadata-keys-custom-cols.component.ts +++ b/src/app/webapp-common/shared/components/select-metadata-keys-custom-cols/select-metadata-keys-custom-cols.component.ts @@ -7,18 +7,17 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; @Component({ - selector: 'sm-select-metadata-keys-custom-cols', - templateUrl: './select-metadata-keys-custom-cols.component.html', - styleUrls: ['./select-metadata-keys-custom-cols.component.scss'], - standalone: true, - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - SearchComponent, - MenuItemComponent, - SimpleFilterPipe, - MatProgressSpinnerModule, - ClickStopPropagationDirective -] + selector: 'sm-select-metadata-keys-custom-cols', + templateUrl: './select-metadata-keys-custom-cols.component.html', + styleUrls: ['./select-metadata-keys-custom-cols.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + SearchComponent, + MenuItemComponent, + SimpleFilterPipe, + MatProgressSpinnerModule, + ClickStopPropagationDirective + ] }) export class SelectMetadataKeysCustomColsComponent { searchText = signal(''); diff --git a/src/app/webapp-common/shared/components/show-only-user-work/show-only-user-work.component.ts b/src/app/webapp-common/shared/components/show-only-user-work/show-only-user-work.component.ts index f8bf32e5..4629a668 100644 --- a/src/app/webapp-common/shared/components/show-only-user-work/show-only-user-work.component.ts +++ b/src/app/webapp-common/shared/components/show-only-user-work/show-only-user-work.component.ts @@ -4,22 +4,19 @@ import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; import {MenuComponent} from '@common/shared/ui-components/panel/menu/menu.component'; import {MenuItemComponent} from '@common/shared/ui-components/panel/menu-item/menu-item.component'; -import {AsyncPipe} from '@angular/common'; import {selectShowOnlyUserWork} from '@common/core/reducers/users-reducer'; import {selectProjectType} from '@common/core/reducers/view.reducer'; import {PushPipe} from '@ngrx/component'; @Component({ - selector: 'sm-show-only-user-work', - templateUrl: './show-only-user-work.component.html', - styleUrls: ['./show-only-user-work.component.scss'], - standalone: true, - imports: [ - MenuComponent, - MenuItemComponent, - AsyncPipe, - PushPipe - ] + selector: 'sm-show-only-user-work', + templateUrl: './show-only-user-work.component.html', + styleUrls: ['./show-only-user-work.component.scss'], + imports: [ + MenuComponent, + MenuItemComponent, + PushPipe + ] }) export class ShowOnlyUserWorkComponent { public isUserMenuOpened: boolean; diff --git a/src/app/webapp-common/shared/components/virtual-grid/virtual-grid.component.html b/src/app/webapp-common/shared/components/virtual-grid/virtual-grid.component.html index c3611daa..3eec98d1 100644 --- a/src/app/webapp-common/shared/components/virtual-grid/virtual-grid.component.html +++ b/src/app/webapp-common/shared/components/virtual-grid/virtual-grid.component.html @@ -1,21 +1,25 @@ - +
+ [style.height.px]="cardHeight() + gridGap()" + *cdkVirtualFor="let row of itemRows$ | ngrxPush; trackBy: trackRow; let rowIndex = index" + > @for (item of row; track trackFn()(item) + cardHeight()) { - + } - @for (blankItem of [].constructor(cardsInRow - row.length); track blankItem) { + @for (blankItem of [].constructor(cardsInRow() - row.length); track trackByIndex($index)) {
}
@if (showLoadMoreButton() && (itemRows$ | ngrxPush)?.length) { -
+
} @else { @if (footerItem.icon) { @@ -25,7 +25,7 @@ mat-stroked-button (click)="footerItem.emit && footerItemClick.emit({item: footerItem, emitValue: footerItemState?.emitValue })" [disabled]="footerItemState?.disable" - [attr.data-id]="'compareOption'" + [attr.data-id]="'footer-' + footerItem.id" > {{footerItem.title ?? footerItemState.title}} @@ -35,7 +35,7 @@ mat-button (click)="footerItem.emit && footerItemClick.emit({item: footerItem, emitValue: footerItemState?.emitValue })" [disabled]="footerItemState?.disable" - [attr.data-id]="footerItem.title" + [attr.data-id]="'footer-' + footerItem.id" > {{footerItem.title ?? footerItemState.title}} @@ -56,6 +56,7 @@ [disabled]="footerItemState.disable" (menuOpened)="tagMenuOpened(tagMenu())" (menuClosed)="tagMenuClosed(tagMenu())" + [attr.data-id]="'footer-' + footerItem.id" > diff --git a/src/app/webapp-common/shared/entity-page/entity-footer/entity-footer.component.scss b/src/app/webapp-common/shared/entity-page/entity-footer/entity-footer.component.scss index 88a4ad51..0726dd53 100644 --- a/src/app/webapp-common/shared/entity-page/entity-footer/entity-footer.component.scss +++ b/src/app/webapp-common/shared/entity-page/entity-footer/entity-footer.component.scss @@ -1,4 +1,4 @@ -@import "../../../layout/layout"; +@use "../../../layout/layout"; :host { position: fixed; @@ -16,7 +16,7 @@ border-top:solid 2px var(--color-primary); position: fixed; left: 0; - height: $project-footer-height; + height: layout.$project-footer-height; width: 100%; padding-left: 76px; background-color: var(--color-surface-container-low); diff --git a/src/app/webapp-common/shared/entity-page/entity-footer/entity-footer.component.ts b/src/app/webapp-common/shared/entity-page/entity-footer/entity-footer.component.ts index 08569586..afcd80d5 100644 --- a/src/app/webapp-common/shared/entity-page/entity-footer/entity-footer.component.ts +++ b/src/app/webapp-common/shared/entity-page/entity-footer/entity-footer.component.ts @@ -10,19 +10,18 @@ import {MatButton, MatIconButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-entity-footer', - templateUrl: './entity-footer.component.html', - styleUrls: ['./entity-footer.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - TooltipDirective, - MatMenuModule, - TagsMenuComponent, - MatButton, - MatIconButton, - MatIcon - ], - standalone: true + selector: 'sm-entity-footer', + templateUrl: './entity-footer.component.html', + styleUrls: ['./entity-footer.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + TooltipDirective, + MatMenuModule, + TagsMenuComponent, + MatButton, + MatIconButton, + MatIcon + ] }) export class EntityFooterComponent extends BaseContextMenuComponent { diff --git a/src/app/webapp-common/shared/entity-page/footer-items/abort-all-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/abort-all-footer-item.ts index a997c337..53a9c588 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/abort-all-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/abort-all-footer-item.ts @@ -11,7 +11,7 @@ export class AbortAllChildrenFooterItem extends ItemFooterModel { this.icon = ICONS.STOPPED_ALL as Partial; } - getItemState(state: IFooterState): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { + getItemState(state: IFooterState<{id: string}>): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { const {available, disable} = selectionDisabledAbortAllChildren(state.selected); return { disable, diff --git a/src/app/webapp-common/shared/entity-page/footer-items/abort-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/abort-footer-item.ts index 364db57a..6f7c57d7 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/abort-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/abort-footer-item.ts @@ -1,5 +1,5 @@ import {ItemFooterModel, IFooterState} from './footer-items.models'; -import {IconNames, ICONS} from '../../../constants'; +import {IconNames, ICONS} from '@common/constants'; import {MenuItems, selectionDisabledAbort} from '../items.utils'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; @@ -11,7 +11,7 @@ export class AbortFooterItem extends ItemFooterModel { this.emit = true; this.icon = ICONS.STOPPED as Partial; } - getItemState(state: IFooterState) { + getItemState(state: IFooterState<{id: string}>) { const {available, disable} = selectionDisabledAbort(state.selected); return { disable, diff --git a/src/app/webapp-common/shared/entity-page/footer-items/archive-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/archive-footer-item.ts index afec4725..61002f6c 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/archive-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/archive-footer-item.ts @@ -10,7 +10,7 @@ export class ArchiveFooterItem extends ItemFooterModel { super(); } - getItemState(state: IFooterState): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { + getItemState(state: IFooterState<{id: string}>): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { const archive = state.data[this.id]; const icon = (state.selectionAllIsArchive ? ICONS.RESTORE : ICONS.ARCHIVE) as Partial; const name = icon === ICONS.RESTORE ? 'Restore' : 'Archive'; diff --git a/src/app/webapp-common/shared/entity-page/footer-items/compare-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/compare-footer-item.ts index 669bf24f..beb8cd77 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/compare-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/compare-footer-item.ts @@ -1,20 +1,20 @@ -import {IconNames, ICONS} from '../../../constants'; -import {EntityTypeEnum} from '../../../../shared/constants/non-common-consts'; +import {IconNames, ICONS} from '@common/constants'; +import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {MenuItems} from '../items.utils'; import { ItemFooterModel} from './footer-items.models'; export const compareLimitations = 100; export class CompareFooterItem extends ItemFooterModel { + override id = MenuItems.compare; + override icon = ICONS.COMPARE as Partial; + override class = 'compare'; + override title = 'COMPARE'; + override emit = true; constructor(public entitiesType: EntityTypeEnum) { super(); - this.id = MenuItems.compare; - this.icon = ICONS.COMPARE as Partial; - this.class = 'compare'; - this.title = 'COMPARE'; - this.emit = true; this.disableDescription = `${compareLimitations} or fewer ${this.entitiesType}s can be compared`; } - getItemState(state): any { + getItemState(state) { return { disable: state.selected.length > compareLimitations || state.selected?.length <2, }; diff --git a/src/app/webapp-common/shared/entity-page/footer-items/delete-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/delete-footer-item.ts index 3420acf4..fead979f 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/delete-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/delete-footer-item.ts @@ -1,5 +1,5 @@ import {ItemFooterModel, IFooterState} from './footer-items.models'; -import {IconNames, ICONS} from '../../../constants'; +import {IconNames, ICONS} from '@common/constants'; import {MenuItems} from '../items.utils'; export class DeleteFooterItem extends ItemFooterModel { @@ -12,7 +12,7 @@ export class DeleteFooterItem extends ItemFooterModel { this.disableDescription = 'Delete'; } - getItemState(state: IFooterState): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { + getItemState(state: IFooterState<{id: string}>): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { return { preventCurrentItem: !state.selectionAllIsArchive, disable: state.data[this.id]?.disable, diff --git a/src/app/webapp-common/shared/entity-page/footer-items/dequeue-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/dequeue-footer-item.ts index 0a2a22fa..a606249f 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/dequeue-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/dequeue-footer-item.ts @@ -11,7 +11,7 @@ export class DequeueFooterItem extends ItemFooterModel { this.icon = ICONS.DEQUEUE as Partial; } - getItemState(state: IFooterState): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { + getItemState(state: IFooterState<{id: string}>): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { const dequeue = state.data[this.id]; return { preventCurrentItem: dequeue?.disable, diff --git a/src/app/webapp-common/shared/entity-page/footer-items/divider-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/divider-footer-item.ts index d42b6525..5c28ab85 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/divider-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/divider-footer-item.ts @@ -1,10 +1,10 @@ import {GenericFooterItem} from './generic-footer-item'; -import {ItemState} from './footer-items.models'; export class DividerFooterItem extends GenericFooterItem { + override id = 'divider' override divider = true; - override getItemState(): ItemState + override getItemState() { return {}; } diff --git a/src/app/webapp-common/shared/entity-page/footer-items/enqueue-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/enqueue-footer-item.ts index f51b2bfe..8d0071e9 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/enqueue-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/enqueue-footer-item.ts @@ -11,7 +11,7 @@ export class EnqueueFooterItem extends ItemFooterModel { this.icon = ICONS.ENQUEUE as Partial; } - getItemState(state: IFooterState): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { + getItemState(state: IFooterState<{id: string}>): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { const enqueue = state.data[this.id]; return { diff --git a/src/app/webapp-common/shared/entity-page/footer-items/footer-items.models.ts b/src/app/webapp-common/shared/entity-page/footer-items/footer-items.models.ts index f294ce38..986a820a 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/footer-items.models.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/footer-items.models.ts @@ -9,7 +9,7 @@ export interface ItemState { disable?: boolean; disableDescription?: string; emit?: boolean; - emitValue?: any; + emitValue?: unknown; preventCurrentItem?: boolean; class?: string; wrapperClass?: string; @@ -24,7 +24,7 @@ export interface IItemFooterState { icon?: Partial; title?: string; description?: string; - emitValue?: any; + emitValue?: unknown; disableDescription?: string; disable?: boolean; class?: string; @@ -50,10 +50,10 @@ export abstract class ItemFooterModel { tagsFilterByProject$?: Observable; menuItemText = new MenuItemTextPipe(); - abstract getItemState(state: IFooterState): ItemState; + abstract getItemState(state: IFooterState<{id: string}>): ItemState; } -export interface IFooterState { +export interface IFooterState { selectionHasExample: boolean; selectionAllHasExample: boolean; selected: T[]; diff --git a/src/app/webapp-common/shared/entity-page/footer-items/generic-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/generic-footer-item.ts index fe9cdd2d..10faa2cf 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/generic-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/generic-footer-item.ts @@ -1,5 +1,5 @@ -import {IFooterState, ItemFooterModel} from './footer-items.models'; -import {IconNames} from '../../../constants'; +import {ItemFooterModel} from './footer-items.models'; +import {IconNames} from '@common/constants'; export class GenericFooterItem extends ItemFooterModel { constructor({icon = null, @@ -17,7 +17,7 @@ export class GenericFooterItem extends ItemFooterModel { this.emit = true; } - getItemState(state: IFooterState): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { + getItemState(): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { return {}; } } diff --git a/src/app/webapp-common/shared/entity-page/footer-items/has-read-only-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/has-read-only-footer-item.ts index 81c92849..99ffcf90 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/has-read-only-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/has-read-only-footer-item.ts @@ -1,17 +1,14 @@ import {ItemFooterModel, IFooterState} from './footer-items.models'; -import {IconNames, ICONS} from '../../../constants'; +import {IconNames, ICONS} from '@common/constants'; export class HasReadOnlyFooterItem extends ItemFooterModel { + override id = 'exampleItem'; + override emit = true; + override icon = ICONS.ALERT as Partial; + override description = `Selected read-only items cannot be modified`; + override wrapperClass = 'has-example-item'; - constructor() { - super(); - this.emit = true; - this.icon = ICONS.ALERT as Partial; - this.description = `Selected read-only items cannot be modified`; - this.wrapperClass = 'has-example-item'; - } - - getItemState(state: IFooterState): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { + getItemState(state: IFooterState<{id: string}>): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { return { preventCurrentItem: !state.selectionHasExample, title: `Selected read-only items cannot be modified` diff --git a/src/app/webapp-common/shared/entity-page/footer-items/move-to-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/move-to-footer-item.ts index 61fce9cb..28e8b2b3 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/move-to-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/move-to-footer-item.ts @@ -1,5 +1,5 @@ import {ItemFooterModel, IFooterState} from './footer-items.models'; -import {IconNames, ICONS} from '../../../constants'; +import {IconNames, ICONS} from '@common/constants'; import {MenuItems} from '../items.utils'; export class MoveToFooterItem extends ItemFooterModel { @@ -11,7 +11,7 @@ export class MoveToFooterItem extends ItemFooterModel { this.disableDescription = 'Move To'; } - getItemState(state: IFooterState): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { + getItemState(state: IFooterState<{id: string}>): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { return { disable: state.data[this.id]?.disable, description: this.menuItemText.transform(state.data[MenuItems.moveTo]?.available, 'Move To') , diff --git a/src/app/webapp-common/shared/entity-page/footer-items/publish-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/publish-footer-item.ts index 8a36754d..586acf29 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/publish-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/publish-footer-item.ts @@ -1,7 +1,7 @@ import {IFooterState, ItemFooterModel} from './footer-items.models'; -import {IconNames, ICONS} from '../../../constants'; +import {IconNames, ICONS} from '@common/constants'; import {MenuItems} from '../items.utils'; -import {EntityTypeEnum} from '../../../../shared/constants/non-common-consts'; +import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; export class PublishFooterItem extends ItemFooterModel { @@ -13,7 +13,7 @@ export class PublishFooterItem extends ItemFooterModel { this.icon = ICONS.PUBLISHED as Partial; } - getItemState(state: IFooterState): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { + getItemState(state: IFooterState<{id: string}>): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { return { disable: state.data[this.id]?.disable, description: this.menuItemText.transform(state.data[MenuItems.publish]?.available, 'Publish'), diff --git a/src/app/webapp-common/shared/entity-page/footer-items/reset-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/reset-footer-item.ts index cb5b3350..3e54369c 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/reset-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/reset-footer-item.ts @@ -1,7 +1,7 @@ import {ItemFooterModel, IFooterState} from './footer-items.models'; -import {TaskStatusEnum} from '../../../../business-logic/model/tasks/taskStatusEnum'; +import {TaskStatusEnum} from '~/business-logic/model/tasks/taskStatusEnum'; import {MenuItems} from '../items.utils'; -import {EntityTypeEnum} from '../../../../shared/constants/non-common-consts'; +import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {IconNames, ICONS} from '@common/constants'; export class ResetFooterItem extends ItemFooterModel { @@ -13,7 +13,7 @@ export class ResetFooterItem extends ItemFoo this.icon = ICONS.RESET as Partial; } - getItemState(state: IFooterState): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { + getItemState(state: IFooterState<{id: string}>): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { return { disable: state.data[this.id]?.disable, description: this.menuItemText.transform(state.data[this.id]?.available, 'Reset'), diff --git a/src/app/webapp-common/shared/entity-page/footer-items/retry-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/retry-footer-item.ts index 91abe8ed..d546a115 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/retry-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/retry-footer-item.ts @@ -11,7 +11,7 @@ export class RetryFooterItem extends ItemFooterModel { this.icon = ICONS.RETRY as Partial; } - getItemState(state: IFooterState): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { + getItemState(state: IFooterState<{id: string}>): { icon?: IconNames; title?: string; description?: string; disable?: boolean; disableDescription?: string; emit?: boolean; emitValue?: boolean; preventCurrentItem?: boolean; class?: string; wrapperClass?: string } { const retry = state.data[this.id]; return { diff --git a/src/app/webapp-common/shared/entity-page/footer-items/selected-tags-footer-item.ts b/src/app/webapp-common/shared/entity-page/footer-items/selected-tags-footer-item.ts index 42d1c0f2..4b7c3d51 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/selected-tags-footer-item.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/selected-tags-footer-item.ts @@ -1,4 +1,4 @@ -import {EntityTypeEnum} from '../../../../shared/constants/non-common-consts'; +import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {IFooterState, ItemFooterModel} from './footer-items.models'; import {MenuItems, selectionTags} from '../items.utils'; @@ -13,13 +13,7 @@ export class SelectedTagsFooterItem extends ItemFooterModel { this.disableDescription = 'Tags'; } - getItemState(state: IFooterState): { - icon?: any; title?: string; description?: string; disable?: boolean; disableDescription?: string; - emit?: boolean; emitValue?: any; preventCurrentItem?: boolean; class?: string; wrapperClass?: string; tags: string[]; - companyTags: string[]; - projectTags: string[]; - tagsFilterByProject: boolean; - } { + getItemState(state: IFooterState<{id: string; tags: string[]}>) { const tags = state.data[this.id]; return { disable: state.selectionAllHasExample, diff --git a/src/app/webapp-common/shared/entity-page/footer-items/show-items-footer-selected.ts b/src/app/webapp-common/shared/entity-page/footer-items/show-items-footer-selected.ts index b40356ee..ac869be0 100644 --- a/src/app/webapp-common/shared/entity-page/footer-items/show-items-footer-selected.ts +++ b/src/app/webapp-common/shared/entity-page/footer-items/show-items-footer-selected.ts @@ -1,4 +1,4 @@ -import {EntityTypeEnum} from '../../../../shared/constants/non-common-consts'; +import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {IFooterState, ItemFooterModel} from './footer-items.models'; import {MenuItems} from '../items.utils'; @@ -12,7 +12,7 @@ export class ShowItemsFooterSelected extends ItemFooterModel { } - getItemState(state: IFooterState) { + getItemState(state: IFooterState<{id: string}>) { return { title: state.showAllSelectedIsActive ? `SHOW ALL ${this.entitiesType.toUpperCase()}S` : diff --git a/src/app/webapp-common/shared/entity-page/items.utils.ts b/src/app/webapp-common/shared/entity-page/items.utils.ts index e42153bf..b5787bf8 100644 --- a/src/app/webapp-common/shared/entity-page/items.utils.ts +++ b/src/app/webapp-common/shared/entity-page/items.utils.ts @@ -4,7 +4,7 @@ import {TasksArchiveManyResponse} from '~/business-logic/model/tasks/tasksArchiv import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {addMessage} from '@common/core/actions/layout.actions'; import {openMoreInfoPopup} from '@common/core/actions/projects.actions'; -import { TaskTypeEnum } from '~/business-logic/model/tasks/taskTypeEnum'; +import {TaskTypeEnum} from '~/business-logic/model/tasks/taskTypeEnum'; import {Task} from '~/business-logic/model/tasks/task'; import {TASKS_STATUS} from '@common/tasks/tasks.constants'; import {TASK_TYPES} from '~/app.constants'; @@ -14,18 +14,19 @@ export interface CountAvailableAndIsDisable { available: number; disable: boolean; } + export interface CountAvailableAndIsDisableSelectedFiltered extends CountAvailableAndIsDisable { selectedFiltered: any[]; } export const countAvailableAndIsDisable = (selectedFiltered: any[]) => ({ available: selectedFiltered.length, - disable: selectedFiltered.length === 0 + disable: selectedFiltered.length === 0 }); export const selectionHasExample = (selectedElements: any[]) => selectedElements.some((exp => isReadOnly(exp))); export const selectionAllHasExample = (selectedElements: any[]) => selectedElements.every((exp => isReadOnly(exp))); -export const selectionAllIsArchive = (selectedElements: any[]) => selectedElements.every( s => s?.system_tags?.includes('archived')); +export const selectionAllIsArchive = (selectedElements: any[]) => selectedElements.every(s => s?.system_tags?.includes('archived')); export const selectionIsArchive = (selectedElements: any) => selectedElements?.system_tags?.includes('archived'); export const selectionExamplesCount = (selectedElements: any) => selectedElements.filter((exp => isReadOnly(exp))); export const canEnqueue = (task: Task): boolean => @@ -41,36 +42,36 @@ export const canContinue = (task: Task): boolean => !!(task && [TASKS_STATUS.CREATED, TASKS_STATUS.STOPPED].includes(task.status) && task.type !== TASK_TYPES.MANUAL_ANNOTATION) && !!task.execution?.queue; export const selectionDisabledAbort = (selectedElements: any[]) => { - const selectedFiltered = selectedElements.filter( (_selected) => [TaskStatusEnum.Queued, TaskStatusEnum.InProgress].includes(_selected?.status) && !isReadOnly(_selected)); + const selectedFiltered = selectedElements.filter((_selected) => [TaskStatusEnum.Queued, TaskStatusEnum.InProgress].includes(_selected?.status) && !isReadOnly(_selected)); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; export const selectionDisabledPublishExperiments = (selectedElements: any[]) => { - const selectedFiltered = selectedElements.filter(_selected => ([TaskStatusEnum.Stopped, TaskStatusEnum.Closed, 'completed', TaskStatusEnum.Failed].includes(_selected?.status) && !isReadOnly(_selected)) ); + const selectedFiltered = selectedElements.filter(_selected => ([TaskStatusEnum.Stopped, TaskStatusEnum.Closed, 'completed', TaskStatusEnum.Failed].includes(_selected?.status) && !isReadOnly(_selected))); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; export const selectionDisabledPublishModels = (selectedElements: any[]) => { - const selectedFiltered = selectedElements.filter(_selected => (!isReadOnly(_selected) && !_selected?.ready) ); + const selectedFiltered = selectedElements.filter(_selected => (!isReadOnly(_selected) && !_selected?.ready)); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; export const selectionDisabledReset = (selectedElements: any[]) => { - const selectedFiltered = selectedElements.filter(_selected => ![TaskStatusEnum.Created, TaskStatusEnum.Published, TaskStatusEnum.Publishing].includes(_selected?.status) && !isReadOnly(_selected)); + const selectedFiltered = selectedElements.filter(_selected => ![TaskStatusEnum.Created, TaskStatusEnum.Published, TaskStatusEnum.Publishing].includes(_selected?.status) && !isReadOnly(_selected)); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; export const selectionDisabledAbortAllChildren = (selectedElements: any[]) => { - const selectedFiltered = selectedElements.filter(_selected => [TaskTypeEnum.Controller, TaskTypeEnum.Optimizer].includes(_selected?.type) && !isReadOnly(_selected)); + const selectedFiltered = selectedElements.filter(_selected => [TaskTypeEnum.Controller, TaskTypeEnum.Optimizer].includes(_selected?.type) && !isReadOnly(_selected)); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; export const selectionDisabledDelete = (selectedElements: any[]) => { - const selectedFiltered = selectedElements.filter(_selected => selectionIsArchive(_selected) && !isReadOnly(_selected)); + const selectedFiltered = selectedElements.filter(_selected => selectionIsArchive(_selected) && !isReadOnly(_selected)); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; export const selectionDisabledMoveTo = (selectedElements: any[]) => { - const selectedFiltered = selectedElements.filter(_selected => !isReadOnly(_selected)); + const selectedFiltered = selectedElements.filter(_selected => !isReadOnly(_selected)); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; -export const selectionDisabledQueue = (selectedElements: {id?: string; status?: string}[]) => { +export const selectionDisabledQueue = (selectedElements: { id?: string; status?: string }[]) => { if (selectedElements.length > 1) { return {selectedFiltered: [], disable: true, available: 0}; } @@ -92,6 +93,10 @@ export const selectionDisabledEnqueue = (selectedElements: any[]) => { const selectedFiltered = selectedElements.filter(_selected => canEnqueue(_selected) && !isReadOnly(_selected)); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; +export const selectionDisabledPipelineRun = (selectedElements: any[]) => { + const selectedFiltered = selectedElements.filter(_selected => !isReadOnly(_selected)); + return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; +}; export const selectionDisabledRetry = (selectedElements: any[]) => { const selectedFiltered = selectedElements.filter(_selected => canRetry(_selected) && !isReadOnly(_selected)); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; @@ -109,10 +114,10 @@ export const selectionDisabledTags = (selectedElements: any[]) => { return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; -export const selectionTags = (selectedElements: T[]): string[] => { +export const selectionTags = (selectedElements: T[]): string[] => { const _selectedTags = {}; - selectedElements.forEach( _selected => { - _selected?.tags?.forEach( tag => { + selectedElements.forEach(_selected => { + _selected?.tags?.forEach(tag => { if (!_selectedTags[tag]) { _selectedTags[tag] = 1; } else { @@ -120,15 +125,15 @@ export const selectionTags = (selectedElements: T[] } }); }); - return Object.entries(_selectedTags) + return Object.entries(_selectedTags) .filter(([, amount]) => amount === selectedElements.length) - .map( ([tag]) => tag); + .map(([tag]) => tag); }; export enum MenuItems { abort = 'abort', - abortAllChildren='abortAllChildren', - run='runPipeline', + abortAllChildren = 'abortAllChildren', + run = 'runPipeline', archive = 'archive', compare = 'compare', delete = 'delete', @@ -144,6 +149,7 @@ export enum MenuItems { continue = 'continue', retry = 'retry' } + export enum MoreMenuItems { restore = 'restore' } diff --git a/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.component.html b/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.component.html index cf91e486..3472e366 100644 --- a/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.component.html +++ b/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.component.html @@ -1,163 +1,172 @@ -@if (hiddenList()?.length === 0 || graphsState().noGraphs() && !(multipleSingleValueData()?.data.length > 0) && !(singleValueData()?.length > 0)) { +@if ( + !loading() && + (hiddenList()?.length === 0 || graphsState().noGraphs()) && + !(multipleSingleValueData()?.data.length > 0 && hiddenList()?.length !== 0) && + !(singleValueData()?.length > 0 && hiddenList()?.length !== 0) + ) {
- - @if (graphsState().graphList().length > 0) { + + @if (graphsState().graphList().length > 0 || multipleSingleValueData()?.data.length > 0 || singleValueData()?.length > 0) {

ALL CHARTS ARE HIDDEN

} @else {

NO CHART DATA

}
} - -
- @if (singleValueData()?.length > 0 && hiddenList().includes(singleValueChartTitle)) { -
- @if (exportForReport()) { - +
+ @if (singleValueData()?.length > 0 && hiddenList()?.includes(singleValueChartTitle)) { +
+ @if (exportForReport()) { + + } @else { + + } +
+ } + @if (plotlyReady() && multipleSingleValueData()?.data.length > 0) { +
+ - } @else { - - } -
- } - @if (multipleSingleValueData()?.data.length > 0) { -
- -
- } -
- @for (metric of (graphsState().graphList()); track metric) { -
-
-
- @if (isGroupGraphs()) { -
-
-
{{ metric }} - @if (graphsData()[metric]?.length > 1) { - ({{graphsData()[metric].length}} plots) + (hoverModeChanged)="hoverModeChanged.emit($event)" + > +
+ } +
+ @for (metric of (graphsState().graphList()); track metric) { +
+
+
+ @if (isGroupGraphs()) { +
+
+
{{ metric }} + @if (visibility()[metric]?.length > 1) { + ({{(visibility()[metric] | getCounterString)}} plots) + } +
+ @if (graphsData()?.[metric]?.length > 0) { +
+ + +
}
- @if (graphsData()[metric]?.length > 0) { -
- - + } +
+ + + @for (chartItem of graphsData()?.[metric]; track trackByIdFn(chartItem)) { +
+ @if (plotlyReady() && this.signedImagePlots[chartItem.id] | ngrxPush) { + @defer (on viewport) { + + } @placeholder { +
+ } + } + @if (!disableResize()) { +
+
+
+
+ } + @if (!disableResize()) { +
+
+
+
+ } +
+
}
- } -
- - - @for (chartItem of graphsData()[metric]; track trackByIdFn(chartItem)) { -
- @defer (on viewport) { - - } @placeholder { -
- } - @if (!disableResize()) { -
-
-
-
- } - @if (!disableResize()) { -
-
-
-
- } -
-
-
- }
-
- } + } +
-
diff --git a/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.component.scss b/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.component.scss index 68a04ea7..420c38c7 100644 --- a/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.component.scss +++ b/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { .row { @@ -230,7 +228,7 @@ } .all-metrics { - height: 100%; + max-height: 100%; min-height: 250px; padding: 0; } @@ -332,7 +330,7 @@ .no-output { text-align: center; - color: var(--color-on-surface-variant); + color: var(--color-empty-state); position: absolute; top: 50%; left: 50%; @@ -340,9 +338,7 @@ display: block; h4 { font-weight: 500; - } - .al-icon { - color: var(--color-tint-14); + font-size: 16px; } } diff --git a/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.component.ts b/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.component.ts index f10aa60d..1e31ba3e 100644 --- a/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.component.ts +++ b/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.component.ts @@ -4,10 +4,10 @@ import { Component, ElementRef, HostListener, - OnDestroy, - Renderer2, inject, viewChild, viewChildren, input, output, signal, effect, computed, untracked + Renderer2, inject, viewChild, viewChildren, input, output, signal, effect, computed, untracked, model, OnDestroy } from '@angular/core'; -import {allowedMergedTypes, sortMetricsList} from '../../tasks/tasks.utils'; +import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; +import {checkIfLegendToTitle, sortMetricsList} from '../../tasks/tasks.utils'; import {SingleGraphComponent} from '../single-graph/single-graph.component'; import { ChartHoverModeEnum, @@ -18,11 +18,11 @@ import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {GroupByCharts, groupByCharts} from '../../experiments/actions/common-experiment-output.actions'; import {Store} from '@ngrx/store'; import {ResizeEvent} from 'angular-resizable-element'; -import {distinctUntilChanged, filter, map, skip, take} from 'rxjs/operators'; -import {Subscription} from 'rxjs'; +import {distinctUntilChanged, map, skip, tap} from 'rxjs/operators'; +import {Observable, of, combineLatest} from 'rxjs'; import {ExtFrame, ExtLegend, VisibleExtFrame} from '../single-graph/plotly-graph-base'; -import {getSignedUrl} from '../../core/actions/common-auth.actions'; -import {selectSignedUrl} from '../../core/reducers/common-auth-reducer'; +import {signUrls} from '../../core/actions/common-auth.actions'; +import {getSignedUrlOrOrigin$} from '../../core/reducers/common-auth-reducer'; import {selectRouterParams} from '@common/core/reducers/router-reducer'; import { EventsGetTaskSingleValueMetricsResponseValues @@ -33,12 +33,21 @@ import {setGraphsPerRow} from '@common/experiments/actions/common-experiment-out import {SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; import {maxInArray} from '@common/shared/utils/helpers.util'; import {explicitEffect} from 'ngxtension/explicit-effect'; +import {GroupedList} from '@common/tasks/tasks.model'; +import {computedPrevious} from 'ngxtension/computed-previous'; +import {selectPlotlyReady} from '@common/core/reducers/view.reducer'; + +export const inHiddenList = (isCompare: boolean, hiddenList: string[], metric: string, variant: string) => { + const metVar = `${metric}${variant}`; + return isCompare ? !(hiddenList?.some(m => m.startsWith(metVar) || metric.endsWith(` - ${variant}`))) : !hiddenList?.includes(metVar); +}; @Component({ selector: 'sm-experiment-graphs', templateUrl: './experiment-graphs.component.html', styleUrls: ['./experiment-graphs.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class ExperimentGraphsComponent implements OnDestroy { @@ -50,7 +59,6 @@ export class ExperimentGraphsComponent implements OnDestroy { readonly singleGraphidPrefix = SINGLE_GRAPH_ID_PREFIX; allMetrics = viewChild('allMetrics'); private timer: number; - private subs = new Subscription(); public height = 450; public width: number; private minWidth = 350; @@ -58,8 +66,10 @@ export class ExperimentGraphsComponent implements OnDestroy { private graphsNumberLimit: number; public activeResizeElement: HTMLDivElement; protected readonly singleValueChartTitle = singleValueChartTitle; - protected graphsData = signal>({}); + protected graphsData = signal>(null); + protected signedImagePlots: Record> = {}; private previousWindowWidth: number; + protected plotlyReady = this.store.selectSignal(selectPlotlyReady); @HostListener('window:resize') onResize() { @@ -71,7 +81,7 @@ export class ExperimentGraphsComponent implements OnDestroy { this.previousWindowWidth = window.innerWidth; } - hiddenList = input([]); + hiddenList = input(); isGroupGraphs = input(); legendStringLength = input(19); minimized = input(); @@ -82,12 +92,13 @@ export class ExperimentGraphsComponent implements OnDestroy { isCompare = input(false); hoverMode = input(); disableResize = input(false); - singleValueData = input(); - multipleSingleValueData = input(); + singleValueData = model(); + multipleSingleValueData = model(); experimentName = input(); splitSize = input(); smoothWeight = input(); + smoothSigma = input(); smoothType = input(); groupBy = input(); xAxisType = input(); @@ -101,6 +112,7 @@ export class ExperimentGraphsComponent implements OnDestroy { originalObject?: string[]; xaxis?: ScalarKeyEnum; group?: boolean; + plotsNames?: string[]; seriesName?: string[]; domRect: DOMRect; }>(); @@ -109,15 +121,29 @@ export class ExperimentGraphsComponent implements OnDestroy { singleGraphs = viewChildren('singleGraphContainer'); singleValueGraph = viewChildren('singleValueGraph'); allGraphs = viewChildren(SingleGraphComponent); + allGraphsPrevious = computedPrevious(this.allGraphs); graphsPerRow = this.store.selectSignal(selectGraphsPerRow); + loading = computed(() => this.graphsData() === null || this.hiddenList() === null ); constructor() { effect(() => { - if (this.hiddenList() && this.splitSize()) { - untracked(() => this.calculateGraphsLayout()); + if (this.allGraphsPrevious()?.length === 0 && this.allGraphs()?.length > 0) { + this.calculateGraphsLayout(0); + } + }); + + + effect(() => { + if (this.graphsData() || this.splitSize() || this.groupBy()) { + untracked(() => { + if (this.allGraphs()) { + this.allMetricGroups()?.forEach(metricGroup => this.renderer.removeStyle(metricGroup.nativeElement, 'width')); + this.calculateGraphsLayout(0); + } + }); } }); @@ -130,66 +156,78 @@ export class ExperimentGraphsComponent implements OnDestroy { explicitEffect( [this.metrics], ([metrics]) => { - if (metrics) { - this.calculateGraphsLayout(0, (this.disableResize() || this.allGroupsSingleGraphs()) ? 1 : this.graphsState().graphsPerRow()); - } - }) - - effect(() => { - const graphsData = this.addId(this.sortGraphsData(this.metrics() || {})); + if (metrics === undefined) { + return; + } + const graphsData = this.addId(this.sortGraphsData(metrics || {})); + const toBeSigned = []; Object.values(graphsData).forEach((graphs: ExtFrame[]) => { graphs.forEach((graph: ExtFrame) => { if ((graph?.layout?.images?.length ?? 0) > 0) { - graph.layout.images.forEach((image: Plotly.Image) => { - this.store.dispatch(getSignedUrl({ + const observables = [] as Observable[]; + graph.layout.images.forEach(((image: Plotly.Image, i) => { + toBeSigned.push({ url: image.source, config: {skipFileServer: false, skipLocalFile: false, disableCache: graph.timestamp} - })); - this.subs.add(this.store.select(selectSignedUrl(image.source)) - .pipe( - filter(signed => !!signed?.signed), - map(({signed: signedUrl}) => signedUrl), - take(1) - ).subscribe(url => image.source = url) - ); + }); + observables.push(getSignedUrlOrOrigin$(image.source, this.store).pipe(tap(signed => graph.layout.images[i].source = signed))); } - ); + )); + this.signedImagePlots[graph.id] = combineLatest(observables); + } else { + this.signedImagePlots[graph.id] = of(['true']); } }); }); + this.store.dispatch(signUrls({sign: toBeSigned})); this.graphsData.set(graphsData); - }, {allowSignalWrites: true}) + // this.calculateGraphsLayout(0, (this.disableResize() || this.allGroupsSingleGraphs()) ? 1 : this.graphsState().graphsPerRow()); + }); - this.subs.add(this.store.select(selectRouterParams).pipe( - map(params => params?.experimentId ?? params?.modelId), - distinctUntilChanged(), - skip(1) // don't need first null->expId - ).subscribe(() => { - this.store.dispatch(setGraphsPerRow({graphsPerRow: 2})); - // this.graphsData = null; - this.graphsState().numIterations.set(0); - this.graphsState().graphList.set([]); - })); + this.store.select(selectRouterParams) + .pipe( + takeUntilDestroyed(), + map(params => params?.experimentId ?? params?.modelId), + distinctUntilChanged(), + skip(1) // don't need first null->expId + ) + .subscribe(() => { + this.store.dispatch(setGraphsPerRow({graphsPerRow: 2})); + this.graphsData.set(null); + this.graphsState().numIterations.set(0); + this.graphsState().graphList.set([]); + this.singleValueData.set([]); + // this.loading.set(true); + this.multipleSingleValueData.set(null); + }); } - ngOnDestroy() { - this.subs.unsubscribe(); + ngOnDestroy(): void { + this.store.dispatch(setGraphsPerRow({graphsPerRow: 2})); } metrics = input>(); + list = input(); graphsState = computed(() => ({ graphsPerRow: signal(this.graphsPerRow() ?? 2), graphList: signal(this.metrics() ? sortMetricsList(Object.keys(this.metrics())) : []), - noGraphs: signal((this.metrics() !== undefined) && (this.metrics() !== null) && Object.keys(this.metrics()).length === 0), - numIterations: signal(Array.from(new Set(Object.values(this.graphsData()).reduce((acc, frames) => + noGraphs: signal(this.graphsData() && Object.keys(this.graphsData()).length === 0), + numIterations: signal(Array.from(new Set(Object.values(this.graphsData() ?? {}).reduce((acc, frames) => [...acc, ...frames.map(frame => frame.iter)], []).flat())).filter(a => Number.isInteger(a)).length), - maxUserWidth: signal(maxInArray(Object.values(this.graphsData()).flat().map((chart: ExtFrame) => chart.layout?.width || 0))), - maxUserHeight: signal(maxInArray(Object.values(this.graphsData()).flat().map((chart: ExtFrame) => chart.layout?.height || 0))) + maxUserWidth: signal(maxInArray(Object.values(this.graphsData() ?? {}).flat().map((chart: ExtFrame) => chart.layout?.width || 0))), + maxUserHeight: signal(maxInArray(Object.values(this.graphsData() ?? {}).flat().map((chart: ExtFrame) => chart.layout?.height || 0))) })); - + visibility = computed(() => { + return Object.entries(this.list() || {}).reduce((acc, [metric, plots]) => { + const variants = Object.keys(plots); + acc[metric] = variants.filter(v => v !== '__displayName').length > 0 ? variants.map(variant => + (this.isCompare() && this.hiddenList()?.includes(metric) && metric.endsWith(` - ${variant}`)) ? null : this.hiddenList()?.includes(`${metric}${variant}`)) : null; + return acc; + }, {}); + }); sortGraphsData = (data: Record) => @@ -227,8 +265,8 @@ export class ExperimentGraphsComponent implements OnDestroy { } this.timer = window.setTimeout(() => { const containerWidth = this.el.nativeElement.clientWidth; - graphsPerRow = graphsPerRow ?? this.graphsState().graphsPerRow(); - if (this.allGraphs() && containerWidth) { + graphsPerRow = graphsPerRow ?? this.allGroupsSingleGraphs() ? 1 : this.graphsState().graphsPerRow(); + if (this.allGraphs()?.length > 0 && containerWidth) { while (containerWidth / graphsPerRow < this.minWidth && graphsPerRow > 1 || containerWidth / graphsPerRow < this.graphsState().maxUserWidth()) { graphsPerRow -= 1; } @@ -247,6 +285,7 @@ export class ExperimentGraphsComponent implements OnDestroy { } this.graphsState().graphsPerRow.set(graphsPerRow); this.changeDetection.markForCheck(); + this.allGraphs().forEach((graph) => graph.redrawPlot()); }, delay); } @@ -277,12 +316,14 @@ export class ExperimentGraphsComponent implements OnDestroy { if (!this.isGroupGraphs()) { this.allMetricGroups()?.forEach(metricGroup => this.renderer.setStyle(metricGroup.nativeElement, 'height', `${this.height}px`)); + this.singleGraphs()?.forEach(singleGraph => + this.renderer.setStyle(singleGraph.nativeElement, 'height', '100%')); } else { this.singleGraphs()?.forEach(singleGraph => this.renderer.setStyle(singleGraph.nativeElement, 'height', `${this.height}px`)); } - this.changeDetection.detectChanges(); } + this.changeDetection.detectChanges(); } private calcGraphPerRow(userWidth: number, containerWidth: number) { @@ -317,11 +358,14 @@ export class ExperimentGraphsComponent implements OnDestroy { return $event.rectangle.width > 350 && $event.rectangle.height > 250; } - scrollToGraph(id: string) { - const element = this.allMetrics().nativeElement.getElementsByClassName('graph-id')[EXPERIMENT_GRAPH_ID_PREFIX + id] as HTMLDivElement; + scrollToGraph(id: string, group?: boolean) { + const allGraphElements = this.allMetrics().nativeElement.getElementsByClassName(group ? 'graph-id' : 'single-graph-container'); + const element = allGraphElements[EXPERIMENT_GRAPH_ID_PREFIX + id] as HTMLDivElement; if (element) { - this.allMetrics().nativeElement.scrollTo({top: element.offsetTop, behavior: 'smooth'}); - } else if (this.allMetrics().nativeElement.getElementsByClassName('single-value-summary-section')[0]) { + element.scrollIntoView({behavior: 'smooth'}); + } else if (this.singleValueData()?.length > 0 && this.hiddenList()?.includes(singleValueChartTitle)) { + this.allMetrics().nativeElement.scrollTo({top: 0, behavior: 'smooth'}); + } else if (this.allMetrics().nativeElement.getElementsByClassName('single-value-summary-section')) { this.allMetrics().nativeElement.scrollTo({top: 0, behavior: 'smooth'}); } } @@ -333,24 +377,30 @@ export class ExperimentGraphsComponent implements OnDestroy { ...acc, [label]: graphs.map((graph) => ({ ...graph, - id: v4(), + id: v4() })) }), {} as Record); } - public generateIdentifier = (chartItem: ExtFrame) => `${this.singleGraphidPrefix} ${this.experimentGraphidPrefix} ${chartItem.metric} ${chartItem.layout.title} ${chartItem.iter} ${chartItem.variant} ${(chartItem.layout.images && chartItem.layout.images[0]?.source)}`; + public generateIdentifier = (chartItem: ExtFrame) => + `${this.singleGraphidPrefix} ${this.experimentGraphidPrefix} ${chartItem.metric} ${chartItem.layout.title} ${chartItem.iter} ${chartItem.variant} ${(chartItem.layout.images && chartItem.layout.images[0]?.source)}`; creatingEmbedCodeGroup(metric: VisibleExtFrame[], domRect) { + const metricName = metric[0].metric; const objects = metric.map(m => m.data.filter(p => !p.fakePlot).map(p => p.task)).flat().filter(obj => obj); + const copyAllPlots = this.visibility()[metric[0].metric]?.[0] === null || + this.visibility()[`${metric[0].metric} - ${metric[0].variant}`] === null || + this.visibility()[`${metric[0].metric}${metric[0].variant}`] === null; this.createEmbedCode.emit({ xaxis: this.xAxisType(), - originalObject: objects.length > 0 ? objects: Array.from(new Set(metric.map(m => m.task))), + originalObject: objects.length > 0 ? objects : Array.from(new Set(metric.map(m => m.task))), metrics: [metric[0]?.metric], - variants: metric.map(m => m.variant), + variants: copyAllPlots ? metric.map(m => m.variant) : Object.keys(this.list()[metricName] || {}).filter((metric, i) => this.visibility()[metricName]?.[i]), seriesName: metric.map(m => m.data[0]?.seriesName), ...(this.xAxisType() && {xaxis: this.xAxisType()}), group: true, + plotsNames: metric.map(plot => plot.layout.name ?? plot.layout.title as string), domRect: domRect.getBoundingClientRect() }); } @@ -383,10 +433,12 @@ export class ExperimentGraphsComponent implements OnDestroy { } checkIfLegendToTitle(chartItem: ExtFrame) { - return this.isGroupGraphs()! && chartItem.data?.length === 1 && (!chartItem.data[0].name || chartItem.data[0].name === chartItem.layout?.title) && allowedMergedTypes.includes(chartItem?.data[0]?.type); + return this.isGroupGraphs()! && checkIfLegendToTitle(chartItem); } - inHiddenList = (metric: string) => this.isCompare() ? !this.hiddenList()?.some(m => m.startsWith(metric)) : !this.hiddenList()?.includes(metric); + inHiddenList = (metric: string, variant: string) => { + return inHiddenList(this.isCompare(), this.hiddenList(), metric, variant); + }; collapseGroup(groupElement: HTMLDivElement) { if (groupElement.classList.contains('group-collapsed')) { diff --git a/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.module.ts b/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.module.ts index f28aa5f2..f9d6a4af 100644 --- a/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.module.ts +++ b/src/app/webapp-common/shared/experiment-graphs/experiment-graphs.module.ts @@ -5,7 +5,6 @@ import {MatSelectModule} from '@angular/material/select'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {ResizableModule} from 'angular-resizable-element'; import {ExperimentGraphsComponent} from './experiment-graphs.component'; -import {GraphSettingsBarComponent} from './graph-settings-bar/graph-settings-bar.component'; import {SingleValueSummaryTableComponent} from '../single-value-summary-table/single-value-summary-table.component'; import {SingleGraphModule} from '@common/shared/single-graph/single-graph.module'; import {MatInputModule} from '@angular/material/input'; @@ -25,15 +24,15 @@ import { } from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import { MatIcon } from '@angular/material/icon'; -import {MatIconButton} from '@angular/material/button'; +import {MatButton, MatIconButton} from '@angular/material/button'; +import {GetCounterStringPipe} from '@common/shared/experiment-graphs/filter-hidden.pipe'; const declarations= [ ExperimentMetricDataTableComponent, - ExperimentGraphsComponent, - GraphSettingsBarComponent, + ExperimentGraphsComponent ]; @NgModule({ declarations, @@ -59,7 +58,9 @@ const declarations= [ TooltipDirective, ReactiveFormsModule, MatIcon, - MatIconButton + MatIconButton, + GetCounterStringPipe, + MatButton ] }) export class ExperimentGraphsModule { } diff --git a/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.html b/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.html index 85decba2..0ec83a5e 100644 --- a/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.html +++ b/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.html @@ -18,7 +18,7 @@ @if (dataTable()?.length === 0) {
- +

NO METRICS

} @@ -79,7 +79,9 @@ -
+ diff --git a/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.scss b/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.scss index 4122d324..1ea66249 100644 --- a/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.scss +++ b/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.scss @@ -1,6 +1,3 @@ -@import "variables"; - - :host { display: block; height: 100%; @@ -14,17 +11,15 @@ .no-output { text-align: center; - color: var(--color-on-surface-variant); position: absolute; top: 50%; left: 50%; transform: translateY(-50%) translateX(-50%); display: block; + color: var(--color-empty-state); h4 { font-weight: 500; - } - .al-icon { - color: var(--color-tint-14); + font-size: 16px; } } } diff --git a/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.ts b/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.ts index 6d6045f8..5ded3a7b 100644 --- a/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.ts +++ b/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.ts @@ -1,10 +1,11 @@ -import {Component, computed, input, OnInit, output, signal} from '@angular/core'; +import {Component, computed, effect, input, OnInit, output, signal, viewChild} from '@angular/core'; import {trackById, trackByIndex, trackByValue} from '@common/shared/utils/forms-track-by'; import {Task} from '~/business-logic/model/tasks/task'; import {FormControl} from '@angular/forms'; import {sortMetricsList} from '@common/tasks/tasks.utils'; import {GroupedList} from '@common/tasks/tasks.model'; import {ExperimentCompareSettings} from '@common/experiments-compare/reducers/experiments-compare-charts.reducer'; +import {Table} from 'primeng/table'; interface tableRow { metricId: string; @@ -12,49 +13,53 @@ interface tableRow { metric: string; variant: string; firstMetricRow: boolean; + lastInGroup: boolean; last: number; min: number; max: number; } @Component({ - selector: 'sm-experiment-metric-data-table', - styleUrls: [ - '../../../experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.scss', - './experiment-metric-data-table.component.scss' - ], - templateUrl: './experiment-metric-data-table.component.html' + selector: 'sm-experiment-metric-data-table', + styleUrls: [ + '../../../experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.scss', + './experiment-metric-data-table.component.scss' + ], + templateUrl: './experiment-metric-data-table.component.html', + standalone: false }) export class ExperimentMetricDataTableComponent implements OnInit { - public settings: ExperimentCompareSettings = {selectedMetricsScalar: []} as ExperimentCompareSettings; + protected settings: ExperimentCompareSettings = {selectedMetricsScalar: []} as ExperimentCompareSettings; + protected initialSelectedMetricsScalar: string[] = []; + protected variantFilter = new FormControl(''); + selectedExperiment = input(); selectedMetricsScalar = input(); lastMetrics = input(); selectedMetricsChanged = output(); - filterOpen: boolean; - filterValue = signal(''); - listSearchTerm = signal(''); - - public initialSelectedMetricsScalar: string[] = []; - + protected filterOpen: boolean; + protected filterValue = signal(''); + protected listSearchTerm = signal(''); + private table = viewChild(Table); + constructor() { + effect(() => { + if (this.table() && this.dataTableFiltered()) { + window.setTimeout(() => this.table().scroller?.setSize(), 50); + } + }); + } ngOnInit(): void { this.variantFilter.valueChanges.subscribe((value) => this.filterValue.set(value)); - } - - public variantFilter = new FormControl(''); - - searchTermChanged(searchTerm: string) { this.listSearchTerm.set(searchTerm); } - public scrolled: boolean; public showFilterTooltip: boolean; @@ -98,6 +103,7 @@ export class ExperimentMetricDataTableComponent implements OnInit { metric: this.lastMetrics()[metricId][variantId].metric, variant: this.lastMetrics()[metricId][variantId].variant, firstMetricRow: false, + lastInGroup: false, last: this.lastMetrics()[metricId][variantId].value, min: this.lastMetrics()[metricId][variantId].min_value, max: this.lastMetrics()[metricId][variantId].max_value, @@ -128,10 +134,9 @@ export class ExperimentMetricDataTableComponent implements OnInit { const filteredData = this.dataTable() .filter(row => !this.selectedMetricsScalar() || this.selectedMetricsScalar()?.includes(`${row.metric}${row.variant}`)) .filter(row => row.metric.toLowerCase().includes(this.filterValue().toLowerCase()) || row.variant.toLowerCase().includes(this.filterValue().toLowerCase())); - let previousMetric: string; - return filteredData.map(row => { - row.firstMetricRow = row.metric !== previousMetric; - previousMetric = row.metric; + return filteredData.map((row, i) => { + row.firstMetricRow = row.metric !== filteredData[i - 1]?.metric; + row.lastInGroup = row.metric !== filteredData[i + 1]?.metric; return row; }); }); diff --git a/src/app/webapp-common/shared/experiment-graphs/filter-hidden.pipe.ts b/src/app/webapp-common/shared/experiment-graphs/filter-hidden.pipe.ts new file mode 100644 index 00000000..0d2fe5c6 --- /dev/null +++ b/src/app/webapp-common/shared/experiment-graphs/filter-hidden.pipe.ts @@ -0,0 +1,13 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'getCounterString', + standalone: true +}) +export class GetCounterStringPipe implements PipeTransform { + + transform(visibility: boolean[], ...args: unknown[]): string { + return visibility[0] === null ? `${visibility.length}` : `${visibility.filter(a => a).length} of ${visibility.length}`; + } + +} diff --git a/src/app/webapp-common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component.html b/src/app/webapp-common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component.html index 8510b9f0..08916e52 100644 --- a/src/app/webapp-common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component.html +++ b/src/app/webapp-common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component.html @@ -1,18 +1,18 @@ -
-
- Group by +
+
+ Group by - - @for (type of groupByOptions; track type) { + + @for (type of groupByOptions(); track type) { {{ type.name }} }
-
- Horizontal Axis +
+ Horizontal Axis - @for (type of xAxisTypeOption; track type) { {{ type.name }} @@ -20,39 +20,10 @@
-
-
- Smoothing - - - -
- - - - - +
+ Smoothing + + @for (smoothTypeOption of smoothTypeEnum | keyvalue; track smoothTypeOption) { {{ smoothTypeOption.value }} @@ -60,10 +31,70 @@ } - @if (!verticalLayout) { - - }
+ @if (smoothType() !== smoothTypeEnum.any) { +
+ @if (verticalLayout()){ +
+ } + @switch (smoothType()) { + @case (smoothTypeEnum.gaussian) { + Kernel +
+ + + +
{{ smoothState().weight() }}
+
+ } + @case (smoothTypeEnum.runningAverage) { + Window size +
+ + + +
{{ smoothState().weight() }}
+
+ } + @case (smoothTypeEnum.exponential) { + Alpha +
+ + + +
{{ smoothState().weight() }}
+
+ } + } +
+ @if (smoothType() === smoothTypeEnum.gaussian) { +
+ @if (verticalLayout()){ +
+ } + Sigma +
+ + + +
{{ smoothState().sigma() }}
+
+
+ } + } + @if (!verticalLayout()) { + + } + @if (clearable() !== null) { +
+ }
diff --git a/src/app/webapp-common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component.scss b/src/app/webapp-common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component.scss index f5497abf..d17b3e8a 100644 --- a/src/app/webapp-common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component.scss +++ b/src/app/webapp-common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component.scss @@ -1,24 +1,63 @@ -@import "variables"; :host { display: block; z-index: 1000; width: 100%; font-size: 14px; + mat-slider { + min-width: 60px; + } + .divider{ + border-left: 1px solid var(--color-outline-variant); + padding-left: 16px; + margin-left: 8px; + } .vertical-layout { + .divider{ + border-left: unset; + padding-left: unset; + margin-left: unset; + border-top: 1px solid var(--color-outline-variant); + padding-top: 16px; + } font-size: 14px; &.x-axis-options { flex-direction: column; flex-wrap: wrap; width: 100%; - gap: 12px + gap: 16px + } + .smooth-slide-field { + margin-left: auto; + width: 204px; + } + .spacer{ + flex-grow:1; + } + .smoothing-label{ + width: 90px; + flex-grow: unset; + } + .slider{ + width: 110px; } + + .weight { + min-width: 24px; + margin-left: 14px; + display: flex; + justify-content: end; + } + + + .group-by-field, - .axis-type-field { - width: unset; - max-width: 200px; + .axis-type-field, + .smooth-type-field, + { + width: 200px; } .label-text { @@ -37,59 +76,27 @@ display: none; } - .smooth-options { - width: 100%; - flex-wrap: wrap; - gap: 12px; - border-top: 1px solid var(--color-surface-container-high); - padding-top: 12px; - margin-top: 8px; - - mat-slider { - min-width: 100px; - } - - .field { - flex-grow: 1; - } - - .smooth-type { - max-width: 200px; - margin-left: auto; - width: 100%; - } - } - - .smooth-input { - margin-left: 0; - } + } + .close-button{ + margin-left: auto; } &.graph-settings-menu { padding: 12px; - width: 350px; } } .x-axis-options { display: flex; flex-grow: 1; - justify-content: space-between; + &.vertical-layout{ + justify-content: space-between; + } align-items: center; gap: 12px; } -.smooth-input { - height: 36px; - width: 74px; - margin-left: 16px; -} -.smooth-options { - display: flex; - align-items: center; - margin-left: auto; -} .label-text { padding-right: 6px; @@ -103,6 +110,9 @@ .smoothing-text { padding-right: 16px; } +.smooth-type-field { + width: unset; +} .smooth-options i { margin: auto 6px auto 25px; @@ -121,7 +131,7 @@ mat-form-field { .smooth-type { margin-left: 6px; - width: 200px; + width: 230px; } .axis-type-field { @@ -132,13 +142,13 @@ mat-form-field { width: 180px; } -mat-slider { - min-width: 121px; -} - .field { align-items: center; } +.weight { + margin-left: 6px; + min-width: 24px; +} .short-mode { .field { @@ -157,4 +167,20 @@ mat-slider { } } +.reset-button { + visibility: visible; + opacity: 1; + transition: opacity 0.3s ease; + margin-left: -12px; + + &.hidden { + opacity: 0; + visibility: hidden; + } +} + +.width-100 { + width: 100%; +} + diff --git a/src/app/webapp-common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component.ts b/src/app/webapp-common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component.ts index ebe4d30f..d59be51f 100644 --- a/src/app/webapp-common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component.ts +++ b/src/app/webapp-common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component.ts @@ -1,41 +1,75 @@ -import {ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, inject, Input, Output} from '@angular/core'; +import {Component, computed, ElementRef, HostListener, inject, input, Input, output, signal} from '@angular/core'; import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; -import {MatSelectChange} from '@angular/material/select'; +import {MatFormField, MatOption, MatSelect, MatSelectChange} from '@angular/material/select'; import {GroupByCharts} from '@common/experiments/actions/common-experiment-output.actions'; import {SmoothTypeEnum, smoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; +import {MatSlider, MatSliderThumb} from '@angular/material/slider'; +import {FormsModule} from '@angular/forms'; +import {KeyValuePipe} from '@angular/common'; +import {MatIcon} from '@angular/material/icon'; +import {MatButton, MatIconButton} from '@angular/material/button'; +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; @Component({ selector: 'sm-graph-settings-bar', templateUrl: './graph-settings-bar.component.html', - styleUrls: ['./graph-settings-bar.component.scss'] + styleUrls: ['./graph-settings-bar.component.scss'], + imports: [ + MatFormField, + MatSelect, + MatOption, + MatSlider, + FormsModule, + MatSliderThumb, + KeyValuePipe, + MatIcon, + MatIconButton, + MatButton, + TooltipDirective + ] }) export class GraphSettingsBarComponent { + private readonly shortModeWidth = 1250; readonly scalarKeyEnum = ScalarKeyEnum; readonly round = Math.round; protected readonly smoothTypeEnum = smoothTypeEnum; private el = inject(ElementRef); - private cdr = inject(ChangeDetectorRef); - public shortMode: boolean; + + public shortMode = signal(this.el.nativeElement.clientWidth < this.shortModeWidth); @Input() set splitSize(splitSize: number) { - this.shortMode = this.el.nativeElement.clientWidth < 1200; + this.shortMode.set(this.el.nativeElement.clientWidth < this.shortModeWidth); } - @Input() smoothWeight: number; - @Input() smoothType: SmoothTypeEnum; - @Input() xAxisType: ScalarKeyEnum = ScalarKeyEnum.Iter; - @Input() groupBy: GroupByCharts = 'metric'; - @Input() groupByOptions: { name: string; value: GroupByCharts }[]; - @Input() verticalLayout: boolean = false; - @Output() changeWeight = new EventEmitter(); - @Output() changeSmoothType = new EventEmitter(); - @Output() changeXAxisType = new EventEmitter(); - @Output() changeGroupBy = new EventEmitter(); - @Output() toggleSettings = new EventEmitter(); + smoothWeight = input(); + smoothSigma = input(); + smoothType = input(); + xAxisType = input(ScalarKeyEnum.Iter); + groupBy = input('metric'); + groupByOptions = input<{ + name: string; + value: GroupByCharts; + }[]>(); + verticalLayout = input(false); + clearable = input(false); + changeWeight = output(); + changeSigma = output(); + changeSmoothType = output(); + changeXAxisType = output(); + changeGroupBy = output(); + toggleSettings = output(); + setToProject = output(); + + smoothState = computed(() => ({ + smoothWeight: this.smoothWeight(), + weight: signal(this.smoothWeight()), + smoothSigma: this.smoothSigma(), + sigma: signal(this.smoothSigma()) + })); @HostListener('window:resize') onResize() { - this.shortMode = this.el.nativeElement.clientWidth < 1130; + this.shortMode.set(this.el.nativeElement.clientWidth < this.shortModeWidth); } xAxisTypeOption = [ @@ -53,6 +87,11 @@ export class GraphSettingsBarComponent { }, ]; + constructor() { + window.setTimeout(() => { + this.shortMode.set(this.el.nativeElement.clientWidth < this.shortModeWidth); + }, 100); + } xAxisTypeChanged(key: MatSelectChange) { this.changeXAxisType.emit(key.value); } @@ -62,37 +101,12 @@ export class GraphSettingsBarComponent { } selectSmoothType($event: MatSelectChange) { - this.changeWeight.emit([smoothTypeEnum.exponential, smoothTypeEnum.any].includes($event.value) ? 0 : 10); + this.changeWeight.emit([smoothTypeEnum.exponential, smoothTypeEnum.any].includes($event.value) ? 0 : $event.value=== smoothTypeEnum.gaussian? 7: $event.value=== smoothTypeEnum.runningAverage? 5: 10); this.changeSmoothType.emit($event.value); } - trimToLimits(value: number) { - if (value === 0) { - return; - } - if (value === null) { - this.changeWeight.emit(this.smoothWeight); - return; - } - if (value > (this.smoothType === smoothTypeEnum.exponential ? 0.999 : 100) || value < (this.smoothType === smoothTypeEnum.exponential ? 0 : 1)) { - this.smoothWeight = null; - } - setTimeout(() => { - if (this.smoothType === smoothTypeEnum.exponential) { - if (value > 0.999) { - this.smoothWeight = 0.999; - } else if (value < 0) { - this.smoothWeight = 0; - } - } else { - if (value > 100) { - this.smoothWeight = 100; - } else if (value < 1) { - this.smoothWeight = 1; - } - } - this.cdr.detectChanges(); - this.changeWeight.emit(this.smoothWeight); - }); + + setToProjectLevel() { + this.setToProject.emit() } } diff --git a/src/app/webapp-common/shared/experiment-info-header-status-icon-label/info-header-status-icon-label.component.ts b/src/app/webapp-common/shared/experiment-info-header-status-icon-label/info-header-status-icon-label.component.ts index ec07eeb9..ec056ab4 100644 --- a/src/app/webapp-common/shared/experiment-info-header-status-icon-label/info-header-status-icon-label.component.ts +++ b/src/app/webapp-common/shared/experiment-info-header-status-icon-label/info-header-status-icon-label.component.ts @@ -3,13 +3,12 @@ import {EXPERIMENTS_STATUS_LABELS} from '~/features/experiments/shared/experimen import { UpperCasePipe } from '@angular/common'; @Component({ - selector: 'sm-info-header-status-icon-label', - templateUrl: './info-header-status-icon-label.component.html', - styleUrls: ['./info-header-status-icon-label.component.scss'], - imports: [ - UpperCasePipe - ], - standalone: true + selector: 'sm-info-header-status-icon-label', + templateUrl: './info-header-status-icon-label.component.html', + styleUrls: ['./info-header-status-icon-label.component.scss'], + imports: [ + UpperCasePipe + ] }) export class InfoHeaderStatusIconLabelComponent { showLabel = input(true); diff --git a/src/app/webapp-common/shared/experiment-info-header-status-progress-bar/info-header-status-progress-bar.component.scss b/src/app/webapp-common/shared/experiment-info-header-status-progress-bar/info-header-status-progress-bar.component.scss index fb7f137f..58be5dee 100644 --- a/src/app/webapp-common/shared/experiment-info-header-status-progress-bar/info-header-status-progress-bar.component.scss +++ b/src/app/webapp-common/shared/experiment-info-header-status-progress-bar/info-header-status-progress-bar.component.scss @@ -1,5 +1,5 @@ -@import "variables"; -@import "../../layout/layout.scss"; +@use "variables"; +@use "../../layout/layout.scss"; .progress-bar-container { display: flex; @@ -7,14 +7,14 @@ align-items: center; border: solid 1px rgba(2, 2, 2, 0.07); width: 100%; - height: $project-info-progress-height; + height: layout.$project-info-progress-height; opacity: 1; text-align: center; color: #596386; font-weight: 500; font-size: 11px; background-color: #FFFFFF; - transition: $transition-fast; + transition: variables.$transition-fast; &.published { diff --git a/src/app/webapp-common/shared/experiment-status-icon-label/status-icon-label.component.html b/src/app/webapp-common/shared/experiment-status-icon-label/status-icon-label.component.html index f8ebd0f2..da41b36b 100644 --- a/src/app/webapp-common/shared/experiment-status-icon-label/status-icon-label.component.html +++ b/src/app/webapp-common/shared/experiment-status-icon-label/status-icon-label.component.html @@ -14,7 +14,6 @@ [class.show]="showSpinner() && progress()" [value]="progress()" [diameter]="18" - color="accent" > } @else {
diff --git a/src/app/webapp-common/shared/experiment-status-icon-label/status-icon-label.component.scss b/src/app/webapp-common/shared/experiment-status-icon-label/status-icon-label.component.scss index 4b5423de..65c0e6f9 100644 --- a/src/app/webapp-common/shared/experiment-status-icon-label/status-icon-label.component.scss +++ b/src/app/webapp-common/shared/experiment-status-icon-label/status-icon-label.component.scss @@ -66,7 +66,7 @@ } .label { - line-height: 14px; + line-height: 16px; &.with-spinner { min-width: 50px; @@ -77,7 +77,11 @@ :host-context(.selected) { :host { .status-icon-container { - color: var(--row-selected-text-color); + color: var(--color-surface-container-highest); + } + + .spinner { + --mdc-circular-progress-active-indicator-color: var(--row-selected-text-color); } } } @@ -85,7 +89,7 @@ .spinner { opacity: 0; - .show { + &.show { opacity: 1; } } diff --git a/src/app/webapp-common/shared/experiment-status-icon-label/status-icon-label.component.ts b/src/app/webapp-common/shared/experiment-status-icon-label/status-icon-label.component.ts index 2cbe2085..c0159553 100644 --- a/src/app/webapp-common/shared/experiment-status-icon-label/status-icon-label.component.ts +++ b/src/app/webapp-common/shared/experiment-status-icon-label/status-icon-label.component.ts @@ -5,15 +5,14 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-status-icon-label', - templateUrl: './status-icon-label.component.html', - styleUrls: ['./status-icon-label.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - MatProgressSpinnerModule, - MatIcon - ], - standalone: true + selector: 'sm-status-icon-label', + templateUrl: './status-icon-label.component.html', + styleUrls: ['./status-icon-label.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatProgressSpinnerModule, + MatIcon + ] }) export class StatusIconLabelComponent { protected readonly experimentsStatusLabels = EXPERIMENTS_STATUS_LABELS; @@ -35,11 +34,13 @@ export class StatusIconLabelComponent { statusIcon = computed(() => { switch (this.status()) { case 'created': + case 'Draft': return 'al-ico-status-draft'; case 'completed': case 'stopped': case 'closed': case 'Final': + case 'Ready': return 'al-ico-completed'; case 'in_progress': case 'Uploading': diff --git a/src/app/webapp-common/shared/experiment-type-icon-label/experiment-type-icon-label.component.scss b/src/app/webapp-common/shared/experiment-type-icon-label/experiment-type-icon-label.component.scss index 7b1bf147..9c23337f 100644 --- a/src/app/webapp-common/shared/experiment-type-icon-label/experiment-type-icon-label.component.scss +++ b/src/app/webapp-common/shared/experiment-type-icon-label/experiment-type-icon-label.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { display: inline-flex; align-items: center; diff --git a/src/app/webapp-common/shared/experiment-type-icon-label/experiment-type-icon-label.component.ts b/src/app/webapp-common/shared/experiment-type-icon-label/experiment-type-icon-label.component.ts index 387dda5c..b8ca88bd 100644 --- a/src/app/webapp-common/shared/experiment-type-icon-label/experiment-type-icon-label.component.ts +++ b/src/app/webapp-common/shared/experiment-type-icon-label/experiment-type-icon-label.component.ts @@ -6,16 +6,15 @@ import { MatIcon } from '@angular/material/icon'; @Component({ - selector: 'sm-experiment-type-icon-label', - templateUrl: './experiment-type-icon-label.component.html', - styleUrls: ['./experiment-type-icon-label.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - NoUnderscorePipe, - TitleCasePipe, - MatIcon -] + selector: 'sm-experiment-type-icon-label', + templateUrl: './experiment-type-icon-label.component.html', + styleUrls: ['./experiment-type-icon-label.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + NoUnderscorePipe, + TitleCasePipe, + MatIcon + ] }) export class ExperimentTypeIconLabelComponent{ @Input() type: TaskTypeEnum; diff --git a/src/app/webapp-common/shared/guards/general-leaving-before-save-alert.guard.ts b/src/app/webapp-common/shared/guards/general-leaving-before-save-alert.guard.ts index 3139f755..7d174cc6 100644 --- a/src/app/webapp-common/shared/guards/general-leaving-before-save-alert.guard.ts +++ b/src/app/webapp-common/shared/guards/general-leaving-before-save-alert.guard.ts @@ -1,13 +1,18 @@ -import {inject} from '@angular/core'; +import {inject, Signal} from '@angular/core'; import {CanDeactivateFn} from '@angular/router'; import {MatDialog} from '@angular/material/dialog'; import {ConfirmDialogComponent} from '../ui-components/overlay/confirm-dialog/confirm-dialog.component'; import {map} from 'rxjs/operators'; -export const generalLeavingBeforeSaveAlertGuard: CanDeactivateFn = (component) => { +export interface DirtyState { + isDirty: Signal +} + + +export const generalLeavingBeforeSaveAlertGuard: CanDeactivateFn = (component) => { const dialog = inject(MatDialog); - if (!component.isDirty) { + if (!component.isDirty()) { return true; } diff --git a/src/app/webapp-common/shared/guards/leaving-before-save-alert.guard.ts b/src/app/webapp-common/shared/guards/leaving-before-save-alert.guard.ts index b3cf47ad..8fc15f86 100644 --- a/src/app/webapp-common/shared/guards/leaving-before-save-alert.guard.ts +++ b/src/app/webapp-common/shared/guards/leaving-before-save-alert.guard.ts @@ -16,7 +16,6 @@ export const leavingBeforeSaveAlertGuard = (inEditSelector: MemoizedSelector { const store = inject(Store); const dialog = inject(MatDialog); - return store.select(inEditSelector) .pipe( debounceTime(0), diff --git a/src/app/webapp-common/shared/pipes/duration.pipe.ts b/src/app/webapp-common/shared/pipes/duration.pipe.ts index 0f71ebdf..0d8a8cf4 100644 --- a/src/app/webapp-common/shared/pipes/duration.pipe.ts +++ b/src/app/webapp-common/shared/pipes/duration.pipe.ts @@ -29,7 +29,7 @@ export class DurationPipe implements PipeTransform { return `${result}${units}`; } else if (hours) { if(units === 'd') { - result.push(hours.toString().padStart(2, '0')); + result.length > 0 ? result.push(hours.toString().padStart(2, '0')) : result.push(hours.toString()); } else { result.push(hours.toString()); } @@ -44,7 +44,8 @@ export class DurationPipe implements PipeTransform { if (hours && !minutes) { return `${result}${units}`; } else if (minutes) { - result.push(minutes.toString().padStart(2, '0')); + // result.push(minutes.toString().padStart(2, '0')); + result.length > 0 ? result.push(minutes.toString().padStart(2, '0')) : result.push(minutes.toString()); if (result.length === 2) { return `${result.join(':')}${units}`; } @@ -55,7 +56,8 @@ export class DurationPipe implements PipeTransform { // 3- Extract minutes: const seconds = Math.floor(calcSeconds) % 100; if (seconds) { - result.push(seconds.toString().padStart(2, '0')); + // result.push(seconds.toString().padStart(2, '0')); + result.length > 0 ? result.push(seconds.toString().padStart(2, '0')) : result.push(seconds.toString()); if (result.length === 2) { return `${result.join(':')}${units}`; } diff --git a/src/app/webapp-common/shared/pipes/filterOut.pipe.ts b/src/app/webapp-common/shared/pipes/filterOut.pipe.ts index 56fe2c59..18e5c840 100644 --- a/src/app/webapp-common/shared/pipes/filterOut.pipe.ts +++ b/src/app/webapp-common/shared/pipes/filterOut.pipe.ts @@ -4,9 +4,9 @@ import {Pipe, PipeTransform} from '@angular/core'; name: 'filterOut', standalone: true }) -export class FilterOutPipe implements PipeTransform { +export class FilterOutPipe implements PipeTransform { - transform(arr: unknown[], field: string, value: string | boolean): unknown[] { + transform(arr: T[], field: string, value: string | boolean): T[] { if (!arr || !field || value === undefined) { return arr; } diff --git a/src/app/webapp-common/shared/portal/portal.component.ts b/src/app/webapp-common/shared/portal/portal.component.ts index 7b729beb..f16ecb65 100644 --- a/src/app/webapp-common/shared/portal/portal.component.ts +++ b/src/app/webapp-common/shared/portal/portal.component.ts @@ -7,13 +7,12 @@ import {DOCUMENT} from '@angular/common'; import {DialogModule} from '@angular/cdk/dialog'; @Component({ - selector: 'sm-portal', - templateUrl: './portal.component.html', - styleUrls: ['./portal.component.scss'], - standalone: true, - imports: [ - DialogModule - ] + selector: 'sm-portal', + templateUrl: './portal.component.html', + styleUrls: ['./portal.component.scss'], + imports: [ + DialogModule + ] }) export class PortalComponent implements AfterViewInit, OnDestroy { @Input() outletId: string; diff --git a/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.html b/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.html index 76c8323b..da6628fd 100644 --- a/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.html +++ b/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.html @@ -16,16 +16,16 @@ @if (errors?.required) { Please add name. } - @if (errors?.uniqueProject) { + @else if (errors?.uniqueProject) { Project name in this path already exists. } - @if (errors?.minlength) { + @else if (errors?.minlength) { Project name should contain more than 3 characters. } - @if (errors?.emptyName && !errors?.minlength) { + @else if (errors?.emptyName && !errors?.minlength) { Project name can't contain only spaces. } - @if (errors?.pattern && !errors?.minlength) { + @else if (errors?.pattern && !errors?.minlength) { Project name can't contain slash (/) } @@ -41,20 +41,17 @@ [createNewSuffix]="projects() !== null && projectForm.controls.parent.value && !(projectForm.controls.parent.value | stringIncludedInArray: projectsNames())" (getEntities)="loadMore($event, false)" (loadMore)="loadMore($event, true)" - > - -
- @if ((!projectForm.controls.parent.untouched) && projectForm.controls.parent.invalid && projectForm.controls.parent.errors; as errors) { - - @if (errors?.required) { - Please add name. - } - @if (errors?.minlength) { - Project name should contain more than 3 characters. - } - - } -
+ > + @if (!projectForm.controls.parent.untouched && projectForm.controls.parent.errors; as errors) { +
+ @if (errors?.required) { + Please add name. + } + @if (errors?.minlength) { + Project name should contain more than 3 characters. + } +
+ } Description diff --git a/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.scss b/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.scss index 1a869b2b..decec0c0 100644 --- a/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.scss +++ b/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.scss @@ -22,3 +22,9 @@ min-height: 20px; } } + +.extra-errors { + position: relative; + top: -18px; + left: 6px; +} diff --git a/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.ts b/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.ts index 873a09d2..eb12af9c 100644 --- a/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.ts +++ b/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.ts @@ -1,14 +1,17 @@ import { ChangeDetectionStrategy, Component, computed, effect, inject, - input, output } from '@angular/core'; + input, output +} from '@angular/core'; import {Project} from '~/business-logic/model/projects/project'; import {FormBuilder, ReactiveFormsModule, Validators} from '@angular/forms'; import {rootProjectsPageSize} from '@common/constants'; import {MatInputModule} from '@angular/material/input'; import {StringIncludedInArrayPipe} from '@common/shared/pipes/string-included-in-array.pipe'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; -import {UniqueNameValidatorDirective} from '@common/shared/ui-components/template-forms-ui/unique-name-validator.directive'; +import { + UniqueNameValidatorDirective +} from '@common/shared/ui-components/template-forms-ui/unique-name-validator.directive'; import {UniqueProjectValidator} from '@common/shared/project-dialog/unique-project.validator'; import { PaginatedEntitySelectorComponent @@ -16,6 +19,7 @@ import { import {toSignal} from '@angular/core/rxjs-interop'; import {OutputDestPattern} from '@common/shared/project-dialog/project-dialog.component'; import {MatButton} from '@angular/material/button'; +import {minLengthNoSpaces} from '@common/shared/validators/minLengthNoSpaces'; export interface NewProjectResults { name?: string; @@ -30,7 +34,6 @@ export interface NewProjectResults { templateUrl: './create-new-project-form.component.html', styleUrls: ['./create-new-project-form.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, imports: [ MatInputModule, StringIncludedInArrayPipe, @@ -48,7 +51,7 @@ export class CreateNewProjectFormComponent { public readonly projectsRoot = 'Projects root'; projectForm = this.formBuilder.group({ - name: ['', [Validators.required, Validators.minLength(3)]], + name: ['', [Validators.required, minLengthNoSpaces(3)]], description: [''], default_output_destination: [null, [Validators.pattern(OutputDestPattern)]], @@ -68,16 +71,19 @@ export class CreateNewProjectFormComponent { projects = input(); protected rootFiltered = computed(() => !this.projectsRoot.includes(this.projectValue()) && this.projectsRoot === this.baseProject()?.name); protected allProjects = computed(() => ([ - ...(!this.projects() || this.rootFiltered() || this.baseProject()?.id === null ? [] : [{name: this.projectsRoot, id: '999999999999999'}]), + ...(!this.projects() || this.rootFiltered() || this.baseProject()?.id === null ? [] : [{ + name: this.projectsRoot, + id: '999999999999999' + }]), ...(this.baseProject() && !this.projectForm.controls.parent.value ? [this.baseProject()] : []), ...this.projects() ?? [] ])); - protected projectsNames = computed(() => (this.allProjects().map(project => project.name))); + protected projectsNames = computed(() => [...this.allProjects().map(project => project.name), ...this.baseProject() ? [this.baseProject().name] : []]); filterSearchChanged = output<{ - value: string; - loadMore?: boolean; - }>(); + value: string; + loadMore?: boolean; + }>(); projectCreated = output(); diff --git a/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.html b/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.html index 730d92a7..618b2cfc 100644 --- a/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.html +++ b/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.html @@ -15,16 +15,16 @@ @if (errors?.required) { Please add name. } - @if (errors?.uniqueProject) { + @else if (errors?.uniqueProject) { Project name in this path already exists. } - @if (errors?.minlength) { + @else if (errors?.minlength) { Project name should contain more than 3 characters. } - @if (errors?.emptyName && !errors?.minlength) { + @else if (errors?.emptyName && !errors?.minlength) { Project name can't contain only spaces. } - @if (errors?.pattern && !errors?.minlength) { + @else if (errors?.pattern && !errors?.minlength) { Project name can't contain slash (/) } @@ -35,7 +35,6 @@ @@ -45,7 +44,6 @@ matInput name="default_output_destination" formControlName="default_output_destination" - [disabled]="true" > @if (projectForm.controls.default_output_destination.invalid && projectForm.controls.default_output_destination.errors; as errors) { @@ -55,10 +53,4 @@ } -
- - -
diff --git a/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.ts b/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.ts index de68285b..1c206f82 100644 --- a/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.ts +++ b/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.ts @@ -1,13 +1,4 @@ -import { - ChangeDetectionStrategy, - Component, - computed, - effect, - EventEmitter, - inject, - input, - Output, -} from '@angular/core'; +import {ChangeDetectionStrategy, Component, computed, effect, EventEmitter, inject, input, Output} from '@angular/core'; import {Project} from '~/business-logic/model/projects/project'; import {FormBuilder, ReactiveFormsModule, Validators} from '@angular/forms'; import {MatInputModule} from '@angular/material/input'; @@ -15,22 +6,22 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {UniqueProjectValidator} from '@common/shared/project-dialog/unique-project.validator'; import {OutputDestPattern} from '@common/shared/project-dialog/project-dialog.component'; import {ProjectLocationPipe} from '@common/shared/pipes/project-location.pipe'; -import {MatButton} from '@angular/material/button'; +import {toSignal} from '@angular/core/rxjs-interop'; +import {debounceTime, skip} from 'rxjs/operators'; +import {minLengthNoSpaces} from '@common/shared/validators/minLengthNoSpaces'; @Component({ - selector: 'sm-edit-project-form', - templateUrl: './edit-project-form.component.html', - styleUrls: ['./edit-project-form.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - MatInputModule, - MatProgressSpinnerModule, - UniqueProjectValidator, - ReactiveFormsModule, - MatButton, - ] + selector: 'sm-edit-project-form', + templateUrl: './edit-project-form.component.html', + styleUrls: ['./edit-project-form.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatInputModule, + MatProgressSpinnerModule, + UniqueProjectValidator, + ReactiveFormsModule + ] }) export class EditProjectFormComponent { private readonly formBuilder = inject(FormBuilder); @@ -38,17 +29,16 @@ export class EditProjectFormComponent { public readonly projectsRoot = 'Projects root'; projectForm = this.formBuilder.group({ - name: ['', [Validators.required, Validators.minLength(3)]], - parent: [null as string,[]], - default_output_destination: [null as string,[Validators.pattern(OutputDestPattern)]], + name: ['', [Validators.required, minLengthNoSpaces(3)]], + parent: [{value: null as string, disabled: true}], + default_output_destination: [{value: null as string, disabled: false}, [Validators.pattern(OutputDestPattern)]], system_tags: [[]] }); public loading: boolean; public noMoreOptions: boolean; - - + valueChanges = toSignal(this.projectForm.valueChanges.pipe(debounceTime(300),skip(1))); project = input(); parentProjectPath = computed(() => { return new ProjectLocationPipe().transform(this.project()?.name) @@ -65,6 +55,15 @@ export class EditProjectFormComponent { this.projectForm.controls.default_output_destination.setValue(this.project()?.default_output_destination); this.projectForm.controls.parent.disable(); }); + + effect(() => { + if (this.valueChanges()) { + this.projectUpdated.emit({ + ...this.projectForm.getRawValue(), + ...(this.projectForm.controls.default_output_destination.value === '' && {default_output_destination: null}) + }) + } + }); } send() { diff --git a/src/app/webapp-common/shared/project-dialog/project-dialog.component.html b/src/app/webapp-common/shared/project-dialog/project-dialog.component.html index 03873650..7d798b42 100644 --- a/src/app/webapp-common/shared/project-dialog/project-dialog.component.html +++ b/src/app/webapp-common/shared/project-dialog/project-dialog.component.html @@ -7,13 +7,6 @@ (projectCreated)="createProject($event)"> } - @if ( mode === 'edit') { - - - } @if ( mode === 'move') { [deactivateLoader(action.type), requestFailed(error), addMessage(MESSAGES_SEVERITY.ERROR, 'Project Created Failed'), newProjectActions.setCreationStatus({status: CREATION_STATUS.FAILED})]) @@ -85,7 +85,7 @@ export class ProjectDialogEffects { deactivateLoader(action.type), newProjectActions.setCreationStatus({status: CREATION_STATUS.SUCCESS}), getAllSystemProjects(), - addMessage(MESSAGES_SEVERITY.SUCCESS, `${action.projectName} has been moved from ${action.fromName} to ${action.toName}`), + addMessage(MESSAGES_SEVERITY.SUCCESS, `${action.projectName} has been moved from ${action.fromName} to ${action.toName}`) ] ), catchError(error => [deactivateLoader(action.type), requestFailed(error), addMessage(MESSAGES_SEVERITY.ERROR, 'Project Move Failed'), newProjectActions.setCreationStatus({status: CREATION_STATUS.FAILED})]) diff --git a/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.html b/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.html index fcc5b388..5ee77e6d 100644 --- a/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.html +++ b/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.html @@ -28,27 +28,28 @@ smUniqueNameValidator [existingNames]="[projectName | projectLocation]" smInvalidPrefixValidator [invalidPrefix]="projectName" required minlength="3" - > - + > @if (projectInput.touched && projectInput?.errors; as errors) { - @if (errors?.required) { - Please provide a Project - } - @if (errors?.minlength) { - Project name should be at least 3 characters long - } - @if (errors?.uniqueName && !projectInput?.errors?.required) { - Can't move a project to its current location - } - @if (errors?.invalidPrefix) { - Can't move a project to its nested projects - } - @if (errors?.uniquePath) { - {{ projectInput.value }} already contains a project named {{ projectName | shortProjectName }} - } - @if (errors?.emptyName && !errors?.minlength) { - Project name can't contain only spaces. - } +
+ @if (errors?.required) { + Please provide a Project + } + @if (errors?.minlength) { + Project name should be at least 3 characters long + } + @if (errors?.uniqueName && !projectInput?.errors?.required) { + Can't move a project to its current location + } + @if (errors?.invalidPrefix) { + Can't move a project to its nested projects + } + @if (errors?.uniquePath) { + {{ projectInput.value }} already contains a project named {{ projectName | shortProjectName }} + } + @if (errors?.emptyName && !errors?.minlength) { + Project name can't contain only spaces. + } +
}
diff --git a/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.scss b/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.scss index adc5c948..3d5eefa9 100644 --- a/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.scss +++ b/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { .creat-new-suffix { display: inline-block; @@ -61,3 +59,9 @@ } } } + +.extra-errors { + position: relative; + top: -18px; + left: 6px; +} diff --git a/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.ts b/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.ts index d40eae94..aed4f71d 100644 --- a/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.ts +++ b/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.ts @@ -13,17 +13,10 @@ import {Subscription, switchMap} from 'rxjs'; import {rootProjectsPageSize} from '@common/constants'; import {MatInputModule} from '@angular/material/input'; import {StringIncludedInArrayPipe} from '@common/shared/pipes/string-included-in-array.pipe'; -import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; -import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; -import {SearchTextDirective} from '@common/shared/ui-components/directives/searchText.directive'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; -import {ScrollEndDirective} from '@common/shared/ui-components/directives/scroll-end.directive'; import {UniqueNameValidatorDirective} from '@common/shared/ui-components/template-forms-ui/unique-name-validator.directive'; -import {UniqueProjectValidator} from '@common/shared/project-dialog/unique-project.validator'; -import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; import {InvalidPrefixValidatorDirective} from '@common/shared/ui-components/template-forms-ui/invalid-prefix-validator.directive'; import {UniquePathValidatorDirective} from '@common/shared/ui-components/template-forms-ui/unique-path-validator.directive'; -import {DotsLoadMoreComponent} from '@common/shared/ui-components/indicators/dots-load-more/dots-load-more.component'; import { PaginatedEntitySelectorComponent } from '@common/shared/components/paginated-entity-selector/paginated-entity-selector.component'; @@ -33,32 +26,24 @@ import {MatButton} from '@angular/material/button'; @Component({ - selector: 'sm-project-move-to-form', - templateUrl: './project-move-to-form.component.html', - styleUrls: ['./project-move-to-form.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - MatInputModule, - FormsModule, - MatAutocompleteModule, - StringIncludedInArrayPipe, - ClickStopPropagationDirective, - TooltipDirective, - SearchTextDirective, - MatProgressSpinnerModule, - ScrollEndDirective, - UniqueNameValidatorDirective, - UniqueProjectValidator, - ShowTooltipIfEllipsisDirective, - ShortProjectNamePipe, - ProjectLocationPipe, - InvalidPrefixValidatorDirective, - UniquePathValidatorDirective, - DotsLoadMoreComponent, - PaginatedEntitySelectorComponent, - MatButton, - ] + selector: 'sm-project-move-to-form', + templateUrl: './project-move-to-form.component.html', + styleUrls: ['./project-move-to-form.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatInputModule, + FormsModule, + MatAutocompleteModule, + StringIncludedInArrayPipe, + MatProgressSpinnerModule, + UniqueNameValidatorDirective, + ShortProjectNamePipe, + ProjectLocationPipe, + InvalidPrefixValidatorDirective, + UniquePathValidatorDirective, + PaginatedEntitySelectorComponent, + MatButton, + ] }) export class ProjectMoveToFormComponent implements OnChanges, OnDestroy, AfterViewInit { public readonly projectsRoot = 'Projects root'; diff --git a/src/app/webapp-common/shared/project-dialog/project-settings/project-settings-dialog.component.html b/src/app/webapp-common/shared/project-dialog/project-settings/project-settings-dialog.component.html new file mode 100644 index 00000000..2c4ba70b --- /dev/null +++ b/src/app/webapp-common/shared/project-dialog/project-settings/project-settings-dialog.component.html @@ -0,0 +1,60 @@ + + + + + + + + + + + +
+
Default Scalars +
+ +
+ + + + + + + + + diff --git a/src/app/webapp-common/shared/project-dialog/project-settings/project-settings-dialog.component.scss b/src/app/webapp-common/shared/project-dialog/project-settings/project-settings-dialog.component.scss new file mode 100644 index 00000000..ef839e63 --- /dev/null +++ b/src/app/webapp-common/shared/project-dialog/project-settings/project-settings-dialog.component.scss @@ -0,0 +1,67 @@ +:host { + .actions { + display: flex; + align-items: center; + justify-content: center; + gap: 12px; + margin-top: 32px; + } + + .data-project { + margin-top: 12px; + display: block; + } + + .list { + padding-top: 24px; + border-top: 1px solid var(--color-surface-container-high); + } + + sm-edit-project-form { + display: block; + } + + sm-graph-settings-bar { + padding: 16px 0; + } + + sm-selectable-grouped-filter-list { + max-height: 350px; + min-height: 200px; + } + + ::ng-deep sm-selectable-grouped-filter-list sm-search { + padding-top: 0; + } + + + ////// Setting vertical mode 2 ////// + ::ng-deep sm-graph-settings-bar.graph-settings-menu { + width: 100%; + + .vertical-layout.x-axis-options { + flex-direction: unset; + .divider{ + border-top: unset; + padding-top: unset; + } + } + .width-100 { + width: unset; + } + .label-text { + min-width: 80px; + } + .field.last-elm { + margin-left: auto; + } + + } + + ::ng-deep sm-selectable-grouped-filter-list{ + sm-search, + sm-grouped-selectable-list { + padding: 0; + } + } +} diff --git a/src/app/webapp-common/shared/project-dialog/project-settings/project-settings-dialog.component.ts b/src/app/webapp-common/shared/project-dialog/project-settings/project-settings-dialog.component.ts new file mode 100644 index 00000000..f8763f0e --- /dev/null +++ b/src/app/webapp-common/shared/project-dialog/project-settings/project-settings-dialog.component.ts @@ -0,0 +1,229 @@ +import {ChangeDetectionStrategy, Component, computed, inject, linkedSignal, signal, Signal} from '@angular/core'; +import {ReactiveFormsModule} from '@angular/forms'; +import {MatInputModule} from '@angular/material/input'; +import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; +import {MatButton} from '@angular/material/button'; +import {ExperimentGraphsModule} from '@common/shared/experiment-graphs/experiment-graphs.module'; +import {groupByCharts, GroupByCharts, removeExperimentSettings, setExperimentSettings} from '@common/experiments/actions/common-experiment-output.actions'; +import {smoothTypeEnum, SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; +import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; +import {Store} from '@ngrx/store'; +import {MAT_DIALOG_DATA, MatDialogActions, MatDialogRef} from '@angular/material/dialog'; +import {selectHasScalarSingleValue, selectSelectedExperimentSettings, selectSelectedSettingsHiddenScalar} from '@common/experiments/reducers'; +import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dialog-template/dialog-template.component'; +import {Project} from '~/business-logic/model/projects/project'; +import {MatTab, MatTabGroup} from '@angular/material/tabs'; +import {EditProjectFormComponent} from '@common/shared/project-dialog/edit-project-form/edit-project-form.component'; +import {ProjectsCreateRequest} from '~/business-logic/model/projects/projectsCreateRequest'; +import {SelectableGroupedFilterListComponent} from '@common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component'; +import {GroupedList} from '@common/tasks/tasks.model'; +import {sortByFieldSummaryFirst} from '@common/tasks/tasks.utils'; +import {singleValueChartTitle} from '@common/experiments/shared/common-experiments.const'; +import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; +import {PlotData} from 'plotly.js'; +import {GraphSettingsBarComponent} from '@common/shared/experiment-graphs/graph-settings-bar/graph-settings-bar.component'; +import {updateProject as dialogUpdateProject} from '@common/shared/project-dialog/project-dialog.actions'; +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {ProjectSettingsStore} from '@common/shared/project-dialog/project-settings/project-settings-dialog.store'; + +export interface ProjectSettingsDialogConfig { + project: Project; +} + +@Component({ + selector: 'sm-project-settings', + templateUrl: './project-settings-dialog.component.html', + styleUrls: ['./project-settings-dialog.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + providers: [ProjectSettingsStore], + imports: [ + MatInputModule, + MatProgressSpinnerModule, + ReactiveFormsModule, + MatButton, + ExperimentGraphsModule, + DialogTemplateComponent, + MatTabGroup, + MatTab, + EditProjectFormComponent, + MatDialogActions, + SelectableGroupedFilterListComponent, + GraphSettingsBarComponent, + TooltipDirective + ] +}) +export class ProjectSettingsDialogComponent { + private store = inject(Store); + private settingsStore = inject(ProjectSettingsStore); + private dialogRef = inject(MatDialogRef); + protected readonly data: ProjectSettingsDialogConfig = inject(MAT_DIALOG_DATA); + groupByOptions = [ + { + name: 'Metric', + value: groupByCharts.metric + }, + { + name: 'None', + value: groupByCharts.none + } + ]; + + private defaultSettings = { + groupBy: groupByCharts.metric, + smoothWeight: 0, + smoothSigma: 2, + smoothType: smoothTypeEnum.exponential, + xAxisType: ScalarKeyEnum.Iter, + hiddenMetricsScalar: [], + projectLevel: false + }; + + protected hasSingleValues = this.store.selectSignal(selectHasScalarSingleValue); + protected searchTerm = signal(''); + protected storeListOfHidden = this.store.selectSignal(selectSelectedSettingsHiddenScalar(this.data.project.id)); + protected listOfHidden = linkedSignal(() => [...this.storeListOfHidden()]); + + protected storeSettings = this.store.selectSignal(selectSelectedExperimentSettings(this.data.project.id)); + protected settings = linkedSignal(() => ({...this.defaultSettings, ...this.storeSettings()})); + protected settingsGroupBy = computed(() => this.settings().groupBy); + + protected scalarsWithoutSummary = computed(() => this.settingsStore.scalars().map(variant => variant.metric === singleValueChartTitle ? {...variant, variant: null} : variant)) + protected originalScalarList = computed(() => [ + ...this.scalarsWithoutSummary().map(({metric, variant}) => ({ + metric, + variant + })) + ]); + + protected scalarList: Signal = computed(() => ({ + ...this.groupByMetric(this.scalarsWithoutSummary(), this.settingsGroupBy() === 'none') + })); + + protected selectedMetrics = computed(() => { + const selectedMetrics = this.settingsGroupBy() === 'metric' ? this.originalScalarList().filter(({metric}) => !this.listOfHidden().includes(metric)) : + this.originalScalarList().filter(({metric, variant}) => variant !== null ? + !this.listOfHidden().includes(`${metric}${variant}`) && !this.listOfHidden().includes(metric) : + !this.listOfHidden().includes(metric) + ); + + const metricsWithoutVariants = selectedMetrics + .map(({metric}) => metric) + .filter(m => !!m); + return Array.from(new Set([ + ...selectedMetrics.map(({metric, variant}) => `${metric}${variant}`), + ...metricsWithoutVariants + ])); + }); + + private project: Project; + protected scalarSettingsChanged = signal(false); + protected generalChanged= signal(false); + protected hiddenChanged= signal(false); + dialogTitle = signal(`PROJECT SETTINGS: "${this.data.project.name}"`); + + constructor() { + this.settingsStore.setProject(this.data.project.id); + this.settingsStore.loadScalars(); + } + + changeSmoothness($event: number) { + this.scalarSettingsChanged.set(true); + this.settings.update(settings => ({...settings, smoothWeight: $event})); + } + changeSigma($event: number) { + this.scalarSettingsChanged.set(true); + this.settings.update(settings => ({...settings, smoothSigma: $event})); + } + + changeSmoothType($event: SmoothTypeEnum) { + this.scalarSettingsChanged.set(true); + this.settings.update(settings => ({ + ...settings, smoothType: $event, + ...(settings.smoothType !== smoothTypeEnum.gaussian && {smoothSigma: 2}) + })); + } + + changeXAxisType($event: ScalarKeyEnum) { + this.scalarSettingsChanged.set(true); + this.settings.update(settings => ({...settings, xAxisType: $event})); + } + + changeGroupBy($event: GroupByCharts) { + this.scalarSettingsChanged.set(true); + this.settings.update(settings => ({...settings, groupBy: $event})); + } + + closeDialog() { + this.dialogRef.close(); + } + + removeSettings() { + this.store.dispatch(removeExperimentSettings({id: this.data.project.id})); + } + + updateProject(projectForm) { + this.generalChanged.set(true); + this.project = this.convertFormToProject(projectForm); + } + + private convertFormToProject(projectForm: any): ProjectsCreateRequest { + return { + name: `${projectForm.parent === 'Projects root' ? '' : projectForm.parent + '/'}${projectForm.name}`, + ...(projectForm.description && {description: projectForm.description}), + ...(projectForm.system_tags && {system_tags: projectForm.system_tags}), + default_output_destination: projectForm.default_output_destination + }; + } + + + groupByMetric(variants: MetricVariantResult[], groupBy:boolean): GroupedList { + const result: GroupedList = {}; + + sortByFieldSummaryFirst(variants, 'metric').forEach((variant) => { + if (!result[variant.metric]) { + result[variant.metric] = {}; + } + + if(groupBy && variant.variant) { + result[variant.metric][variant.variant] = {} as PlotData; + } + }); + + return result; + } + + hiddenListChanged(hiddenList: string[]) { + if (Object.keys(this.scalarList() ?? {}).length > 0) { + this.hiddenChanged.set(true); + } + const metrics = Object.keys(this.scalarList()); + const variants = metrics.map((metric) => Object.keys(this.scalarList()[metric]).map(v => metric + v)).flat(2); + this.listOfHidden.set([...metrics, ...variants].filter(metric => !hiddenList.includes(metric))); + } + + searchTermChanged(searchTerm: string) { + this.searchTerm.set(searchTerm); + } + + save() { + if (this.scalarSettingsChanged() || this.hiddenChanged()) { + this.store.dispatch(setExperimentSettings({ + id: this.data.project.id, + changes: { + ...{ + ...this.settings(), + hiddenMetricsScalar: this.settings().hiddenMetricsScalar?.length > 0 ? this.settings().hiddenMetricsScalar : undefined, + projectLevel: true}, + ...(this.hiddenChanged() && {hiddenMetricsScalar: this.listOfHidden()}) + } + })); + if (!this.generalChanged()) { + this.dialogRef.close(); + } + } + if (this.generalChanged()) { + this.store.dispatch(dialogUpdateProject({req: {...this.project, project: this.data.project.id}, dialogId: this.dialogRef.id})); + } + } +} + diff --git a/src/app/webapp-common/shared/project-dialog/project-settings/project-settings-dialog.store.ts b/src/app/webapp-common/shared/project-dialog/project-settings/project-settings-dialog.store.ts new file mode 100644 index 00000000..9ab8f49f --- /dev/null +++ b/src/app/webapp-common/shared/project-dialog/project-settings/project-settings-dialog.store.ts @@ -0,0 +1,41 @@ +import {patchState, signalStore, withMethods, withState} from '@ngrx/signals'; +import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; +import {inject} from '@angular/core'; +import {ApiProjectsService} from '~/business-logic/api-services/projects.service'; +import {forkJoin, lastValueFrom, Observable} from 'rxjs'; +import {map} from 'rxjs/operators'; +import {sortByField} from '@common/tasks/tasks.utils'; + +interface ProjectSettingsState { + scalars: MetricVariantResult[]; + projectId: string; +} + +const initialState: ProjectSettingsState = { + scalars: [], + projectId: null, +}; + +export const ProjectSettingsStore = signalStore( + withState(initialState), + withMethods((store, projectsApi = inject(ApiProjectsService)) => ({ + async loadScalars() { + const experimentsMetrics: Observable = projectsApi.projectsGetUniqueMetricVariants({ + project: store.projectId() === '*' ? null : store.projectId(), + include_subprojects: false + }).pipe(map(res => res.metrics)) + const modelsMetrics: Observable = projectsApi.projectsGetUniqueMetricVariants({ + project: store.projectId() === '*' ? null : store.projectId(), + include_subprojects: false, + model_metrics: true + }).pipe(map(res => res.metrics)) + const scalars = await lastValueFrom(forkJoin([experimentsMetrics, modelsMetrics])); + // const scalars = toSignal(experimentsMetrics); + patchState(store, { scalars: sortByField(scalars?.flat(), 'metric') || [] }); + }, + + setProject(projectId: string): void { + patchState(store, () => ({ projectId: projectId })); + }, + })) +); diff --git a/src/app/webapp-common/shared/queue-create-dialog/create-new-queue-form/create-new-queue-form.component.ts b/src/app/webapp-common/shared/queue-create-dialog/create-new-queue-form/create-new-queue-form.component.ts index 207ba588..7d932d2a 100644 --- a/src/app/webapp-common/shared/queue-create-dialog/create-new-queue-form/create-new-queue-form.component.ts +++ b/src/app/webapp-common/shared/queue-create-dialog/create-new-queue-form/create-new-queue-form.component.ts @@ -11,20 +11,19 @@ import {Queue} from '@common/workers-and-queues/actions/queues.actions'; @Component({ - selector: 'sm-create-new-queue-form', - standalone: true, - templateUrl: './create-new-queue-form.component.html', - imports: [ - MatDialogActions, - MatButton, - MatFormField, - FormsModule, - UniqueNameValidatorDirective, - MatInput, - MatLabel, - MatError, - ], - styleUrls: ['./create-new-queue-form.component.scss'] + selector: 'sm-create-new-queue-form', + templateUrl: './create-new-queue-form.component.html', + imports: [ + MatDialogActions, + MatButton, + MatFormField, + FormsModule, + UniqueNameValidatorDirective, + MatInput, + MatLabel, + MatError, + ], + styleUrls: ['./create-new-queue-form.component.scss'] }) export class CreateNewQueueFormComponent { public queuesNames: string[]; diff --git a/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.component.ts b/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.component.ts index 438c4881..5f6f3b74 100644 --- a/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.component.ts +++ b/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.component.ts @@ -9,9 +9,10 @@ import {Observable, Subscription} from 'rxjs'; import {Queue} from '@common/workers-and-queues/actions/queues.actions'; @Component({ - selector : 'sm-queue-create-dialog', - templateUrl: './queue-create-dialog.component.html', - styleUrls : ['./queue-create-dialog.component.scss'] + selector: 'sm-queue-create-dialog', + templateUrl: './queue-create-dialog.component.html', + styleUrls: ['./queue-create-dialog.component.scss'], + standalone: false }) export class QueueCreateDialogComponent implements OnInit, OnDestroy { public queues$: Observable; diff --git a/src/app/webapp-common/shared/services/color-hash/color-hash.service.ts b/src/app/webapp-common/shared/services/color-hash/color-hash.service.ts index 4a34cc40..c5faa8dc 100644 --- a/src/app/webapp-common/shared/services/color-hash/color-hash.service.ts +++ b/src/app/webapp-common/shared/services/color-hash/color-hash.service.ts @@ -69,6 +69,9 @@ export class ColorHashService { if (tLum < 0.3 && lighten) { tColor = tColor.lighten(30 - tLum * 100); } + if (tColor.getBrightness() > 210 && !lighten) { + tColor = tColor.shade(12); + } const {r, g, b} = tColor.toRgb(); const color = initColor ? initColor : [r, g, b]; this.setColorForString(label, color, false); diff --git a/src/app/webapp-common/shared/services/login.service.ts b/src/app/webapp-common/shared/services/login.service.ts index 6c81e2d9..d0f0c7df 100644 --- a/src/app/webapp-common/shared/services/login.service.ts +++ b/src/app/webapp-common/shared/services/login.service.ts @@ -13,7 +13,6 @@ import {clone} from 'lodash-es'; import {ApiLoginService} from '~/business-logic/api-services/login.service'; import {ConfigurationService} from './configuration.service'; import {USER_PREFERENCES_KEY, UserPreferences} from '@common/user-preferences'; -import {setUserLoginState} from '@common/login/login.actions'; import {fetchCurrentUser} from '@common/core/actions/users.actions'; import {Store} from '@ngrx/store'; import {ConfirmDialogConfig} from '@common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.model'; @@ -21,14 +20,16 @@ import {Router} from '@angular/router'; import {LocationStrategy} from '@angular/common'; import {selectDarkTheme} from '@common/core/reducers/view.reducer'; import {environment} from '../../../../environments/environment'; +import {TIME_IN_MILLI} from '@common/shared/utils/time-util'; -export type LoginMode = 'simple' | 'password' | 'ssoOnly' | 'error'; +export type LoginMode = 'simple' | 'password' | 'ssoOnly' | 'error' | 'tenant'; export const loginModes = { error: 'error' as LoginMode, simple: 'simple' as LoginMode, password: 'password' as LoginMode, - ssoOnly: 'ssoOnly' as LoginMode + ssoOnly: 'ssoOnly' as LoginMode, + tenantInput: 'tenant' as LoginMode }; @Injectable({ @@ -44,14 +45,14 @@ export class BaseLoginService { protected userPreferences = inject(UserPreferences); protected locationStrategy = inject(LocationStrategy); - onlyPasswordLogin: boolean; loginMode = signal(null); protected basePath = HTTP.API_BASE_URL; private userKey: string; private userSecret: string; private companyID: string; + private _loginModeTTL = 0; private _loginMode: LoginMode; - private _guestUser: { enabled: boolean; username: string; password: string }; + private _guestUser: LoginModeResponse['basic']['guest']; protected environment = this.configService.configuration; protected darkTheme = this.store.selectSignal(selectDarkTheme); private state = computed(() => ({ @@ -104,7 +105,7 @@ export class BaseLoginService { } getLoginMode(force = false): Observable { - if (this._loginMode !== undefined && !force) { + if (this._loginMode !== undefined && !force && this._loginModeTTL > new Date().getTime()) { return of(this._loginMode); } else { return this.getLoginSupportedModes() @@ -114,30 +115,42 @@ export class BaseLoginService { filter(res => !this.shouldOpenServerError(res?.server_errors)), tap((res: LoginModeResponse) => { this._authenticated = res.authenticated; - this._loginMode = res.basic.enabled ? loginModes.password : res.sso_providers?.length > 0 ? loginModes.ssoOnly : this.onlyPasswordLogin ? loginModes.error : loginModes.simple; this._guestUser = res.basic.guest; + this._loginMode = this.calcLoginMode(res); + this._loginModeTTL = new Date().getTime() + TIME_IN_MILLI.ONE_MIN * 10; }), map(() => { this.loginMode.set(this._loginMode); return this._loginMode; }), catchError(() => { - this.loginMode.set(this.configService.configuration().onlyPasswordLogin ? loginModes.error : loginModes.simple); - return EMPTY; + const fallback = this.configService.configuration().loginFallback; + this._loginMode = fallback === 'error' ? loginModes.error : loginModes.simple; + this.loginMode.set(this._loginMode); + return of(this._loginMode); }), ); } } + protected calcLoginMode(res: LoginModeResponse) { + const fallback = this.configService.configuration().loginFallback; + return res.basic.enabled ? + loginModes.password : + fallback === 'error' ? + loginModes.error : + loginModes.simple; + } + public getLoginSupportedModes(): Observable { return this.loginApi.loginSupportedModes({}); } getUsers() { - return this.httpClient.post(`${this.basePath}/users.get_all`, null, {headers: this.getHeaders()}) + return this.httpClient.post<{data: UsersGetAllResponse}>(`${this.basePath}/users.get_all`, null, {headers: this.getHeaders()}) .pipe( - map((x: any) => x.data.users) + map(x => x.data.users) ); } @@ -167,8 +180,8 @@ export class BaseLoginService { family_name: name.split(' ')[1] ? name.split(' ')[1] : name.split(' ')[0] }; - return this.httpClient.post(`${this.basePath}/auth.create_user`, data, {headers}) - .pipe(map((x: any) => x.data.id)); + return this.httpClient.post<{data: AuthCreateUserResponse}>(`${this.basePath}/auth.create_user`, data, {headers}) + .pipe(map(x => x.data.id)); } autoLogin(name: string) { @@ -245,12 +258,7 @@ After the issue is resolved and Trains Server is up and running, reload this pag this._loginMode = undefined; } - loginFlow(resolve, skipInvite = false) { - if (location.search.includes('invite') && !skipInvite) { - const currentURL = new URL(location.href); - const inviteId = currentURL.searchParams.get('invite'); - this.store.dispatch(setUserLoginState({user: null, inviteId, crmForm: null})); - } + loginFlow(resolve: (unknow) => void) { const redirectToLogin = (status) => { if (status === 401) { let pathname = window.location.pathname; @@ -315,7 +323,7 @@ After the issue is resolved and Trains Server is up and running, reload this pag } // eslint-disable-next-line @typescript-eslint/no-unused-vars - getInviteInfo(inviteId: string): Observable { + getInviteInfo(inviteId: string): Observable { return EMPTY; } } diff --git a/src/app/webapp-common/shared/services/report-code-embed-base.service.ts b/src/app/webapp-common/shared/services/report-code-embed-base.service.ts index bb8cd36a..4455f038 100644 --- a/src/app/webapp-common/shared/services/report-code-embed-base.service.ts +++ b/src/app/webapp-common/shared/services/report-code-embed-base.service.ts @@ -19,7 +19,8 @@ export interface ReportCodeEmbedConfiguration { metrics?: string[]; variants?: string[]; valueType?: string; - seriesName?: string; + seriesName?: string[]; + plotsNames?: string[]; xaxis?: string; group?: boolean; } @@ -58,7 +59,7 @@ export class ReportCodeEmbedBaseService { const url = this.getUrl(); url.searchParams.set('type', conf.type); url.searchParams.set('objectType', conf.objectType); - conf.seriesName && url.searchParams.set('series', conf.seriesName); + conf.seriesName && conf.seriesName.forEach(seriesName => seriesName && url.searchParams.append('series', seriesName)); conf.valueType && url.searchParams.set('value_type', conf.valueType); conf.xaxis && url.searchParams.set('xaxis', conf.xaxis); let urlStr = url.toString(); @@ -80,10 +81,10 @@ export class ReportCodeEmbedBaseService { const graphsUnmerged = conf.type === 'plot' && conf.variants.length > 1 && Array.from(new Set(conf.seriesName)).length < 2; if (conf.objects.length > 1 && graphsUnmerged) { return `

${conf.metrics[0]}

\n` + conf.objects.map((object, i) => - this.generateEmbedSnippet({...conf, objects: [object], seriesName: conf.seriesName[i]})).join('\n'); + this.generateEmbedSnippet({...conf, objects: [object], seriesName: [conf.seriesName[i]]})).join('\n'); } else { return `

${conf.metrics[0]}

\n` + conf.variants.map((variant, i) => - this.generateEmbedSnippet({...conf, variants: [variant], seriesName: conf.seriesName[i]})).join('\n'); + this.generateEmbedSnippet({...conf, variants: [variant], seriesName: [conf.seriesName[i]]})).join('\n'); } } diff --git a/src/app/webapp-common/shared/services/tips.service.ts b/src/app/webapp-common/shared/services/tips.service.ts index 8446b9d1..c913492b 100644 --- a/src/app/webapp-common/shared/services/tips.service.ts +++ b/src/app/webapp-common/shared/services/tips.service.ts @@ -60,7 +60,7 @@ export class TipsService { takeUntilDestroyed(), debounceTime(1000), filter(([, user, firstLogin, tos]) => !this.mobile && !firstLogin && !!user && !tos?.accept_required && !this.neverShowAgain && this.matDialog.openDialogs.length === 0), - distinctUntilChanged(([prev], [curr]) => prev?.[prev.length - 1] === curr[curr.length - 1])) + distinctUntilChanged(([prev], [curr]) => prev?.[prev.length - 1] === curr?.[curr?.length - 1])) .subscribe(([routerConfig]) => { const urlConfig = routerConfig?.join('/'); if (this.tipsConfig()?.['global'].length || this.tipsConfig()?.[urlConfig]) { diff --git a/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.html b/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.html index 11299597..1f202e8e 100644 --- a/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.html +++ b/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.html @@ -1,18 +1,18 @@
- @if (singleGraph && data.moveLegendToTitle && chart) { + [class.w-100]="!(minMaxIterations$ | ngrxPush)?.minIteration" + [smTooltip]="title" smShowTooltipIfEllipsis> + @if (shouldShowDot()) { + [style.background-color]="(smoothWeight ? singleGraph.chart?.data[1]?.line?.color : singleGraph.chart?.data[0]?.line?.color) ?? freezeColor" + [colorButtonRef]="dot" + [smChooseColor]="smoothWeight ? $any(singleGraph.chart?.data[1]?.line?.color): $any(singleGraph.chart?.data[0]?.line?.color)" + [stringToColor]="singleGraph.singleColorKey" + class="title-color"> } - {{title}} + {{ data.dialogTitle || title }}
@@ -22,7 +22,7 @@
@if (minMaxIterations.maxIteration !== minMaxIterations.minIteration || minMaxIterations.minIteration > 0) { - Iteration {{iteration}} + Iteration {{ iteration }} } @if (minMaxIterations.maxIteration !== minMaxIterations.minIteration) { @@ -31,13 +31,13 @@ [min]="minMaxIterations.minIteration" [step]="1" discrete - class="indicator-position-bottom" + class="ms-4 indicator-position-bottom" (mouseup)="fakeInput.focus()" - > + > + [ngModel]="iteration" + (ngModelChange)="changeIteration(ngSliderThumb.value)" + #ngSliderThumb="matSliderThumb"/> }
@@ -60,55 +60,74 @@ @if (showSmooth || smoothWeight) {
@if (!isCompare) { -
- Horizontal Axis +
+ Horizontal Axis + [hideSingleSelectionIndicator]="true" + > @for (type of xAxisTypeOption; track type.value) { - {{type.name}} + {{ type.name }} }
} -
- Smoothing -
- - - - - +
+
+ Smoothing - + @for (smoothTypeOption of smoothTypeEnum | keyvalue; track smoothTypeOption.key) { - {{smoothTypeOption.value}} + {{ smoothTypeOption.value }} }
+ @if (smoothType && smoothType !== smoothTypeEnum.any) { +
+ + {{ + smoothType === smoothTypeEnum.gaussian ? 'Kernel size:' : + smoothType === smoothTypeEnum.runningAverage ? 'Window size:' : + smoothType === smoothTypeEnum.exponential ? 'Alpha:' : '' + }} + +
+ + + {{ smoothWeight }} +
+
+ } + @if (smoothType === smoothTypeEnum.gaussian) { +
+ Sigma: +
+ + + {{ sigma }} +
+
+ }
} @@ -121,6 +140,7 @@ [class.two-in-a-row]="false" [chart]="chart" [smoothWeight]="smoothWeight" + [smoothSigma]="sigma" [smoothType]="smoothType" [hoverMode]="data.hoverMode" [hideTitle]="true" @@ -132,24 +152,25 @@ [isCompare]="isCompare" [xAxisType]="xAxisType" [yAxisType]="yAxisType" - [moveLegendToTitle]="data.moveLegendToTitle && !chart.layout.showlegend" + [moveLegendToTitle]="checkIfLegendToTitle(chart) && (!chart.layout.showlegend || (chart.data.length === 1 && !chart.data[0].showlegend))" [legendConfiguration]="this.data.legendConfiguration || {}" [graphsNumber]="9999" [exportForReport]="!!embedFunction" + [darkTheme]="data.darkTheme" (createEmbedCode)="embedFunction($event)" - > + > @if (!isFullDetailsMode && !isCompare && !disableNavigation) {
- -
- } +
}
+ } +
diff --git a/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.scss b/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.scss index bb9213c2..1b2c2a69 100644 --- a/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.scss +++ b/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.scss @@ -34,6 +34,7 @@ align-items: center; } + .load-spinner { display: inline-block; vertical-align: middle; @@ -57,38 +58,36 @@ height: 10px; margin-right: 6px; cursor: pointer; + border: 1px solid var(--color-on-surface-variant); } } .smooth-options { margin-left: 24px; + .weight{ + display: inline-flex; + width: 36px; + } &.separator { border-left: 1px solid var(--color-outline-variant); - padding-left: 24px; + padding-left: 12px; } } - .smooth-input { - width: 76px; - margin-left: 16px; - } + .smooth-selector { - margin-left: 12px; - width: 265px; + margin-right: 12px; + width: 180px; } - .smooth-type { - width: 170px; - margin-left: 6px; - } .axis-type-field { - width: 180px; + width: 142px; } .graph-container { padding-top: 16px; - @media (max-width: 1520px) { + @media (max-width: 1540px) { padding-top: 24px; } @@ -139,8 +138,10 @@ z-index: 1; top: 64px; display: flex; - align-items: center; padding: 8px 24px 8px 80px; + .mat-mdc-slider{ + min-width: 50px; + } .label-text { white-space: nowrap; @@ -149,7 +150,7 @@ .smooth-options .label-text { padding-right: 16px; } - @media (max-width: 1520px) { + @media (max-width: 1540px) { top: 64px; padding: 0 24px; } @@ -163,7 +164,7 @@ .field { align-items: center; - @media (max-width: 1520px) { + @media (max-width: 1540px) { align-items: unset; flex-direction: column; .label-text { diff --git a/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.ts b/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.ts index 38510e8a..df6c1d97 100644 --- a/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.ts +++ b/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.ts @@ -7,7 +7,7 @@ import {cloneDeep} from 'lodash-es'; import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {MatSelectChange} from '@angular/material/select'; import {debounceTime, filter, map, take} from 'rxjs/operators'; -import {convertPlots, groupIterations} from '@common/tasks/tasks.utils'; +import {checkIfLegendToTitle, convertPlots, groupIterations} from '@common/tasks/tasks.utils'; import {addMessage} from '@common/core/actions/layout.actions'; import { getGraphDisplayFullDetailsScalars, getNextPlotSample, getPlotSample, setGraphDisplayFullDetailsScalars, setGraphDisplayFullDetailsScalarsIsOpen, setViewerBeginningOfTime, setViewerEndOfTime, @@ -18,14 +18,14 @@ import { } from '@common/shared/single-graph/single-graph.reducer'; import {getSignedUrl} from '@common/core/actions/common-auth.actions'; import {selectSignedUrl} from '@common/core/reducers/common-auth-reducer'; -import {AxisType} from 'plotly.js'; +import {AxisType, Color} from 'plotly.js'; import {SmoothTypeEnum, smoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; import {ChartHoverModeEnum, SingleGraphComponent} from '@common/shared/single-graph/single-graph.component'; export interface GraphViewerData { chart: ExtFrame; id: string; - xAxisType?: any; + xAxisType?: 'iter' | 'timestamp' | 'iso_time'; yAxisType?: AxisType; smoothWeight?: number; smoothType?: SmoothTypeEnum; @@ -35,12 +35,15 @@ export interface GraphViewerData { moveLegendToTitle: boolean; embedFunction: (data: { xaxis: ScalarKeyEnum; domRect: DOMRect }) => void; legendConfiguration: Partial; + darkTheme?: boolean; + dialogTitle?: string; } @Component({ - selector: 'sm-graph-viewer', - templateUrl: './graph-viewer.component.html', - styleUrls: ['./graph-viewer.component.scss'] + selector: 'sm-graph-viewer', + templateUrl: './graph-viewer.component.html', + styleUrls: ['./graph-viewer.component.scss'], + standalone: false }) export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { @ViewChild('singleGraph') singleGraph: SingleGraphComponent; @@ -50,8 +53,8 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { private sub = new Subscription(); public minMaxIterations$: Observable<{ minIteration: number; maxIteration: number }>; public isFetchingData$: Observable; - public xAxisType$: Observable<'iter' | 'timestamp' | 'iso_time'>; - public xAxisType: 'iter' | 'timestamp' | 'iso_time'; + public xAxisType$: Observable; + public xAxisType: GraphViewerData['xAxisType']; public isCompare: boolean; public isFullDetailsMode: boolean; public iteration: number; @@ -59,7 +62,7 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { public endOfTime$: Observable; public currentPlotEvent$: Observable; private iterationChanged$ = new Subject(); - private isForward: boolean = true; + private isForward = true; private charts: ExtFrame[]; public index: number = null; public embedFunction: (data: { xaxis: ScalarKeyEnum; domRect: DOMRect }) => void; @@ -69,15 +72,21 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { public smoothType: SmoothTypeEnum; private _chart: ExtFrame; public title: string; + public checkIfLegendToTitle = checkIfLegendToTitle; + private range: { xaxis: any[]; yaxis: any[] }; @HostListener('document:keydown', ['$event']) onKeyDown(e: KeyboardEvent) { switch (e.key) { case 'ArrowRight': - this.next(); + if (!this.isFullDetailsMode && !this. isCompare && !this.disableNavigation) { + this.next(); + } break; case 'ArrowLeft': - this.previous(); + if (!this.isFullDetailsMode && !this. isCompare && !this.disableNavigation) { + this.previous(); + } break; case 'ArrowUp': this.nextIteration(); @@ -107,10 +116,11 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { public id: string; public disableNavigation: boolean; public chart$: Observable; - public plotLoaded: boolean = false; - public beginningOfTime: boolean = false; - public endOfTime: boolean = false; - smoothWeight: any = 0; + public plotLoaded = false; + public beginningOfTime = false; + public endOfTime = false; + freezeColor: Color | undefined; + smoothWeight: number | null = 0; xAxisTypeOption = [ { name: 'Iterations', @@ -164,6 +174,7 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { this.chart = data.chart; } else { this.store.dispatch(getPlotSample(reqData)); + this.range = {xaxis: data.chart.layout.xaxis.range, yaxis: data.chart.layout.yaxis.range}; } } @@ -186,7 +197,9 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { this.plotLoaded = true; const groupedPlots = groupIterations(currentPlotEvents); const {graphs, parsingError} = convertPlots({plots: groupedPlots, id: 'viewer'}); - parsingError && this.store.dispatch(addMessage('warn', `Couldn't read all plots. Please make sure all plots are properly formatted (NaN & Inf aren't supported).`, [], true)); + if (parsingError){ + this.store.dispatch(addMessage('warn', `Couldn't read all plots. Please make sure all plots are properly formatted (NaN & Inf aren't supported).`, [], true)); + } Object.values(graphs).forEach((graphss: ExtFrame[]) => { graphss.forEach((graph: ExtFrame) => { graph.data?.forEach((d, i) => d.visible = this.data.chart.data[i]?.visible); @@ -222,6 +235,17 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { this.chart = null; this.cdr.detectChanges(); this.chart = this.charts[this.index]; + if (this.range) { + this.chart = { + ...this.chart, + layout: { + ...this.chart.layout, + xaxis: {...this.chart.layout.xaxis, range: this.range.xaxis}, + yaxis: {...this.chart.layout.yaxis, range: this.range.yaxis}, + } + }; + this.range = null; + } this.iteration = currentPlotEvents[0].iter; })); this.sub.add(this.beginningOfTime$.subscribe(beg => { @@ -243,7 +267,7 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { this.plotLoaded = true; setTimeout(() => { this.singleGraph.redrawPlot(); - this.cdr.detectChanges(); + this.cdr.markForCheck(); }, 50); } this.height = this.modalContainer.nativeElement.clientHeight - 80; @@ -255,7 +279,7 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { this.singleGraph.shouldRefresh = true; } this.chart = cloneDeep(chart); - this.cdr.detectChanges(); + this.cdr.markForCheck(); })); this.sub.add(this.iterationChanged$ .pipe(debounceTime(100)) @@ -316,7 +340,7 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { this.smoothWeight = 1; } } - this.cdr.detectChanges(); + this.cdr.markForCheck(); }); } @@ -328,6 +352,7 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { } ////////////////////// PLOTS ///////////////////////////////////// + sigma =2; changeIteration(value: number) { this.iteration = value; @@ -389,7 +414,7 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { } selectSmoothType($event: MatSelectChange) { - this.smoothWeight = [smoothTypeEnum.exponential, smoothTypeEnum.any].includes($event.value) ? 0 : 10; + this.smoothWeight = [smoothTypeEnum.exponential, smoothTypeEnum.any].includes($event.value) ? 0 : $event.value=== smoothTypeEnum.gaussian? 7: $event.value=== smoothTypeEnum.runningAverage? 5: 10; this.smoothType = $event.value; } @@ -412,4 +437,14 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { } } } + + setFreezeColor() { + this.freezeColor = this.singleGraph.chart?.data[1]?.line?.color ?? this.singleGraph.chart?.data[0]?.line?.color ?? this.freezeColor; + } + + shouldShowDot() { + return this.singleGraph && this.chart && checkIfLegendToTitle(this.chart) && + (!Array.isArray(this.singleGraph.chart?.data[0]?.line?.color) && !Array.isArray(this.singleGraph.chart?.data[0]?.marker?.color)) + && (!this.chart.layout.showlegend || (this.chart.data.length === 1 && !this.chart.data[0].showlegend)) + } } diff --git a/src/app/webapp-common/shared/single-graph/plotly-graph-base.ts b/src/app/webapp-common/shared/single-graph/plotly-graph-base.ts index d7f80cee..56bf481a 100644 --- a/src/app/webapp-common/shared/single-graph/plotly-graph-base.ts +++ b/src/app/webapp-common/shared/single-graph/plotly-graph-base.ts @@ -9,7 +9,7 @@ import {explicitEffect} from 'ngxtension/explicit-effect'; export const Colors = { dark: { font: '#e3e2e6', - lines: '#424955', + lines: '#282c33', tick: '#9ea1a8', legend: '#bfc7d5', icon: '#a1c9ff', @@ -17,7 +17,7 @@ export const Colors = { }, light: { font: '#1a1c1e', - lines: '#d6dae9', + lines: '#dee1ed', tick: '#666', legend: '#666', icon: '#0060a8', @@ -44,6 +44,7 @@ export interface ExtFrame extends Omit { tags?: string[]; plot_str?: string; colorKey?: string; + id?: string; } export interface ExtLegend extends plotly.Legend { @@ -68,11 +69,15 @@ export interface ExtData extends plotly.PlotData { originalMetric?: string; fakePlot?: boolean; seriesName?: string; + originalColor?: string; + fullName?: string; + x_axis_label?: string; } @Component({ - selector: 'sm-base-plotly-graph', - template: '' + selector: 'sm-base-plotly-graph', + template: '', + standalone: false }) export abstract class PlotlyGraphBaseComponent implements OnDestroy { @@ -85,18 +90,20 @@ export abstract class PlotlyGraphBaseComponent implements OnDestroy { public isSmooth = false; public shouldRefresh = false; protected drawGraph$ = new Subject<{ forceRedraw?: boolean; forceSkipReact?: boolean; noTimer?: boolean }>(); + public alreadyDrawn = false; darkTheme = input(null); @Input() isCompare = false; theme = this.store.selectSignal(selectThemeMode); - protected isDarkTheme = computed(() => this.darkTheme() !== null ? this.darkTheme() : this.theme() === 'dark'); + protected isDarkTheme = computed(() => this.darkTheme() ?? this.theme() === 'dark'); protected themeColors = computed(() => this.isDarkTheme() ? Colors.dark : Colors.light); koko = explicitEffect( [this.isDarkTheme], () => { this.shouldRefresh = true; + this.alreadyDrawn = false; this.drawGraph$.next({noTimer: true}) }); @@ -104,8 +111,9 @@ export abstract class PlotlyGraphBaseComponent implements OnDestroy { if (Array.isArray(trace.line?.color) || Array.isArray(trace.marker?.color)) { return; } - const colorString = new TinyColor({r: newColor[0], g: newColor[1], b: newColor[2]}) - .lighten((this.isSmooth && !trace.isSmoothed) ? 40 : 0).toRgbString(); + const colorString = this.isDarkTheme() ? + new TinyColor({r: newColor[0], g: newColor[1], b: newColor[2]}).darken((this.isSmooth && !trace.isSmoothed) ? 40 : 0).toRgbString(): + new TinyColor({r: newColor[0], g: newColor[1], b: newColor[2]}).lighten((this.isSmooth && !trace.isSmoothed) ? 40 : 0).toRgbString(); if (trace.marker) { trace.marker.color = colorString; if (trace.marker.line) { diff --git a/src/app/webapp-common/shared/single-graph/single-graph.component.html b/src/app/webapp-common/shared/single-graph/single-graph.component.html index 1972d77d..4c5bd272 100644 --- a/src/app/webapp-common/shared/single-graph/single-graph.component.html +++ b/src/app/webapp-common/shared/single-graph/single-graph.component.html @@ -8,7 +8,7 @@ (scroll)="repositionModeBar($event.target)" >
- @if (moveLegendToTitle && chart && title) { + @if (moveLegendToTitle && chart && (title || chart.layout.name)) { } -
{{title}}
+
+ {{moveLegendToTitle ? title || chart?.data?.[0]?.name || '' : title}} +
@if (title) { } diff --git a/src/app/webapp-common/shared/single-graph/single-graph.component.scss b/src/app/webapp-common/shared/single-graph/single-graph.component.scss index aef14e73..2a8a68b4 100644 --- a/src/app/webapp-common/shared/single-graph/single-graph.component.scss +++ b/src/app/webapp-common/shared/single-graph/single-graph.component.scss @@ -27,6 +27,7 @@ flex: 0 0 10px; margin-right: 6px; cursor: pointer; + pointer-events: all; } sm-tag-list { @@ -57,22 +58,32 @@ sm-tag-list { top: 0; } -::ng-deep .legendlines path, ::ng-deep .legendpoints path { - cursor: url(../../assets/icons/pallete-cursor.svg) 6 0, pointer; +::ng-deep g.layers { + .legendlines path, + .legendpoints path { + cursor: url(../../assets/icons/pallete-cursor.svg) 6 0, pointer; + } + + .legendlines path { + stroke-width: 12px !important; + transform: scale(0.7) translate(16px, 2px); + } + + .legendpoints path { + d: path('M8,8H-8V-8H8Z') !important; + transform: scale(.7) translate(28px, 2px); + } + + .legendpoints path:not(.scatterpts) { + d: path('M8,8H-8V-8H8Z') !important; + } + + .legendpoints path.scatterpts { + // chrome only + d: path('M5.5,0A5.5,5.5 0 1,1 0,-5.5A5.5,5.5 0 0,1 5.5,0Z') !important; + } } -::ng-deep .legendpoints path:not(.scatterpts) { - d: path('M8,8H-8V-8H8Z') !important; -} - -::ng-deep .legendlines path { - stroke-width: 12px !important; -} - -::ng-deep .legendpoints path.scatterpts { - // chrome only - d: path('M5.5,0A5.5,5.5 0 1,1 0,-5.5A5.5,5.5 0 0,1 5.5,0Z') !important; -} .move-title { ::ng-deep .infolayer > .g-gtitle > .gtitle { @@ -82,6 +93,7 @@ sm-tag-list { ::ng-deep .modebar-container { top: 24px; + svg.icon { height: 1em; width: 1em; @@ -89,7 +101,7 @@ sm-tag-list { } } - // moving legend next to title without text +// moving legend next to title without text ::ng-deep .legend.hide-text { .legendtext, .legendtoggle { @@ -192,6 +204,7 @@ sm-tag-list { svg a { fill: var(--color-secondary); + &:hover { fill: var(--color-primary); text-decoration: underline; @@ -208,6 +221,7 @@ sm-tag-list { .hoverlayer .spikeline:nth-child(even) { stroke: var(--color-on-primary-container); } + .hoverlayer .spikeline:nth-child(odd) { stroke: transparent !important; } @@ -218,8 +232,14 @@ sm-tag-list { fill: var(--color-surface-container-lowest) !important; } - .hoverlayer .hovertext .name { - fill: var(--color-on-surface) !important; + .hovertext { + rect { + fill: var(--color-surface-bright) !important; + } + + .name { + fill: var(--color-on-surface) !important; + } } } diff --git a/src/app/webapp-common/shared/single-graph/single-graph.component.ts b/src/app/webapp-common/shared/single-graph/single-graph.component.ts index 6b9c0248..880f60d9 100644 --- a/src/app/webapp-common/shared/single-graph/single-graph.component.ts +++ b/src/app/webapp-common/shared/single-graph/single-graph.component.ts @@ -13,7 +13,7 @@ import { import {MatDialog} from '@angular/material/dialog'; import {PALLET} from '@common/constants'; import {ColorHashService} from '@common/shared/services/color-hash/color-hash.service'; -import {SmoothTypeEnum, getSmoothedLine} from '@common/shared/single-graph/single-graph.utils'; +import {SmoothTypeEnum, getSmoothedLine, interpolateY, smoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; import {chooseTimeUnit} from '@common/shared/utils/choose-time-unit'; import {download} from '@common/shared/utils/download'; import {TinyColor} from '@ctrl/tinycolor'; @@ -42,14 +42,13 @@ const RATIO_OFFSET_FIX = 37; export type ChartHoverModeEnum = 'x' | 'y' | 'closest' | false | 'x unified' | 'y unified'; @Component({ - selector: 'sm-single-graph', - templateUrl: './single-graph.component.html', - styleUrls: ['./single-graph.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-single-graph', + templateUrl: './single-graph.component.html', + styleUrls: ['./single-graph.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class SingleGraphComponent extends PlotlyGraphBaseComponent { - public alreadyDrawn = false; - public loading: boolean; public type: (plotly.PlotData['type'] | 'table')[]; public ratio: number; @@ -61,6 +60,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { private modeBar: HTMLElement; private ratioEnable: boolean; private smooth$ = new Subject(); + private sigma$ = new Subject(); private _height: number; private _hoverMode: ChartHoverModeEnum; public singleColorKey: string; @@ -73,6 +73,8 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { @Input() legendConfiguration: Partial = {}; @Input() yAxisType: plotly.AxisType = 'linear'; private previousHoverMode: 'x' | 'y' | 'closest' | false | 'x unified' | 'y unified'; + private plotlyElement: plotly.PlotlyHTMLElement; + private _smoothSigma: number; @Input() set height(height: number) { @@ -149,12 +151,24 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { this.isSmooth = this.smoothWeight > 0; if (this.alreadyDrawn) { this.smooth$.next(null); + this.sigma$.next(null); } } get smoothType() { return this._smoothType; } + @Input() set smoothSigma(ratio: number) { + this._smoothSigma = ratio; + this.isSmooth = ratio > 0; + if (this.alreadyDrawn) { + this.sigma$.next(ratio); + } + } + + get smoothSigma() { + return this._smoothSigma; + } @Input() set smoothWeight(ratio: number) { this._smoothWeight = ratio; @@ -172,6 +186,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { @Input() hideDownloadButtons = false; @Input() noMargins = false; @Input() graphTitle: string; + @Input() disableNavigation: boolean; @Output() hoverModeChanged = new EventEmitter(); @Output() createEmbedCode = new EventEmitter<{ xaxis: ScalarKeyEnum; domRect: DOMRect }>(); @Output() maximizeClicked = new EventEmitter(); @@ -201,6 +216,16 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { }) ); + this.sub.add(this.sigma$ + .pipe( + debounceTime(50), + filter(() => !!this.chart)) + .subscribe(() => { + this.rebootGraph(this.originalChart); + this.drawGraph$.next({forceRedraw: true, forceSkipReact: false}); + }) + ); + this.sub.add(this.drawGraph$ .pipe( debounce(({forceRedraw, forceSkipReact, noTimer}) => noTimer ? of({forceRedraw, forceSkipReact}) : timer(100)), @@ -242,7 +267,8 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { this.previousOffsetWidth = this.plotlyContainer.nativeElement.offsetWidth; if (!skipReact) { - this.zone.runOutsideAngular(() => (Plotly.react as typeof plotly.react)(root, data, layout, config).then(() => { + this.zone.runOutsideAngular(() => (Plotly.react as typeof plotly.react)(root, data, layout, config).then(res => { + this.plotlyElement = res; this.loading = false; this.changeDetector.detectChanges(); })); @@ -304,31 +330,37 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { color: this.themeColors().tick, gridcolor: this.themeColors().lines, zerolinecolor: this.themeColors().lines, + linecolor: this.themeColors().lines, tickfont: { color: this.themeColors().tick }, - ...(graph.layout.xaxis?.title && {title: { + ...(graph.layout.xaxis?.title && { + title: { - text: (graph.layout.xaxis.title as any)?.text ?? graph.layout.xaxis.title, + text: (graph.layout.xaxis.title as plotly.DataTitle)?.text ?? graph.layout.xaxis.title, font: { color: this.themeColors().font } - }}), + } + }), ...graph.layout.xaxis }, yaxis: { color: this.themeColors().tick, gridcolor: this.themeColors().lines, zerolinecolor: this.themeColors().lines, + linecolor: this.themeColors().lines, tickfont: { color: this.themeColors().tick }, - ...(graph.layout.yaxis?.title && {title: { - text: (graph.layout.yaxis.title as any)?.text ?? graph.layout.yaxis.title, + ...(graph.layout.yaxis?.title && { + title: { + text: (graph.layout.yaxis.title as plotly.DataTitle)?.text ?? graph.layout.yaxis.title, font: { color: this.themeColors().font } - }}), + } + }), ...graph.layout.yaxis }, uirevision: 'static', // Saves the UI state between redraws https://plot.ly/javascript/uirevision/ @@ -358,7 +390,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } : { l: 70, r: 50, - t: 80, + t: this.hideTitle ? 60 : 80, b: 90, pad: 0, autoexpand: true @@ -430,15 +462,18 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { color: this.themeColors().tick, gridcolor: this.themeColors().lines, zerolinecolor: this.themeColors().lines, + linecolor: this.themeColors().lines, tickfont: { color: this.themeColors().tick }, - ...(graph.layout.xaxis?.title && {title: { - text: (graph.layout.xaxis.title as any)?.text ?? graph.layout.xaxis.title, + ...(graph.layout.xaxis?.title && { + title: { + text: (graph.layout.xaxis.title as plotly.DataTitle)?.text ?? graph.layout.xaxis.title as string, font: { - color: '#c1cdf3' + color: this.themeColors().font } - }}), + } + }) }, yaxis: { ...graph.layout.yaxis, @@ -454,22 +489,42 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { color: this.themeColors().tick, gridcolor: this.themeColors().lines, zerolinecolor: this.themeColors().lines, + linecolor: this.themeColors().lines, tickfont: { color: this.themeColors().tick }, - ...(graph.layout.yaxis?.title && {title: { - text: (graph.layout.yaxis.title as any)?.text ?? graph.layout.yaxis.title, + ...(graph.layout.yaxis?.title && { + title: { + text: (graph.layout.yaxis.title as plotly.DataTitle)?.text ?? graph.layout.yaxis.title as string, font: { - color: '#c1cdf3' + color: this.themeColors().font } - }}), + } + }) } }; - if (['multiScalar', 'scalar'].includes(graph.layout.type) || graph.type === 'scatter') { + if (['multiScalar', 'scalar'].includes(graph.layout.type) || ['scatter', 'scatter3d', 'surface'].includes(graph.data[0]?.type)) { if (this.type.includes('scatter') || this.type.includes('scatter3d')) { layout = {hovermode: this.hoverMode, ...layout, ...scatterLayoutConfig} as Partial; } + if (['scatter3d', 'surface'].includes(graph.data[0].type)) { + layout.scene = { + ...graph.layout.scene, + xaxis: { + gridcolor: this.themeColors().tick, + backgroundcolor: this.themeColors().lines + }, + yaxis: { + gridcolor: this.themeColors().tick, + backgroundcolor: this.themeColors().lines + }, + zaxis: { + gridcolor: this.themeColors().tick, + backgroundcolor: this.themeColors().lines + } + }; + } } if (this.type.includes('bar')) { layout = {...layout, ...barLayoutConfig} as Partial; @@ -687,8 +742,9 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { const timeUnit = chooseTimeUnit(graph.data) as { time: number; str: string }; for (let i = 0; i < graph.data.length; i++) { + // In bug cases where the variant is empty causing name to be empty string if (graph.data[i].name === '') { - graph.data[i].name = '[no name]'; + graph.data[i].name = this.addIterationString((graph.layout.title as string || graph.metric)?.trim(), graph.iter); } if (!graph.data[i].name) { graph.data[i].name = this.getTitle(graph); @@ -701,8 +757,8 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { const task = graph.data[i].task ?? graph.task; const colorKey = this.generateColorKey(graph.data[i].name.trim(), task, graph.data[i].colorKey); if (!this.alreadyDrawn) { - (graph.data[i] as any).originalColor = originalColor; - (graph.data[i] as any).fullName = colorKey.replace(`.${task?.substring(0, 6)}-`, '-') ?? graph.data[i].name; + graph.data[i].originalColor = originalColor; + graph.data[i].fullName = colorKey.replace(`.${task?.substring(0, 6)}-`, '-') ?? graph.data[i].name; if (this.xAxisType === ScalarKeyEnum.Timestamp) { const zeroTime = graph.data[i].x[0] as number; @@ -715,7 +771,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { if (graph.data[i].type === 'bar' && !graph.data[i].marker) { graph.data[i].marker = {} as Partial; } - this.singleColorKey = colorKey; + this.singleColorKey = colorKey.replace(/ \(Smoothed\)\?$/, '?'); graph.data[i].name = (this.scaleFactor() === 100 || this.isSmooth) ? graph.data[i].name : `${graph.data[i].name.trim()} `; } @@ -769,6 +825,9 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } private resmoothDataset(data: ExtData, color, hidden: boolean) { + if (this.smoothType=== smoothTypeEnum.gaussian && data.y.length> 5 ){ + interpolateY(data.y) + } return { ...data, line: {width: 1, ...data.line, color: `rgb(${color[0]},${color[1]},${color[2]})`}, @@ -778,7 +837,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { isSmoothed: true, ...(hidden && {visible: 'legendonly'}), hoverinfo: 'all', - y: getSmoothedLine(data.y, this.smoothWeight, this.smoothType) + y: getSmoothedLine(data.y, this.smoothWeight, this.smoothType, this.smoothSigma), } as ExtData; } @@ -827,7 +886,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { .raise() .on('click', (event, data) => { const colorKey = data[0].trace._input.colorKey; - const name = data[0].trace._input.name.replace(/ \(Smoothed\)$/, ''); + const name = data[0].trace._input.name.trim().replace(/ \(Smoothed\)$/, ''); const task = data[0].trace._input.task; const originalColor = data[0].trace._input.originalColor; const colorKey2 = this.generateColorKey(name, task, colorKey); @@ -845,7 +904,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { select(this.plotlyContainer.nativeElement) .selectAll('.traces .legendtoggle') .append('title') - .text((data, i) => (this.chart.data[i] as any).fullName ?? data[0].trace.name); + .text((data, i) => this.chart.data[i]?.fullName ?? data[0].trace.name); }; @@ -970,7 +1029,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { private getAxisText(timeUnit: { time: number; str: string }) { switch (this.xAxisType) { case ScalarKeyEnum.Iter: - return 'Iterations'; + return this.areAllSameXaxis() ? this.chart.data[0].x_axis_label ?? 'Iterations' : 'Iterations'; case ScalarKeyEnum.IsoTime: return 'Wall Time'; case ScalarKeyEnum.Timestamp: @@ -980,6 +1039,10 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } } + private areAllSameXaxis() { + return new Set(this.chart.data.map(g => g.x_axis_label)).size === 1; + } + private getHideButtonTitle() { return this.chartElm.layout?.showlegend ? 'Show legend' : 'Hide legend'; } @@ -1006,7 +1069,10 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { layout: { ...this.originalChart.layout, showlegend: this.moveLegendToTitle || this.chartElm.layout.showlegend, - images: this.chart.layout?.images + images: this.chart.layout?.images, + margin: {...this.chart.layout.margin, t: 80}, + xaxis: {...this.originalChart.layout.xaxis, range: this.plotlyElement.layout.xaxis.range}, + yaxis: {...this.originalChart.layout.yaxis, range: this.plotlyElement.layout.yaxis.range} } }), id: this.identifier, @@ -1015,12 +1081,14 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { smoothWeight: this.smoothWeight, smoothType: this.smoothType, hoverMode: this.hoverMode, - hideNavigation: this.darkTheme(), + hideNavigation: this.disableNavigation, isCompare: this.isCompare, moveLegendToTitle: this.moveLegendToTitle, - legendConfiguration: this.legendConfiguration + legendConfiguration: this.legendConfiguration, + darkTheme: this.darkTheme(), + dialogTitle: this.graphTitle }, - panelClass: ['image-viewer-dialog','full-screen'], + panelClass: ['image-viewer-dialog', 'full-screen'], maxWidth: this.maximizeClicked.observed ? '100%' : 'auto' }).beforeClosed().subscribe(() => this.maximizeClicked.emit()); }); diff --git a/src/app/webapp-common/shared/single-graph/single-graph.effects.ts b/src/app/webapp-common/shared/single-graph/single-graph.effects.ts index 3974e2fa..2a244e84 100644 --- a/src/app/webapp-common/shared/single-graph/single-graph.effects.ts +++ b/src/app/webapp-common/shared/single-graph/single-graph.effects.ts @@ -14,6 +14,7 @@ import {selectFullScreenChart, selectFullScreenChartIsOpen, selectFullScreenChar import {ApiEventsService} from '~/business-logic/api-services/events.service'; import {PlotSampleResponse} from '~/business-logic/model/events/plotSampleResponse'; import {selectRouterConfig} from '@common/core/reducers/router-reducer'; +import {concatLatestFrom} from '@ngrx/operators'; @@ -55,14 +56,17 @@ export class SingleGraphEffects { getNextPlotsForIter$ = createEffect(() => this.actions$.pipe( ofType(getNextPlotSample), - withLatestFrom(this.store.select(selectPlotViewerScrollId)), - switchMap(([action, scrollId]) => + concatLatestFrom(()=> [this.store.select(selectPlotViewerScrollId), + this.store.select(selectRouterConfig).pipe(map(config => !!config?.includes('models'))) + ]), + switchMap(([action, scrollId, model]) => this.eventsApi.eventsNextPlotSample({ /* eslint-disable @typescript-eslint/naming-convention */ task: action.task, scroll_id: scrollId, navigate_earlier: action.navigateEarlier, - ...(action.iteration && {next_iteration: true}) + ...(action.iteration && {next_iteration: true}), + ...(model && {model_events: true}) /* eslint-enable @typescript-eslint/naming-convention */ }) .pipe( diff --git a/src/app/webapp-common/shared/single-graph/single-graph.utils.ts b/src/app/webapp-common/shared/single-graph/single-graph.utils.ts index 3edd3c8c..1d00f119 100644 --- a/src/app/webapp-common/shared/single-graph/single-graph.utils.ts +++ b/src/app/webapp-common/shared/single-graph/single-graph.utils.ts @@ -1,8 +1,47 @@ -import smoothing from 'taira'; +import {interpolateBasis} from 'd3-interpolate'; + +export const generate1DKernel = (sigma: number, kernelSize: number): number[] => { + // Ensure kernel size is odd + if (kernelSize % 2 === 0) { + throw new Error('Kernel size must be an odd number'); + } + + const kernel: number[] = []; + const center = Math.floor(kernelSize / 2); + let sum = 0; + + // Calculate Gaussian kernel weights + for (let x = 0; x < kernelSize; x++) { + const distance = x - center; + const weight = Math.exp(-(distance * distance) / (2 * sigma * sigma)); + kernel.push(weight); + sum += weight; + } + // Normalize the kernel + return kernel.map(value => value / sum); +} +export const smooth1D = (data: number[], sigma: number, kernelSize: number): number[] => { + const kernel = generate1DKernel(sigma, kernelSize); + const smoothed: number[] = new Array(data.length).fill(0); + const halfKernel = Math.floor(kernelSize / 2); + + for (let i = 0; i < data.length; i++) { + let smoothedValue = 0; + for (let j = 0; j < kernelSize; j++) { + const index = i + j - halfKernel; + // Handle edge cases with boundary reflection + const safeIndex = Math.max(0, Math.min(data.length - 1, index)); + smoothedValue += data[safeIndex] * kernel[j]; + } + smoothed[i] = smoothedValue; + } + return smoothed; +} + export type SmoothTypeEnum = 'runningAverage' | 'exponential' | 'gaussian' | 'any'; export const smoothTypeEnum = { - exponential: 'Exponential Moving Average' as SmoothTypeEnum, + exponential: 'Exp. Moving Average' as SmoothTypeEnum, runningAverage: 'Running Average' as SmoothTypeEnum, gaussian: 'Gaussian' as SmoothTypeEnum, any: 'No Smoothing' as SmoothTypeEnum @@ -19,20 +58,55 @@ export const averageDebiased = (arr, weight) => { // components of the time-series, with bias fix toward initial value. last = last * weight + (1 - weight) * d; validPoints++; + if (i === 0) { + return d; + } const debiasWeight = (i > 0 && weight < 1) ? 1 - Math.pow(weight, validPoints) : 1; return last / debiasWeight; } }); }; -export const getSmoothedLine = (arr, weight, smoothType): number[] => { + +function movingAverageSmooth(data: number[], windowSize: number): number[] { + if (!data || data.length === 0) { + return []; + } + + const smoothedData: number[] = []; + for (let i = 0; i < data.length; i++) { + let currentWindow: number[]; + if (i < windowSize - 1) { + currentWindow = data.slice(0, i + 1); + } else { + currentWindow = data.slice(i - windowSize + 1, i + 1); + } + + const smoothedValue = currentWindow.reduce((sum, value) => sum + value, 0) / currentWindow.length; + smoothedData.push(smoothedValue); + } + + return smoothedData; +} + + + +export const getSmoothedLine = (arr, weight=1, smoothType, sigma =2): number[] => { switch (smoothType) { case smoothTypeEnum.runningAverage: - return arr.length > 5 ? smoothing.smoothen(arr, smoothing.ALGORITHMS.AVERAGE, 2, weight, false) : arr; + return arr.length > 5 ? movingAverageSmooth(arr, weight) : arr; case smoothTypeEnum.gaussian: - return arr.length > 5 ? smoothing.smoothen(arr, smoothing.ALGORITHMS.GAUSSIAN, 2, Math.round(weight / 100 * 5), false) : arr; + return arr.length > 5 ? smooth1D(arr, sigma, weight): arr; case smoothTypeEnum.exponential: return averageDebiased(arr, weight); } return arr; }; + +export const interpolateY = (y): { x: number[], y: number[] } => { + const interpolator = interpolateBasis(y); + const newX = Array.from({length: 20}, (_, i) => (i / 2)); // 0 to 10, step 0.5 + const interpolatedY = newX.map((_, i, arr) => interpolator(i / arr.length)); + return {x: newX, y: interpolatedY}; +}; + diff --git a/src/app/webapp-common/shared/single-value-summary-table/single-value-summary-table.component.html b/src/app/webapp-common/shared/single-value-summary-table/single-value-summary-table.component.html index 4c24b6aa..7565fdea 100644 --- a/src/app/webapp-common/shared/single-value-summary-table/single-value-summary-table.component.html +++ b/src/app/webapp-common/shared/single-value-summary-table/single-value-summary-table.component.html @@ -2,23 +2,21 @@
Summary
- @for (item of data | sort:'variant'; track item.variant) { + @for (item of data() | sort:'variant'; track item.variant) {
-
{{ item.variant }}
-
{{ item.value }}
+
{{ item.variant }}
+
{{ item.value }}
}
- @if (!csvButtonTemplate) { - } @else { -
- -
- } @if (createEmbedCode.observed) { diff --git a/src/app/webapp-common/shared/ui-components/buttons/loading-button/loading-button.component.scss b/src/app/webapp-common/shared/ui-components/buttons/loading-button/loading-button.component.scss deleted file mode 100644 index 353dd481..00000000 --- a/src/app/webapp-common/shared/ui-components/buttons/loading-button/loading-button.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -:host { - .mat-mdc-progress-spinner { - --mdc-circular-progress-active-indicator-color: var(--color-on-primary); - } -} diff --git a/src/app/webapp-common/shared/ui-components/buttons/loading-button/loading-button.component.ts b/src/app/webapp-common/shared/ui-components/buttons/loading-button/loading-button.component.ts deleted file mode 100644 index 8fafc9be..00000000 --- a/src/app/webapp-common/shared/ui-components/buttons/loading-button/loading-button.component.ts +++ /dev/null @@ -1,22 +0,0 @@ -import {ChangeDetectionStrategy, Component, input} from '@angular/core'; -import {MatButton} from '@angular/material/button'; -import {MatIcon} from '@angular/material/icon'; -import {MatProgressSpinner} from '@angular/material/progress-spinner'; - -@Component({ - selector: 'sm-loading-button', - templateUrl: './loading-button.component.html', - styleUrls: ['./loading-button.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - MatButton, - MatIcon, - MatProgressSpinner - ] -}) -export class LoadingButtonComponent { - label = input('CREATE NEW'); - disabled = input(false); - loading = input(); -} diff --git a/src/app/webapp-common/shared/ui-components/buttons/toggle-archive/toggle-archive.component.scss b/src/app/webapp-common/shared/ui-components/buttons/toggle-archive/toggle-archive.component.scss index 50a98933..d0938b28 100644 --- a/src/app/webapp-common/shared/ui-components/buttons/toggle-archive/toggle-archive.component.scss +++ b/src/app/webapp-common/shared/ui-components/buttons/toggle-archive/toggle-archive.component.scss @@ -1,5 +1,3 @@ -@import 'variables'; - .btn { display: flex; align-items: center; diff --git a/src/app/webapp-common/shared/ui-components/buttons/toggle-archive/toggle-archive.component.ts b/src/app/webapp-common/shared/ui-components/buttons/toggle-archive/toggle-archive.component.ts index 543fc41a..0816435d 100644 --- a/src/app/webapp-common/shared/ui-components/buttons/toggle-archive/toggle-archive.component.ts +++ b/src/app/webapp-common/shared/ui-components/buttons/toggle-archive/toggle-archive.component.ts @@ -5,15 +5,14 @@ import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-toggle-archive', - templateUrl: './toggle-archive.component.html', - styleUrls: ['./toggle-archive.component.scss'], - standalone: true, - imports: [ - TooltipDirective, - MatButton, - MatIcon - ] + selector: 'sm-toggle-archive', + templateUrl: './toggle-archive.component.html', + styleUrls: ['./toggle-archive.component.scss'], + imports: [ + TooltipDirective, + MatButton, + MatIcon + ] }) export class ToggleArchiveComponent { showArchived = input(); diff --git a/src/app/webapp-common/shared/ui-components/data/code-editor/code-editor.component.html b/src/app/webapp-common/shared/ui-components/data/code-editor/code-editor.component.html index 31cad632..66ac6a5d 100644 --- a/src/app/webapp-common/shared/ui-components/data/code-editor/code-editor.component.html +++ b/src/app/webapp-common/shared/ui-components/data/code-editor/code-editor.component.html @@ -5,4 +5,4 @@ } -
+
diff --git a/src/app/webapp-common/shared/ui-components/data/code-editor/code-editor.component.scss b/src/app/webapp-common/shared/ui-components/data/code-editor/code-editor.component.scss index b0378be4..e1622c64 100644 --- a/src/app/webapp-common/shared/ui-components/data/code-editor/code-editor.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/code-editor/code-editor.component.scss @@ -1,12 +1,20 @@ -@import "variables"; - :host { position: relative; .ace { height: 100%; width: 100%; line-height: 1.6; - background-color: var(--color-surface-container); + background-color: var(--color-surface-container-low); + border-radius: 4px; + border: 1px solid var(--color-outline-variant); + &.readonly { + ::ng-deep .ace_cursor-layer { + opacity: 0; + } + } + ::ng-deep .ace_scrollbar.ace_scrollbar-h{ + background-color: var(--color-surface-container-low); + } } .copy-button { diff --git a/src/app/webapp-common/shared/ui-components/data/code-editor/code-editor.component.ts b/src/app/webapp-common/shared/ui-components/data/code-editor/code-editor.component.ts index e5e01812..cf9be792 100644 --- a/src/app/webapp-common/shared/ui-components/data/code-editor/code-editor.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/code-editor/code-editor.component.ts @@ -16,16 +16,15 @@ import {MatIcon} from '@angular/material/icon'; declare const ace; @Component({ - selector: 'sm-code-editor', - templateUrl: './code-editor.component.html', - styleUrls: ['./code-editor.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - ClipboardModule, - MatButton, - MatIcon - ] + selector: 'sm-code-editor', + templateUrl: './code-editor.component.html', + styleUrls: ['./code-editor.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + ClipboardModule, + MatButton, + MatIcon + ] }) export class CodeEditorComponent { private zone = inject(NgZone); @@ -67,6 +66,10 @@ export class CodeEditorComponent { return this.aceEditor.getSession().getValue(); } + get position () { + return this.aceEditor.selection.getCursor() + } + getEditor() { return this.aceEditor; } @@ -80,10 +83,10 @@ export class CodeEditorComponent { } this.zone.runOutsideAngular(() => { const aceEditor = ace.edit(this.aceEditorElement().nativeElement) as Ace.Editor; - ace.config.set('basePath', '/node_modules/ace-builds/src-min-noconflict'); this.aceEditor = aceEditor; aceEditor.setOptions({ readOnly: this.readonly(), + highlightGutterLine: !this.readonly(), placeholder: this.placeholder(), showLineNumbers: false, showGutter: false, @@ -109,10 +112,13 @@ export class CodeEditorComponent { aceEditor.getSession().setValue(this.code()); if (this.startPosition()) { - this.aceEditor.moveCursorTo(this.startPosition()?.row || 0, this.startPosition()?.column || 0); - this.aceEditor.scrollToLine(this.startPosition()?.row || 0, true, false, () => {}); + setTimeout(() => { + this.aceEditor.moveCursorTo(this.startPosition()?.row || 0, this.startPosition()?.column || 0); + this.aceEditor.scrollToLine(this.startPosition()?.row || 0, true, false, () => {}); + }); } + aceEditor.focus(); this.aceEditor = aceEditor; }); } diff --git a/src/app/webapp-common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component.scss b/src/app/webapp-common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component.scss index 89551019..77840a22 100644 --- a/src/app/webapp-common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component.scss @@ -1,8 +1,8 @@ -@import 'variables'; -@import "mixins/link"; +@use 'variables'; +@use "mixins/link"; :host { - @include link(); + @include link.link(); display: flex; flex-direction: column; @@ -107,10 +107,6 @@ background-color: var(--color-surface-container-highest); } } - - &.mat-expanded { - margin-bottom: 24px; - } } ::ng-deep .mat-expansion-panel-body { @@ -139,7 +135,7 @@ align-items: center; height: 32px; border-radius: 4px; - font-family: $font-family-base, sans-serif; + font-family: variables.$font-family-base, sans-serif; font-size: 12px; color: var(--color-on-surface-variant); cursor: pointer; diff --git a/src/app/webapp-common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component.ts b/src/app/webapp-common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component.ts index 44776716..dba74e30 100644 --- a/src/app/webapp-common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component.ts @@ -3,9 +3,7 @@ import {compareByFieldFunc} from '@common/tasks/tasks.utils'; import {SearchComponent} from '@common/shared/ui-components/inputs/search/search.component'; import {MatExpansionModule} from '@angular/material/expansion'; import {KeyValuePipe} from '@angular/common'; -import {AdvancedFilterPipe} from '@common/shared/pipes/advanced-filter.pipe'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; -import {FilterPipe} from '@common/shared/pipes/filter.pipe'; import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatRadioModule} from '@angular/material/radio'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; @@ -18,24 +16,21 @@ import {decodeURIComponentSafe} from '@common/shared/utils/tableParamEncode'; export type HyperParams = ReadonlyMap; @Component({ - selector: 'sm-grouped-checked-filter-list', - templateUrl: './grouped-checked-filter-list.component.html', - styleUrls: ['./grouped-checked-filter-list.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - SearchComponent, - MatExpansionModule, - KeyValuePipe, - AdvancedFilterPipe, - TooltipDirective, - FilterPipe, - MatCheckboxModule, - MatRadioModule, - ClickStopPropagationDirective, - ShowTooltipIfEllipsisDirective, - FilterOutPipe - ] + selector: 'sm-grouped-checked-filter-list', + templateUrl: './grouped-checked-filter-list.component.html', + styleUrls: ['./grouped-checked-filter-list.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + SearchComponent, + MatExpansionModule, + KeyValuePipe, + TooltipDirective, + MatCheckboxModule, + MatRadioModule, + ClickStopPropagationDirective, + ShowTooltipIfEllipsisDirective, + FilterOutPipe + ] }) export class GroupedCheckedFilterListComponent { diff --git a/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.html b/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.html index 8ff88fec..d6ce112f 100644 --- a/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.html +++ b/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.html @@ -1,30 +1,36 @@ - + - - + {{ node.name }} - - + [class.unchecked]="node.parent ? !(node.parent + node.name | stringIncludedInArray: checkedList()) : !checkedList()?.includes(node.name)" + [smTooltip]="node.displayName ?? node.name" [matTooltipShowDelay]="500" smShowTooltipIfEllipsis + (click)="itemSelect.emit(node.parent + node.name)">{{ node.displayName ?? node.name }} + + - - - - {{ node.name }} + + + + {{ node.displayName ?? node.name }} + - - diff --git a/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.scss b/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.scss index 50fa6901..bf55998b 100644 --- a/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.scss @@ -1,8 +1,6 @@ -@import "variables"; - :host { display: block; - padding: 0 24px; + padding: 0 12px 0 24px; margin: 0; overflow: scroll; --mat-tree-container-background-color: transparent; @@ -27,10 +25,6 @@ mat-tree-node { cursor: pointer; - - &.parent { - margin-right: 4px; - } } mat-tree-node:hover .al-ico-hide { @@ -38,55 +32,51 @@ mat-tree-node:hover .al-ico-hide { } .unchecked { - opacity: 0.4; + opacity: 0.65; } .toggle-icon { transition: transform 0.1s ease-in, color 0.1s ease-in; } -.expanded { - //span { - // color: var(--color-primary-container); - //} - - .toggle-icon { - transform: rotate(90deg); - } -} - .last-child { margin-bottom: 16px; } .child-node { - display: flex; - align-items: center; - flex: 1; gap: 12px; - width: 100%; height: 32px; - font-size: 12px; - border-radius: 4px; line-height: 32px; padding: 0 4px 0 12px; +} +.parent-node { + line-height: 36px; + padding: 0 4px; +} + +.parent-node2 { + height: 36px; + padding: 0 4px 0 8px; +} + +.panel { + display: flex; + flex: 1; + width: 100%; + gap: 6px; + align-items: center; + border-radius: 4px; &:hover { background-color: var(--color-surface-container-high); transition: background-color 0.2s; } - span { - flex: 1; + &.expanded { + background-color: var(--color-surface-container-high); + + .toggle-icon { + transform: rotate(90deg); + } } } - -.parent-node { - display: flex; - flex: 1; - align-items: center; - height: 40px; - width: calc(100% - 24px); - font-weight: 500; - cursor: pointer; -} diff --git a/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.ts b/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.ts index 8a849675..d4871097 100644 --- a/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.ts @@ -1,53 +1,40 @@ -import {ChangeDetectionStrategy, Component, effect, EventEmitter, input, Output} from '@angular/core'; - +import {ChangeDetectionStrategy, Component, computed, effect, input, viewChild, output } from '@angular/core'; import {GroupedList} from '@common/tasks/tasks.model'; -import { JsonPipe, KeyValuePipe } from '@angular/common'; -import {SortPipe} from '@common/shared/pipes/sort.pipe'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; -import {MatTreeFlatDataSource, MatTreeFlattener, MatTreeModule} from '@angular/material/tree'; -import {FlatTreeControl} from '@angular/cdk/tree'; +import {MatTree, MatTreeModule} from '@angular/material/tree'; import {ArrayIncludedInArrayPipe} from '@common/shared/pipes/array-starts-with-in-array.pipe'; import {StringIncludedInArrayPipe} from '@common/shared/pipes/string-included-in-array.pipe'; -import {StringStartsWithInArrayPipe} from '@common/shared/pipes/string-starts-with-in-array.pipe'; +import { MatIcon } from '@angular/material/icon'; +import { MatIconButton } from '@angular/material/button'; interface GroupItem { data: GroupItem; name: string; + displayName?: string; hasChildren: boolean; - children: string[]; + children: GroupItem[]; + childrenNames: string[]; parent: string; lastChild: boolean; -} - -interface ExampleFlatNode { expandable: boolean; - name: string; - parent: string; - level: number; - lastChild: boolean; - children: string[]; } - @Component({ - selector: 'sm-grouped-selectable-list', - templateUrl: './grouped-selectable-list.component.html', - styleUrls: ['./grouped-selectable-list.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - KeyValuePipe, - SortPipe, - TooltipDirective, - ShowTooltipIfEllipsisDirective, - MatTreeModule, - JsonPipe, - ArrayIncludedInArrayPipe, - StringIncludedInArrayPipe, - StringStartsWithInArrayPipe -] + selector: 'sm-grouped-selectable-list', + templateUrl: './grouped-selectable-list.component.html', + styleUrls: ['./grouped-selectable-list.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + TooltipDirective, + ShowTooltipIfEllipsisDirective, + MatTreeModule, + ArrayIncludedInArrayPipe, + StringIncludedInArrayPipe, + MatIcon, + MatIconButton + ] }) export class GroupedSelectableListComponent { @@ -56,79 +43,66 @@ export class GroupedSelectableListComponent { list = input(); checkedList = input(); - @Output() itemSelect = new EventEmitter(); - @Output() itemCheck = new EventEmitter<{ pathString: string; parent: string }>(); - @Output() groupChecked = new EventEmitter<{ key: string; hide: boolean }>(); + itemSelect = output(); + itemCheck = output<{ + pathString: string; + parent: string; + }>(); + groupChecked = output<{ + key: string; + hide: boolean; + }>(); - private _transformer = (node: GroupItem, level: number) => { - return { - expandable: node.hasChildren, - name: node.name, - parent: node.parent, - children: node.children, - lastChild: node.lastChild, - level: level, - }; - }; + tree = viewChild>(MatTree); - treeControl = new FlatTreeControl( - node => node.level, - node => node.expandable - ); + dataSource = computed(() => this.buildingNestedList(this.list())); - treeFlattener = new MatTreeFlattener( - this._transformer, - node => node.level, - node => node.expandable, - node => Object.values(node.data) - ); + childrenAccessor = (node: GroupItem) => node.children ?? []; - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - - hasChild = (_: number, node: ExampleFlatNode) => node.expandable; + hasChild = (_: number, node: GroupItem) => node.expandable; constructor() { - effect(() => { - if (this.list()) { - this.dataSource.data = this.buildingNestedList(); - } - }); - effect(() => { if (this.searchTerm()) { - this.treeControl.expandAll(); + this.tree().expandAll(); } else { - this.treeControl.collapseAll(); + this.tree().collapseAll(); } }); } - private buildingNestedList() { - return Object.entries(this.list()).map(([parent, children]) => ({ - data: Object.keys(children).reduce((acc, child, i) => { - acc[child] = { - name: child, - parent, - data: children[child], - hasChildren: false, - lastChild: Object.keys(children).length - 1 === i, - children: [] - }; - return acc; - }, {} as GroupItem), - name: parent, - parent: '', - hasChildren: Object.keys(children).length > 0, - children: [parent, ...Object.keys(children).map(child => parent + child)] - }) as GroupItem); + private buildingNestedList(list) { + return Object.entries(list || {}).map(([parent, children]) => { + const childrenNames = Object.keys(children).filter((variant) => variant !== '__displayName'); + return { + data: childrenNames.reduce((acc, child, i) => { + acc[child] = { + name: {name: child}, + parent, + data: children[child], + hasChildren: false, + lastChild: childrenNames.length - 1 === i, + children: [], + expanded: false, + }; + return acc; + }, {} as GroupItem), + name: parent, + displayName: list[parent].__displayName ?? parent, + parent: '', + hasChildren: childrenNames.length > 0, + children: childrenNames.map(child => ({name: child, parent})), + childrenNames: [parent, ...childrenNames.map(child => parent + child)], + expandable: childrenNames.length > 0 + } as GroupItem + }); } - isHideAllMode(parent: ExampleFlatNode) { - const children = this.treeControl.dataNodes.filter(a => a.parent === parent.name); - return parent.expandable ? children.some(child => this.checkedList().includes(parent.name + child.name)) : this.checkedList().includes(parent.name); + isHideAllMode(parent: GroupItem) { + return parent.expandable ? parent.children.some(child => this.checkedList().includes(parent.name + child.name)) : this.checkedList().includes(parent.name); } - groupCheck(node: ExampleFlatNode) { + groupCheck(node: GroupItem) { this.groupChecked.emit({key: node.name, hide: !this.isHideAllMode(node)}); } } diff --git a/src/app/webapp-common/shared/ui-components/data/labeled-row/labeled-row.component.ts b/src/app/webapp-common/shared/ui-components/data/labeled-row/labeled-row.component.ts index 587fe239..57f0188e 100644 --- a/src/app/webapp-common/shared/ui-components/data/labeled-row/labeled-row.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/labeled-row/labeled-row.component.ts @@ -2,11 +2,10 @@ import {Component, Input} from '@angular/core'; @Component({ - selector: 'sm-labeled-row', - templateUrl: './labeled-row.component.html', - styleUrls: ['./labeled-row.component.scss'], - standalone: true, - imports: [] + selector: 'sm-labeled-row', + templateUrl: './labeled-row.component.html', + styleUrls: ['./labeled-row.component.scss'], + imports: [] }) export class LabeledRowComponent { @Input() label: string; diff --git a/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.html b/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.html deleted file mode 100644 index 6728953f..00000000 --- a/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.html +++ /dev/null @@ -1,20 +0,0 @@ -
- {{titleLabel}} -
- -
- {{checkedList?.length === 0 ? 'Show all' : 'Hide all'}} -
- diff --git a/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.scss b/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.scss deleted file mode 100644 index 498916d0..00000000 --- a/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.scss +++ /dev/null @@ -1,35 +0,0 @@ -@import "variables"; - -:host { - display: flex; - flex-direction: column; - height: 100%; - padding: 16px; -} - -sm-selectable-list { - flex: 1; - overflow: hidden; - margin: 0 -16px 0 0; -} - -.toggle-all-text { - display: flex; - margin-top: 12px; - > span { - margin-left: auto; - font-size: 11px; - color: var(--color-outline); - cursor: pointer; - } -} - -i.toggle-icon { - font-size: 15px; - height: 18px; - padding-left: 5px; - - &.unchecked { - opacity: 0.4; - } -} diff --git a/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.ts b/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.ts deleted file mode 100644 index 32462da2..00000000 --- a/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.ts +++ /dev/null @@ -1,77 +0,0 @@ -import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@angular/core'; -import {SelectableListItem} from '../selectable-list/selectable-list.model'; -import {SearchComponent} from '@common/shared/ui-components/inputs/search/search.component'; -import {SelectableListComponent} from '@common/shared/ui-components/data/selectable-list/selectable-list.component'; - -@Component({ - selector: 'sm-selectable-filter-list', - templateUrl: './selectable-filter-list.component.html', - styleUrls: ['./selectable-filter-list.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - SearchComponent, - SelectableListComponent - ] -}) -export class SelectableFilterListComponent { - private _searchTerm: string; - private _list: SelectableListItem[]; - public filteredList: SelectableListItem[]; - public searchText: string; - - @Input() set searchTerm(searchTerm: string) { - this.filteredList = this.list ? this.filterList(this.list, searchTerm) : []; - this._searchTerm = searchTerm; - } - - get searchTerm() { - return this._searchTerm; - } - - @Input() checkedList: string[] = []; - @Input() placeholder = 'Search'; - @Input() titleLabel: string; - @Input() checkAllIcon: string; - @Output() itemSelect = new EventEmitter(); - @Output() hiddenChanged = new EventEmitter(); - @Output() searchTermChanged = new EventEmitter(); - - @Input() set list(list: SelectableListItem[]) { - this._list = list; - this.filteredList = this.filterList(list, this.searchTerm); - } - - get list() { - return this._list; - } - - filterList(list, searchTerm): SelectableListItem[] { - if (!searchTerm || searchTerm === '') { - return list.slice(); - } else { - return list.filter((item) => item.name.toLowerCase().includes(searchTerm.toLowerCase())); - } - } - - onSearchTermChanged(value: string) { - this.searchText = value; - this.searchTermChanged.emit(value); - } - - public toggleHide(id) { - const newHiddenList = this.checkedList.includes(id) ? this.checkedList.filter(i => i !== id) : [...this.checkedList, id]; - this.hiddenChanged.emit(newHiddenList); - } - - toggleHideAll() { - if (this.checkedList?.length > 0) { - this.hiddenChanged.emit([]); - - } else { - const allValues = this.list.map((i) => i.value); - this.hiddenChanged.emit(allValues); - } - } - -} diff --git a/src/app/webapp-common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component.html b/src/app/webapp-common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component.html index 32d5072a..40afef09 100644 --- a/src/app/webapp-common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component.html +++ b/src/app/webapp-common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component.html @@ -6,11 +6,11 @@ [minimumChars]="0" [debounceTime]="0" class="underline-search" - placeholder="Find scalars" + [placeholder]="placeHolder()" (valueChanged)="onSearchTermChanged($event)" >
- {{checkedList()?.length === 0 ? 'Show all' : 'Hide all'}} + {{checkedList()?.length !== 0 ? 'Hide all' : 'Show all'}}
{ + return metrics.reduce((acc, curr) => { + acc[`${curr.metric} - ${curr.variant}`] = {}; + return acc; + }, {} as Record>); +} + export const buildMetricsList = (metrics: MetricVariantResult[]): GroupedList => { return metrics.reduce((acc, curr) => { const currMetric = curr.metric; if (acc[currMetric]) { - acc[currMetric][curr.variant] = {}; + acc[currMetric][curr.variant] = {} as PlotData; } else { - acc[currMetric] = {[curr.variant]: {}}; + acc[currMetric] = {[curr.variant]: {} as PlotData}; } return acc; - }, {} as {[metric: string]: {[variant: string]: any}}); - + }, {} as Record>); } @Component({ - selector: 'sm-selectable-grouped-filter-list', - templateUrl: './selectable-grouped-filter-list.component.html', - styleUrls: ['./selectable-grouped-filter-list.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - SearchComponent, - GroupedSelectableListComponent - ] + selector: 'sm-selectable-grouped-filter-list', + templateUrl: './selectable-grouped-filter-list.component.html', + styleUrls: ['./selectable-grouped-filter-list.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + SearchComponent, + GroupedSelectableListComponent + ] }) export class SelectableGroupedFilterListComponent { @@ -37,12 +43,13 @@ export class SelectableGroupedFilterListComponent { searchTerm = input(); checkedList = input([]); titleLabel = input(); + placeHolder = input('Find scalars'); - @Output() itemSelect = new EventEmitter(); - @Output() hiddenChanged = new EventEmitter(); - @Output() searchTermChanged = new EventEmitter(); + itemSelect = output(); + hiddenChanged = output(); + searchTermChanged = output(); - filteredList = computed(() => this.filterList(this.list(), this.searchTerm())) + filteredList = computed(() => this.filterList(this.list(), this.searchTerm())); filterList(list: GroupedList, searchTerm: string) { if (!searchTerm || searchTerm === '') { @@ -88,7 +95,7 @@ export class SelectableGroupedFilterListComponent { } public toggleHide({pathString, parent}) { - let newCheckedList = this.checkedList().includes(pathString) ? this.checkedList().filter(i => i !== pathString) : [...this.checkedList(), pathString]; + let newCheckedList = this.checkedList()?.includes(pathString) ? this.checkedList()?.filter(i => i !== pathString) : [...this.checkedList(), pathString]; if (this.shouldHidePrent(parent, newCheckedList)) { newCheckedList = newCheckedList.filter(i => i !== parent); } else { @@ -104,14 +111,16 @@ export class SelectableGroupedFilterListComponent { } toggleHideAll() { - if (Object.keys(this.checkedList()).length > 0) { + if (Object.keys(this.checkedList() ?? {}).length > 0) { this.hiddenChanged.emit([]); } else { const allValues = []; Object.keys(this.list()).forEach(key => { allValues.push(key); Object.keys(this.list()[key]).forEach(itemKey => { - allValues.push(key + itemKey); + if (itemKey !== '__displayName') { + allValues.push(key + itemKey); + } }); }); this.hiddenChanged.emit(allValues); @@ -120,17 +129,17 @@ export class SelectableGroupedFilterListComponent { toggleHideGroup(event) { const key = event.key; - let allValues = [...this.checkedList()]; + let allValues = [...this.checkedList() ?? []]; if (event.hide) { allValues = !allValues.includes(key) ? [...allValues, key] : allValues; Object.keys(this.list()[key]).forEach(itemKey => { const keyItemKey = key + itemKey; - if (!allValues.includes(keyItemKey)) { + if (!allValues.includes(keyItemKey) && itemKey !== '__displayName') { allValues.push(keyItemKey); } }); } else { - const parentKey = `${key} / ` + const parentKey = `${key}` allValues = allValues.filter(i => !i.startsWith(parentKey) && i !== key); Object.keys(this.list()[key]).forEach(itemKey => { const keyItemKey = key + itemKey; diff --git a/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.html b/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.html deleted file mode 100644 index 79edd34c..00000000 --- a/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.html +++ /dev/null @@ -1,12 +0,0 @@ -
    - @for (item of showList(); track item.value) { -
  • -
    {{item.value}}
    - -
    • - } -
diff --git a/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.scss b/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.scss deleted file mode 100644 index 922bb907..00000000 --- a/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.scss +++ /dev/null @@ -1,48 +0,0 @@ -@import "variables"; - - -//.gray { -// color: gray; -//} - -i.icon { - font-size: 15px; - width: 15px; - height: 15px; -} - -.list { - height: 100%; - padding: 0 10px 20px 0; - overflow-y: auto; - overflow-x: hidden; - - .item { - display: flex; - justify-content: space-between; - align-items: center; - cursor: pointer; - list-style: none; - padding: 10px 12px; - font-size: 14px; - border-radius: 4px; - - .al-ico-hide { - visibility: hidden; - } - - &:hover { - background-color: var(--color-surface-container-highest); - transition: background-color 0.2s; - .al-ico-hide { - visibility: visible; - } - } - } - -} - -.unchecked { - opacity: 0.4; -} - diff --git a/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.ts b/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.ts deleted file mode 100644 index 876f0017..00000000 --- a/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { - ChangeDetectionStrategy, - ChangeDetectorRef, - Component, - inject, input, output, computed -} from '@angular/core'; -import {SelectableListItem} from './selectable-list.model'; - -import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; - -@Component({ - selector: 'sm-selectable-list', - templateUrl: './selectable-list.component.html', - styleUrls: ['./selectable-list.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - TooltipDirective - ] -}) -export class SelectableListComponent { - private cdr = inject(ChangeDetectorRef); - - list = input([]); - checkedList = input(); - checkIcon = input(['al-ico-show', 'al-ico-hide']); - onItemSelect = output(); - onItemCheck = output(); - - protected showList = computed(() => this.list().map(item => ({...item, visible: this.checkedList()?.includes(item.name) } as SelectableListItem))); -} diff --git a/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.model.ts b/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.model.ts deleted file mode 100644 index fbb891d5..00000000 --- a/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.model.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface SelectableListItem { - name: string; - value: string; - visible?: boolean; -} diff --git a/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.scss b/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.scss index 40a27144..142134ae 100644 --- a/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.scss @@ -1,6 +1,3 @@ -@import "variables"; - -// TODO: move to theme definition? $table-row-height: 32px; $table-row-padding: 10px; diff --git a/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.ts b/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.ts index 717bcf72..69c003a1 100644 --- a/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.ts @@ -4,15 +4,14 @@ import {FormsTrackBy} from '../../../utils/forms-track-by'; import { NgTemplateOutlet } from '@angular/common'; @Component({ - selector: 'sm-simple-table-2', - templateUrl: './simple-table.component.html', - styleUrls: ['./simple-table.component.scss'], - standalone: true, - imports: [ - CdkDropList, - NgTemplateOutlet, - CdkDrag -] + selector: 'sm-simple-table-2', + templateUrl: './simple-table.component.html', + styleUrls: ['./simple-table.component.scss'], + imports: [ + CdkDropList, + NgTemplateOutlet, + CdkDrag + ] }) export class SimpleTableComponent extends FormsTrackBy { diff --git a/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.ts b/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.ts index 7ad7ac20..dff74fc6 100644 --- a/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.ts @@ -4,13 +4,12 @@ import {NgTemplateOutlet} from '@angular/common'; import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; @Component({ - selector: 'sm-table-card', - templateUrl: './table-card.component.html', - styleUrls: ['./table-card.component.scss'], - standalone: true, - imports: [ - NgTemplateOutlet - ] + selector: 'sm-table-card', + templateUrl: './table-card.component.html', + styleUrls: ['./table-card.component.scss'], + imports: [ + NgTemplateOutlet + ] }) export class TableCardComponent { columns = input(); diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component.html b/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component.html index 1dc6d1eb..975e2943 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component.html +++ b/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component.html @@ -38,10 +38,14 @@ } @if (col?.andFilter) {
- Any - All + +
}
diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component.scss b/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component.scss index 5ab2cd72..f24c15ef 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { .filter-sort-container { ::ng-deep .menu-button { @@ -35,19 +33,15 @@ } .filter-type { - padding: 4px 14px; + padding: 4px 0; text-align: right; .link { - font-size: 12px; - font-weight: 500; color: var(--color-outline); - cursor: pointer; &.selected { color: var(--color-on-surface); pointer-events: none; - cursor: initial; } } } diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component.ts index 1af6efa4..a94beb91 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter.component.ts @@ -16,27 +16,27 @@ import {ClickStopPropagationDirective} from '@common/shared/ui-components/direct import {DotsLoadMoreComponent} from '@common/shared/ui-components/indicators/dots-load-more/dots-load-more.component'; import {IOption} from '@common/constants'; import {FormsModule} from '@angular/forms'; -import {MatIconButton} from '@angular/material/button'; +import {MatButton, MatIconButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-table-card-filter', - templateUrl: './table-card-filter.component.html', - styleUrls: ['./table-card-filter.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - MatMenuModule, - MatInputModule, - CheckboxThreeStateListComponent, - MatListModule, - MenuItemComponent, - FilterPipe, - ClickStopPropagationDirective, - DotsLoadMoreComponent, - FormsModule, - MatIconButton, - MatIcon, + selector: 'sm-table-card-filter', + templateUrl: './table-card-filter.component.html', + styleUrls: ['./table-card-filter.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatMenuModule, + MatInputModule, + CheckboxThreeStateListComponent, + MatListModule, + MenuItemComponent, + FilterPipe, + ClickStopPropagationDirective, + DotsLoadMoreComponent, + FormsModule, + MatIconButton, + MatIcon, + MatButton, ] }) export class TableCardFilterComponent { diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-duration-sort-base.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-duration-sort-base.component.ts index 9c23d380..a4446a78 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-duration-sort-base.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-duration-sort-base.component.ts @@ -81,7 +81,8 @@ export class DataInputOutputHelper { @Component({ - template: 'sm-table-duration-base' + template: 'sm-table-duration-base', + standalone: false }) export abstract class TableDurationSortBaseComponent { protected cdr: ChangeDetectorRef; diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-date-time/table-filter-duration-date-time.component.scss b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-date-time/table-filter-duration-date-time.component.scss index 883e83a9..3c264e81 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-date-time/table-filter-duration-date-time.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-date-time/table-filter-duration-date-time.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { .mat-datepicker-container { width: 130px; diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-date-time/table-filter-duration-date-time.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-date-time/table-filter-duration-date-time.component.ts index d03c1ea0..f2203ee7 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-date-time/table-filter-duration-date-time.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-date-time/table-filter-duration-date-time.component.ts @@ -76,31 +76,30 @@ export const getTimeInSecondsFromDate = (_date: number | Date): number => { }; @Component({ - selector: 'sm-table-filter-duration-date-time', - templateUrl: './table-filter-duration-date-time.component.html', - styleUrls: ['./table-filter-duration-date-time.component.scss'], - providers: [ - {provide: MAT_DATE_LOCALE, useValue: 'en-GB'}, - {provide: MAT_DATE_FORMATS, useValue: MY_DATE_FORMATS}, - provideNativeDateAdapter() - ], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - FormsModule, - ClickStopPropagationDirective, - KeydownStopPropagationDirective, - DurationInputListComponent, - TooltipDirective, - TableFilterDurationErrorComponent, - MatDatepickerInput, - MatDatepickerToggle, - MatDatepicker, - MatInput, - MatFormField, - MatIconButton, - MatIcon - ] + selector: 'sm-table-filter-duration-date-time', + templateUrl: './table-filter-duration-date-time.component.html', + styleUrls: ['./table-filter-duration-date-time.component.scss'], + providers: [ + { provide: MAT_DATE_LOCALE, useValue: 'en-GB' }, + { provide: MAT_DATE_FORMATS, useValue: MY_DATE_FORMATS }, + provideNativeDateAdapter() + ], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + FormsModule, + ClickStopPropagationDirective, + KeydownStopPropagationDirective, + DurationInputListComponent, + TooltipDirective, + TableFilterDurationErrorComponent, + MatDatepickerInput, + MatDatepickerToggle, + MatDatepicker, + MatInput, + MatFormField, + MatIconButton, + MatIcon + ] }) export class TableFilterDurationDateTimeComponent extends TableDurationSortBaseComponent { _lessThan = { diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-error/table-filter-duration-error.component.scss b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-error/table-filter-duration-error.component.scss index ecdee86e..43538095 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-error/table-filter-duration-error.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-error/table-filter-duration-error.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - .error { color: var(--color-error); font-size: 12px; diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-numeric/table-filter-duration-numeric.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-numeric/table-filter-duration-numeric.component.ts index b353ae97..ded4698e 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-numeric/table-filter-duration-numeric.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-numeric/table-filter-duration-numeric.component.ts @@ -28,22 +28,20 @@ const getDurationValue = (value: IDurationThan) => value.checked ? `${value.valu @Component({ - selector: 'sm-table-filter-duration-numeric', - templateUrl: './table-filter-duration-numeric.component.html', - styleUrls: ['./table-filter-duration-numeric.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - TableFilterDurationErrorComponent, - DividerComponent, - MatInputModule, - ReactiveFormsModule, - ClickStopPropagationDirective, - KeydownStopPropagationDirective, - MatIcon, - MatIconButton - ], - standalone: true - + selector: 'sm-table-filter-duration-numeric', + templateUrl: './table-filter-duration-numeric.component.html', + styleUrls: ['./table-filter-duration-numeric.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + TableFilterDurationErrorComponent, + DividerComponent, + MatInputModule, + ReactiveFormsModule, + ClickStopPropagationDirective, + KeydownStopPropagationDirective, + MatIcon, + MatIconButton + ] }) export class TableFilterDurationNumericComponent extends TableDurationSortBaseComponent { immediate = new ImmediateErrorStateMatcher(); diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration/table-filter-duration.component.scss b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration/table-filter-duration.component.scss index d2983c18..fdfc4408 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration/table-filter-duration.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration/table-filter-duration.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { .label { font-size: 12px; diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration/table-filter-duration.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration/table-filter-duration.component.ts index eae99f38..3b051181 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration/table-filter-duration.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration/table-filter-duration.component.ts @@ -16,20 +16,18 @@ import { } from '@common/shared/ui-components/directives/keydown-stop-propagation.directive'; @Component({ - selector: 'sm-table-filter-duration', - templateUrl: './table-filter-duration.component.html', - styleUrls: ['./table-filter-duration.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - - imports: [ - DurationInputListComponent, - TableFilterDurationErrorComponent, - FormsModule, - DividerComponent, - ClickStopPropagationDirective, - KeydownStopPropagationDirective -] + selector: 'sm-table-filter-duration', + templateUrl: './table-filter-duration.component.html', + styleUrls: ['./table-filter-duration.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + DurationInputListComponent, + TableFilterDurationErrorComponent, + FormsModule, + DividerComponent, + ClickStopPropagationDirective, + KeydownStopPropagationDirective + ] }) export class TableFilterDurationComponent extends TableDurationSortBaseComponent { diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort/table-filter-sort.component.html b/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort/table-filter-sort.component.html index a799d7a6..ddf16d3f 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort/table-filter-sort.component.html +++ b/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort/table-filter-sort.component.html @@ -37,6 +37,7 @@ (menuClosed)="onMenuClose()" (menuOpened)="onMenuOpen()" [buttonClass]="'sm'" + data-id="OpenMenu" > @switch (column().filterType) { @case (FILTER_TYPE.duration) { diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort/table-filter-sort.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort/table-filter-sort.component.ts index f40916fd..392a7f06 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort/table-filter-sort.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort/table-filter-sort.component.ts @@ -28,25 +28,24 @@ import {MatIcon} from '@angular/material/icon'; import {MatButton, MatIconButton} from '@angular/material/button'; @Component({ - selector: 'sm-table-filter-sort', - templateUrl: './table-filter-sort.component.html', - styleUrls: ['./table-filter-sort.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - CheckboxThreeStateListComponent, - TableFilterDurationNumericComponent, - TableFilterDurationComponent, - MenuComponent, - TooltipDirective, - MenuItemComponent, - ClickStopPropagationDirective, - TableFilterDurationDateTimeComponent, - DotsLoadMoreComponent, - MatIcon, - MatIconButton, - MatButton - ] + selector: 'sm-table-filter-sort', + templateUrl: './table-filter-sort.component.html', + styleUrls: ['./table-filter-sort.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + CheckboxThreeStateListComponent, + TableFilterDurationNumericComponent, + TableFilterDurationComponent, + MenuComponent, + TooltipDirective, + MenuItemComponent, + ClickStopPropagationDirective, + TableFilterDurationDateTimeComponent, + DotsLoadMoreComponent, + MatIcon, + MatIconButton, + MatButton + ] }) export class TableFilterSortComponent { @@ -112,13 +111,13 @@ export class TableFilterSortComponent { this.state().loading.set(false); } } - }, {allowSignalWrites: true}); + }); effect(() => { if (this.searchValue() && this.previousSearchValue !== this.searchValue()) { this.pageNumber.set(1); } - }, {allowSignalWrites: true}); + }); } switchSortOrder($event: MouseEvent) { diff --git a/src/app/webapp-common/shared/ui-components/data/table/table.component.html b/src/app/webapp-common/shared/ui-components/data/table/table.component.html index 888bd06d..1e6701d4 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table.component.html +++ b/src/app/webapp-common/shared/ui-components/data/table/table.component.html @@ -7,7 +7,7 @@ [style.--card-height]="(cardsCollapsed() ? 56 : cardHeight()) + 'px'" [filterDelay]="0" [globalFilterFields]="enableTableSearch() ? globalFilterFields() : null" - [scrollHeight]="'flex'" + [scrollHeight]="scrollHeight()" [autoLayout]="false" [columns]="visibleColumns()" [selectionMode]="selectionMode()" @@ -36,8 +36,8 @@ (onRowUnselect)="onRowDeselected($event)" (onContextMenuSelect)="openContext($event)" (onColResize)="colResize($event)"> - -
+ +
@if (!tableSate().loading() && !noDataTemplate()) { No data to show @@ -48,12 +48,12 @@ } - + @if (!noHeader()) { - + @if (!minimizedView()) {
@for (col of visibleColumns(); track col.id) { @@ -93,14 +93,16 @@ (click)="cardsCollapsedToggle.emit()">
- - @for (col of sortableCols; track col.id) { -
- -
- } - + @if (sortableCols.length > 0) { + + @for (col of sortableCols; track col.id) { +
+ +
+ } + + }
@@ -110,7 +112,7 @@ } } - + } @@ -188,7 +191,7 @@ } } - + diff --git a/src/app/webapp-common/shared/ui-components/data/table/table.component.scss b/src/app/webapp-common/shared/ui-components/data/table/table.component.scss index e62dd411..bc65eec0 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/table/table.component.scss @@ -1,37 +1,13 @@ :host { - ::ng-deep .p-datatable-table { - border-collapse: collapse; - } - - ::ng-deep th.resize-enabled span.p-column-resizer { - width: 8px; - z-index: 20; - - &:hover { - background: color-mix(in srgb, var(--color-primary), transparent 80%); - background-clip: content-box; - } - } - - th.resize-disabled { - ::ng-deep span.p-column-resizer { + ::ng-deep span.p-datatable-column-resizer { cursor: auto; } } - ::ng-deep .p-column-resizer-helper { - background-color: var(--color-primary); - z-index: 1000; - } - - ::ng-deep .p-icon path { - fill: var(--color-primary); - } - .has-header { ::ng-deep .p-datatable-scrollable, ::ng-deep .p-datatable { - & > .p-datatable-wrapper > .p-datatable-table > .p-datatable-thead { + & > .p-datatable-table-container .p-datatable-table > .p-datatable-thead { z-index: 20; &:after { @@ -48,14 +24,14 @@ } } - ::ng-deep .p-datatable-wrapper { + ::ng-deep .p-datatable-table-container { .p-datatable-tbody { height: calc(100% - var(--table-row-height, 48px)); } } .card-view { - ::ng-deep .p-datatable-wrapper { + ::ng-deep .p-datatable-table-container { overflow-x: hidden; } } @@ -209,6 +185,7 @@ &:hover { background-color: var(--row-selected-hover-color); + color: var(--row-selected-text-color); } } } @@ -341,6 +318,9 @@ } } } + td { + border: none; + } } } @@ -349,6 +329,21 @@ tr.cards-table .card-wrapper { margin: 6px 12px; } + + tr:not(.cards-table):not(.no-data-row):not(.load-more-wrapper) td:first-child::after { + content: ""; + position: absolute; + left: 0; + width: 100%; + border-bottom: 1px solid var(--row-border-color); + bottom: 0; + } + } + + @supports (-webkit-box-reflect:unset) { + ::ng-deep .p-datatable-table { + border-collapse: collapse; + } } } diff --git a/src/app/webapp-common/shared/ui-components/data/table/table.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table.component.ts index b1db935b..be29fa76 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table.component.ts @@ -10,7 +10,7 @@ import { TemplateRef, input, computed, model, effect, viewChild, inject, contentChildren, output, Output, EventEmitter } from '@angular/core'; -import {get, isArray, isString} from 'lodash-es'; +import {get} from 'lodash-es'; import {MenuItem, PrimeTemplate, ScrollerOptions, SortMeta} from 'primeng/api'; import {FilterMetadata} from 'primeng/api/filtermetadata'; import {ContextMenu, ContextMenuModule} from 'primeng/contextmenu'; @@ -29,7 +29,7 @@ import {Store} from '@ngrx/store'; import {selectScaleFactor} from '@common/core/reducers/view.reducer'; import {sortCol} from '@common/shared/utils/sortCol'; import {mkConfig, download, generateCsv, asString} from 'export-to-csv'; -import {prepareColsForDownload} from '@common/shared/utils/download'; +import {prepareColsForDownload, sanitizeCSVCell} from '@common/shared/utils/download'; import {NgTemplateOutlet} from '@angular/common'; import {ResizableColumnDirective} from '@common/shared/ui-components/data/table/resizable-column.directive'; import {MenuComponent} from '@common/shared/ui-components/panel/menu/menu.component'; @@ -45,22 +45,21 @@ export interface TableContextMenuSelectEventExt extends Omit implements AfterContentInit, OnDestroy { private element = inject(ElementRef); @@ -94,6 +93,7 @@ export class TableComponent implements AfterContentIni private waitForClick: number; search: string; + scrollHeight = input('flex'); autoLoadMore = input(false); columnResizeMode = input('expand' as 'fit' | 'expand'); expandableRows = input(false); @@ -203,6 +203,12 @@ export class TableComponent implements AfterContentIni } }); + effect(() => { + if (this.virtualScroll() && this.table() && this.tableData()) { + window.setTimeout(() => this.table().scroller?.setSize(), 50); + } + }); + effect(() => { if (this.table()) { // In order to know if we should reset first to 0 on filter input. @@ -234,7 +240,7 @@ export class TableComponent implements AfterContentIni } gotTable = () => { - this.scrollContainer = this.table().el.nativeElement.getElementsByClassName('p-datatable-wrapper')[0] as HTMLDivElement; + this.scrollContainer = this.table().el.nativeElement.getElementsByClassName('p-datatable-table-container')[0] as HTMLDivElement; if (this.scrollContainer) { this.scrollContainer.onscroll = () => { if (!this.waiting) { @@ -565,18 +571,25 @@ export class TableComponent implements AfterContentIni this.lastRowExpanded = expanded && expandedIndex === this.currRowsNumber() - 1; } + preProcessRows(cols: any[]) { + return this.tableData().map(row => + cols.reduce((acc, dCol) => { + const val = get(row, dCol.field, '') as unknown; + acc[dCol.name] = Array.isArray(val) ? + val.toString() : + typeof val === 'string' ? + sanitizeCSVCell(val.replace(/\r?\n|\r/g, '')) : + val; + return acc; + }, {}) + ); + } + getTableCopy() { const colsOrder = this.columnsOrder() ?? this.visibleColumns().map(col => col.id); const sortedAllColumns = colsOrder.map(sortCol => this.columns().find(col => col.id === sortCol)) const downloadCols = prepareColsForDownload(sortedAllColumns); - const rows = this.tableData().map(row => - downloadCols.reduce((acc, dCol) => { - const val = get(row, dCol.field, ''); - acc[dCol.name] = isArray(val) ? val.toString() : isString(val) ? val.replace(/\r?\n|\r/g - , '') : val; - return acc; - }, {}) - ); + const rows = this.preProcessRows(downloadCols); const csvConfig = mkConfig({useKeysAsHeaders: true}); return asString(generateCsv(csvConfig)(rows)); } @@ -593,14 +606,7 @@ export class TableComponent implements AfterContentIni const rest = this.columns().filter(col => !colsOrder.includes(col.id)); const downloadCols = prepareColsForDownload([...sortedAllColumns, ...rest]); options.columnHeaders = downloadCols.map(dCol => dCol.name); - const rows = this.tableData().map(row => - downloadCols.reduce((acc, dCol) => { - const val = get(row, dCol.field, ''); - acc[dCol.name] = isArray(val) ? val.toString() : isString(val) ? val.replace(/\r?\n|\r/g - , '') : val; - return acc; - }, {}) - ); + const rows = this.preProcessRows(downloadCols); const csv = generateCsv(options)(rows); download(options)(csv); diff --git a/src/app/webapp-common/shared/ui-components/data/veritical-labeled-row/vertical-labeled-row.component.ts b/src/app/webapp-common/shared/ui-components/data/veritical-labeled-row/vertical-labeled-row.component.ts index 69c878aa..be459a66 100644 --- a/src/app/webapp-common/shared/ui-components/data/veritical-labeled-row/vertical-labeled-row.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/veritical-labeled-row/vertical-labeled-row.component.ts @@ -3,14 +3,13 @@ import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/ import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; @Component({ - selector: 'sm-vertical-labeled-row', - templateUrl: './vertical-labeled-row.component.html', - styleUrls: ['./vertical-labeled-row.component.scss'], - standalone: true, - imports: [ - TooltipDirective, - ShowTooltipIfEllipsisDirective - ] + selector: 'sm-vertical-labeled-row', + templateUrl: './vertical-labeled-row.component.html', + styleUrls: ['./vertical-labeled-row.component.scss'], + imports: [ + TooltipDirective, + ShowTooltipIfEllipsisDirective + ] }) export class VerticalLabeledRowComponent { @Input() label: string; diff --git a/src/app/webapp-common/shared/ui-components/directives/choose-color/choose-color.directive.ts b/src/app/webapp-common/shared/ui-components/directives/choose-color/choose-color.directive.ts index 505e266b..bd6b07c6 100644 --- a/src/app/webapp-common/shared/ui-components/directives/choose-color/choose-color.directive.ts +++ b/src/app/webapp-common/shared/ui-components/directives/choose-color/choose-color.directive.ts @@ -2,14 +2,16 @@ import {Directive, ElementRef, HostListener, Input} from '@angular/core'; import {colorToString, hexToRgb} from '@common/shared/services/color-hash/color-hash.utils'; import {Store} from '@ngrx/store'; import {showColorPicker} from './choose-color.actions'; +import {colorPickerHeight, colorPickerWidth} from '@common/shared/ui-components/directives/choose-color/choose-color.reducer'; @Directive({ - selector: '[smChooseColor]', + selector: '[smChooseColor]', + standalone: false }) export class ChooseColorDirective { readonly colorTopOffset = 100; - readonly colorPickerWidth = 230; - readonly colorPickerHeight = 460 - this.colorTopOffset; + readonly colorPickerWidth = colorPickerWidth; + readonly colorPickerHeight = colorPickerHeight - this.colorTopOffset; @Input() colorButtonRef; @Input() colorButtonClass: string; @Input() stringToColor: string | string[]; @@ -51,13 +53,13 @@ export class ChooseColorDirective { constructor(private el: ElementRef, private store: Store) {} openColorPicker(event: MouseEvent) { - let top = event.pageY - (this.colorPickerHeight / 3); + let top = Math.max(event.pageY - (this.colorPickerHeight / 3), 30); let left = event.pageX; if (event.pageY + this.colorPickerHeight >= (window.innerHeight || document.documentElement.clientHeight)) { - top = (event.pageY) - this.colorPickerHeight; + top = Math.max((event.pageY) - colorPickerHeight, 15); } if (event.clientX + this.colorPickerWidth >= (window.innerWidth || document.documentElement.clientWidth)) { - left = (event.clientX) - this.colorPickerWidth; + left = Math.max((event.clientX) - colorPickerWidth, 15); } this.store.dispatch(showColorPicker({ diff --git a/src/app/webapp-common/shared/ui-components/directives/choose-color/choose-color.module.ts b/src/app/webapp-common/shared/ui-components/directives/choose-color/choose-color.module.ts index 727c1df5..cc34dcee 100644 --- a/src/app/webapp-common/shared/ui-components/directives/choose-color/choose-color.module.ts +++ b/src/app/webapp-common/shared/ui-components/directives/choose-color/choose-color.module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {ChooseColorDirective} from './choose-color.directive'; import {ColorPickerWrapperComponent} from '../../inputs/color-picker/color-picker-wrapper.component'; -import {ColorPickerModule} from 'ngx-color-picker'; +import {ColorPickerDirective} from 'ngx-color-picker'; import {StoreModule} from '@ngrx/store'; import {colorPreferenceReducer} from './choose-color.reducer'; import {MatButton} from '@angular/material/button'; @@ -25,9 +25,9 @@ const _declarations = [ declarations : _declarations, imports: [ CommonModule, - ColorPickerModule, StoreModule.forFeature('colorsPreference', colorPreferenceReducer), MatButton, + ColorPickerDirective, ], exports : _declarations }) diff --git a/src/app/webapp-common/shared/ui-components/directives/choose-color/choose-color.reducer.ts b/src/app/webapp-common/shared/ui-components/directives/choose-color/choose-color.reducer.ts index d751ec98..48ae2eed 100644 --- a/src/app/webapp-common/shared/ui-components/directives/choose-color/choose-color.reducer.ts +++ b/src/app/webapp-common/shared/ui-components/directives/choose-color/choose-color.reducer.ts @@ -7,6 +7,9 @@ import { showColorPicker } from './choose-color.actions'; +export const colorPickerHeight = 405; +export const colorPickerWidth = 260; + export interface ColorPreferenceState { colorPreferences: ColorPreference; pickerProps: ColorPickerProps; diff --git a/src/app/webapp-common/shared/ui-components/directives/sync-scroll.directive.ts b/src/app/webapp-common/shared/ui-components/directives/sync-scroll.directive.ts index 943eb7f2..070e76fe 100644 --- a/src/app/webapp-common/shared/ui-components/directives/sync-scroll.directive.ts +++ b/src/app/webapp-common/shared/ui-components/directives/sync-scroll.directive.ts @@ -4,7 +4,8 @@ import {Subscription} from 'rxjs'; import {filter} from 'rxjs/operators'; @Directive({ - selector: '[smSyncScroll]' + selector: '[smSyncScroll]', + standalone: false }) export class SyncScrollDirective implements OnDestroy { diff --git a/src/app/webapp-common/shared/ui-components/indicators/circle-counter/circle-counter.component.scss b/src/app/webapp-common/shared/ui-components/indicators/circle-counter/circle-counter.component.scss index ee49a54b..6c078c47 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/circle-counter/circle-counter.component.scss +++ b/src/app/webapp-common/shared/ui-components/indicators/circle-counter/circle-counter.component.scss @@ -1,8 +1,6 @@ -@import "mixins/common"; -@import "variables"; +@use "mixins/common"; $reqWidth: 56px; -$font-size: 18px; .model-labels { background-color: var(--color-warning); @@ -87,13 +85,13 @@ $font-size: 18px; } .counter { - @include vertical-align(); - @include counter-title(); + @include common.vertical-align(); + @include common.counter-title(); } } .counter-label { - @include counter-label(); + @include common.counter-label(); &.leave-space { min-height: 17px; diff --git a/src/app/webapp-common/shared/ui-components/indicators/circle-counter/circle-counter.component.ts b/src/app/webapp-common/shared/ui-components/indicators/circle-counter/circle-counter.component.ts index 21efa75c..37247f64 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/circle-counter/circle-counter.component.ts +++ b/src/app/webapp-common/shared/ui-components/indicators/circle-counter/circle-counter.component.ts @@ -6,13 +6,12 @@ import {fileSizeConfigCount, FileSizePipe} from '@common/shared/pipes/filesize.p @Component({ - selector: 'sm-circle-counter', - templateUrl: './circle-counter.component.html', - styleUrls: ['./circle-counter.component.scss'], - standalone: true, - imports: [ - FileSizePipe -] + selector: 'sm-circle-counter', + templateUrl: './circle-counter.component.html', + styleUrls: ['./circle-counter.component.scss'], + imports: [ + FileSizePipe + ] }) export class CircleCounterComponent { public valType: 'array' | 'number' | 'tags' | 'string'; diff --git a/src/app/webapp-common/shared/ui-components/indicators/circle-status/circle-status.component.scss b/src/app/webapp-common/shared/ui-components/indicators/circle-status/circle-status.component.scss index 1d9a509b..06d55f13 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/circle-status/circle-status.component.scss +++ b/src/app/webapp-common/shared/ui-components/indicators/circle-status/circle-status.component.scss @@ -1,8 +1,7 @@ -@import "mixins/common"; -@import "variables"; +@use "mixins/common"; $reqWidth: 56px; -$font-size: 18px; + .completed { background-color: var(--color-completed); } @@ -64,7 +63,7 @@ $font-size: 18px; } } .counter-label { - @include counter-label(); + @include common.counter-label(); text-transform: uppercase; } } diff --git a/src/app/webapp-common/shared/ui-components/indicators/circle-status/circle-status.component.ts b/src/app/webapp-common/shared/ui-components/indicators/circle-status/circle-status.component.ts index ee453c01..308cae82 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/circle-status/circle-status.component.ts +++ b/src/app/webapp-common/shared/ui-components/indicators/circle-status/circle-status.component.ts @@ -7,14 +7,13 @@ import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-circle-status', - templateUrl: './circle-status.component.html', - styleUrls: ['./circle-status.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - MatIcon - ], - standalone: true + selector: 'sm-circle-status', + templateUrl: './circle-status.component.html', + styleUrls: ['./circle-status.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatIcon + ] }) export class CircleStatusComponent { protected readonly experimentsStatusLabels = EXPERIMENTS_STATUS_LABELS; diff --git a/src/app/webapp-common/shared/ui-components/indicators/circles-in-row/circles-in-row.component.html b/src/app/webapp-common/shared/ui-components/indicators/circles-in-row/circles-in-row.component.html index ab4973ff..9361857e 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/circles-in-row/circles-in-row.component.html +++ b/src/app/webapp-common/shared/ui-components/indicators/circles-in-row/circles-in-row.component.html @@ -1,12 +1,12 @@ -@if (!isStagger) { +@if (!isStagger()) {
- @for (circle of data | slice : 0 : (limit || data?.length); track $index; ) { + @for (circle of data() | slice : 0 : (limit() || data()?.length); track $index; ) {
@@ -19,10 +19,11 @@
} - @if (limit && data.length > limit) { + @if (limit() && data().length > limit()) {
-
+{{ data.length - limit }}
+ [smTooltip]="restTooltip()" + [style.left.px]="-6 * (limit())"> +
+{{ data().length - limit() }}
} @@ -33,7 +34,7 @@ class="circle stagger" [style.left.px]="-27 * $index" [style.zIndex]="staggerArray.length - $index" - >{{ $index === 0 ? stagger : '' }} + >{{ $index === 0 ? stagger() : '' }} } diff --git a/src/app/webapp-common/shared/ui-components/indicators/circles-in-row/circles-in-row.component.scss b/src/app/webapp-common/shared/ui-components/indicators/circles-in-row/circles-in-row.component.scss index a75cbb2c..01167425 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/circles-in-row/circles-in-row.component.scss +++ b/src/app/webapp-common/shared/ui-components/indicators/circles-in-row/circles-in-row.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { .circles { display: flex; diff --git a/src/app/webapp-common/shared/ui-components/indicators/circles-in-row/circles-in-row.component.ts b/src/app/webapp-common/shared/ui-components/indicators/circles-in-row/circles-in-row.component.ts index 9a7385e2..a5084121 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/circles-in-row/circles-in-row.component.ts +++ b/src/app/webapp-common/shared/ui-components/indicators/circles-in-row/circles-in-row.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; +import {ChangeDetectionStrategy, Component, computed, input, Input} from '@angular/core'; import {SlicePipe} from '@angular/common'; import {slice} from 'lodash-es'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; @@ -16,7 +16,6 @@ export interface CirclesInRowInterface { templateUrl: './circles-in-row.component.html', styleUrls: ['./circles-in-row.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, imports: [ TooltipDirective, InitialsPipe, @@ -25,15 +24,19 @@ export interface CirclesInRowInterface { }) export class CirclesInRowComponent { - @Input() data: CirclesInRowInterface[] = []; - @Input() stagger: string | number; - @Input() isStagger: boolean; + data = input([]); + stagger = input(); + isStagger = input(); @Input() set staggerAmount(staggerAmount: number) { this._staggerAmount = new Array(staggerAmount).map((x, index) => index); } - @Input() limit; + + limit = input(); + restTooltip= computed(() => { + return this.data().slice(this.limit()).map((x) => x.name).join(', '); + }); get staggerArray() { return this._staggerAmount; diff --git a/src/app/webapp-common/shared/ui-components/indicators/copy-clipboard/copy-clipboard.component.ts b/src/app/webapp-common/shared/ui-components/indicators/copy-clipboard/copy-clipboard.component.ts index 25f0d42b..e7c1a735 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/copy-clipboard/copy-clipboard.component.ts +++ b/src/app/webapp-common/shared/ui-components/indicators/copy-clipboard/copy-clipboard.component.ts @@ -7,18 +7,17 @@ import {MatButton} from '@angular/material/button'; import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-copy-clipboard', - templateUrl: './copy-clipboard.component.html', - styleUrls: ['./copy-clipboard.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - TooltipDirective, - ClipboardModule, - ClickStopPropagationDirective, - MatIcon, - MatButton - ], - standalone: true + selector: 'sm-copy-clipboard', + templateUrl: './copy-clipboard.component.html', + styleUrls: ['./copy-clipboard.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + TooltipDirective, + ClipboardModule, + ClickStopPropagationDirective, + MatIcon, + MatButton + ] }) export class CopyClipboardComponent { diff --git a/src/app/webapp-common/shared/ui-components/indicators/divider/divider.component.scss b/src/app/webapp-common/shared/ui-components/indicators/divider/divider.component.scss index 271f64ea..6b0b8b69 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/divider/divider.component.scss +++ b/src/app/webapp-common/shared/ui-components/indicators/divider/divider.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { --width: 1px; --margin: 5px; diff --git a/src/app/webapp-common/shared/ui-components/indicators/dots-load-more/dots-load-more.component.html b/src/app/webapp-common/shared/ui-components/indicators/dots-load-more/dots-load-more.component.html index 4abfc5e7..496a6b15 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/dots-load-more/dots-load-more.component.html +++ b/src/app/webapp-common/shared/ui-components/indicators/dots-load-more/dots-load-more.component.html @@ -1,3 +1,7 @@ -
+@defer (on viewport) { +
+} @placeholder { +
+} diff --git a/src/app/webapp-common/shared/ui-components/indicators/dots-load-more/dots-load-more.component.scss b/src/app/webapp-common/shared/ui-components/indicators/dots-load-more/dots-load-more.component.scss index 89e02963..886a3a30 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/dots-load-more/dots-load-more.component.scss +++ b/src/app/webapp-common/shared/ui-components/indicators/dots-load-more/dots-load-more.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - $dot-size: 8px; :host { diff --git a/src/app/webapp-common/shared/ui-components/indicators/dots-load-more/dots-load-more.component.ts b/src/app/webapp-common/shared/ui-components/indicators/dots-load-more/dots-load-more.component.ts index a2437041..95a5c4e8 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/dots-load-more/dots-load-more.component.ts +++ b/src/app/webapp-common/shared/ui-components/indicators/dots-load-more/dots-load-more.component.ts @@ -2,14 +2,13 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@ import {ScrollEndDirective} from '@common/shared/ui-components/directives/scroll-end.directive'; @Component({ - selector: 'sm-dots-load-more', - standalone: true, - imports: [ - ScrollEndDirective - ], - templateUrl: './dots-load-more.component.html', - styleUrl: './dots-load-more.component.scss', - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-dots-load-more', + imports: [ + ScrollEndDirective + ], + templateUrl: './dots-load-more.component.html', + styleUrl: './dots-load-more.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush }) export class DotsLoadMoreComponent { @Input() loading: boolean; diff --git a/src/app/webapp-common/shared/ui-components/indicators/number-counter/number-counter.component.scss b/src/app/webapp-common/shared/ui-components/indicators/number-counter/number-counter.component.scss index 25c2d8a7..f980a00f 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/number-counter/number-counter.component.scss +++ b/src/app/webapp-common/shared/ui-components/indicators/number-counter/number-counter.component.scss @@ -1,14 +1,13 @@ -@import "mixins/common"; -@import "variables"; +@use "mixins/common"; $reqWidth: 56px; .number-counter-container { text-align: center; .number-counter { - @include counter-title(); + @include common.counter-title(); } .number-counter-label { - @include counter-label(); + @include common.counter-label(); } } diff --git a/src/app/webapp-common/shared/ui-components/indicators/snippet-error/snippet-error.component.ts b/src/app/webapp-common/shared/ui-components/indicators/snippet-error/snippet-error.component.ts index f4608076..64b4b083 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/snippet-error/snippet-error.component.ts +++ b/src/app/webapp-common/shared/ui-components/indicators/snippet-error/snippet-error.component.ts @@ -9,16 +9,14 @@ import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indic import {MESSAGES_SEVERITY} from '@common/constants'; @Component({ - selector: 'sm-snippet-error', - templateUrl: './snippet-error.component.html', - styleUrls: ['./snippet-error.component.scss'], - imports: [ - ClipboardModule, - TooltipDirective, - ShowTooltipIfEllipsisDirective -], - standalone: true - // Can't onPush - too many calc in template + selector: 'sm-snippet-error', + templateUrl: './snippet-error.component.html', + styleUrls: ['./snippet-error.component.scss'], + imports: [ + ClipboardModule, + TooltipDirective, + ShowTooltipIfEllipsisDirective + ] }) export class SnippetErrorComponent { private _copyContent: string; diff --git a/src/app/webapp-common/shared/ui-components/indicators/tag/tag.component.scss b/src/app/webapp-common/shared/ui-components/indicators/tag/tag.component.scss index 010585ac..1331deed 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/tag/tag.component.scss +++ b/src/app/webapp-common/shared/ui-components/indicators/tag/tag.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { min-height: 23px; } diff --git a/src/app/webapp-common/shared/ui-components/inputs/button-toggle/button-toggle.component.html b/src/app/webapp-common/shared/ui-components/inputs/button-toggle/button-toggle.component.html index 52f62835..184ec50a 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/button-toggle/button-toggle.component.html +++ b/src/app/webapp-common/shared/ui-components/inputs/button-toggle/button-toggle.component.html @@ -2,25 +2,26 @@ [formControl]="formControl" [hideSingleSelectionIndicator]="true" [vertical]="vertical()" + (change)="$event.value !== undefined && valueChanged.emit($event.value)" name="fontStyle" aria-label="Font Style"> @for (option of options(); track option.value) { - + - @if (option.icon) { - - } @else { - {{option.label}} - } - + @if (option.icon) { + + } @else { + {{ option.label }} + } + +
} diff --git a/src/app/webapp-common/shared/ui-components/inputs/button-toggle/button-toggle.component.scss b/src/app/webapp-common/shared/ui-components/inputs/button-toggle/button-toggle.component.scss index 7ff26556..61b9094a 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/button-toggle/button-toggle.component.scss +++ b/src/app/webapp-common/shared/ui-components/inputs/button-toggle/button-toggle.component.scss @@ -1,10 +1,15 @@ :host { --mat-standard-button-toggle-height: 34px; - --mat-standard-button-toggle-label-text-line-height: 32px; + --mat-standard-button-toggle-label-text-line-height: 34px; .label { - font-size: 12px; - font-weight: 500; - text-transform: uppercase; + // font-size: 12px; + // font-weight: 500; + // text-transform: uppercase; + display: block; + } + + mat-button-toggle { + display: block; } } diff --git a/src/app/webapp-common/shared/ui-components/inputs/button-toggle/button-toggle.component.ts b/src/app/webapp-common/shared/ui-components/inputs/button-toggle/button-toggle.component.ts index 5ad11838..9d3e4228 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/button-toggle/button-toggle.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/button-toggle/button-toggle.component.ts @@ -16,20 +16,19 @@ export interface Option { @Component({ - selector: 'sm-button-toggle', - templateUrl: './button-toggle.component.html', - styleUrls: ['./button-toggle.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - MatButtonToggleModule, - TooltipDirective, - ReactiveFormsModule, - AppendComponentOnTopElementDirective, - MatIcon - ] + selector: 'sm-button-toggle', + templateUrl: './button-toggle.component.html', + styleUrls: ['./button-toggle.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatButtonToggleModule, + TooltipDirective, + ReactiveFormsModule, + AppendComponentOnTopElementDirective, + MatIcon + ] }) -export class ButtonToggleComponent { +export class ButtonToggleComponent { public rippleComponent = RippleButtonComponent; public formControl = new FormControl(); @@ -43,7 +42,7 @@ export class ButtonToggleComponent { constructor() { effect(() => { - this.formControl.setValue(this.value()); + this.formControl.patchValue(this.value(), {emitEvent: false}); }); } } diff --git a/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.html b/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.html index 54c166be..c6e14e63 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.html +++ b/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.html @@ -1,7 +1,7 @@
+ [style.top.px]="state()?.props?.top" + [style.left.px]="state()?.props?.left"> @if (props()) {
({ - props: this.props(), + props: { + ...this.props(), + left: this.props()?.left + colorPickerWidth >= (window.innerWidth || document.documentElement.clientWidth) ? + Math.max(this.props()?.left - colorPickerWidth, 15) : this.props()?.left, + top: this.props()?.top + colorPickerHeight >= (window.innerHeight || document.documentElement.clientHeight) ? + Math.max(this.props()?.top - colorPickerHeight, 15) : this.props()?.top, + }, picker: this.picker(), color: signal(this.props()?.defaultColor) })); @@ -76,9 +83,10 @@ export class ColorPickerWrapperComponent { this.store.dispatch(closeColorPicker()); this.picker().closeDialog(); } + selectColor() { const {r, g, b, a} = new TinyColor(this.state().color()).toRgb(); - const color = [r, g, b, (this.state().props.alpha && a === 1) ? 0.99999: a]; + const color = [r, g, b, (this.state().props.alpha && a === 1) ? 0.99999 : a]; this.colorHashService.setColorForString(this.props().cacheKey, color, true, this.state().props.alpha); this.closeColorPicker(); } diff --git a/src/app/webapp-common/shared/ui-components/inputs/duraion-input-list/duration-input-list.component.ts b/src/app/webapp-common/shared/ui-components/inputs/duraion-input-list/duration-input-list.component.ts index 224f097b..f9524447 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/duraion-input-list/duration-input-list.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/duraion-input-list/duration-input-list.component.ts @@ -65,23 +65,23 @@ export function durationInputFactory(values: (DURATION_INPUT_TYPE | DurationInpu } @Component({ - selector: 'sm-duration-input-list', - templateUrl: './duration-input-list.component.html', - styleUrls: ['./duration-input-list.component.scss'], - providers: [ - { - provide: NG_VALUE_ACCESSOR, - useExisting: forwardRef(() => DurationInputListComponent), - multi: true - }], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - TooltipDirective, - FormsModule, - MatInputModule, - KeydownStopPropagationDirective -] + selector: 'sm-duration-input-list', + templateUrl: './duration-input-list.component.html', + styleUrls: ['./duration-input-list.component.scss'], + providers: [ + { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => DurationInputListComponent), + multi: true + } + ], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + TooltipDirective, + FormsModule, + MatInputModule, + KeydownStopPropagationDirective + ] }) export class DurationInputListComponent extends DurationInputBase implements OnChanges { @ViewChildren('inputRef') private elReference: QueryList; diff --git a/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.scss b/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.scss index 78634a1e..941d9df7 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.scss +++ b/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.scss @@ -15,7 +15,7 @@ margin: auto; .inputs-container { - background: black; + background: var(--color-surface-container-high); padding: 0 12px; border-radius: 4px; position: relative; diff --git a/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.ts b/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.ts index 21bf98e0..b938738a 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.ts @@ -3,20 +3,20 @@ import {TemplateFormSectionBaseDirective} from '../../template-forms-ui/template import {FormsModule, NG_VALUE_ACCESSOR} from '@angular/forms'; @Component({ - selector: 'sm-duration-input', - templateUrl: './duration-input.component.html', - styleUrls: ['./duration-input.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - FormsModule - ], - providers: [ - { - provide: NG_VALUE_ACCESSOR, - useExisting: forwardRef(() => DurationInputComponent), - multi: true - }] + selector: 'sm-duration-input', + templateUrl: './duration-input.component.html', + styleUrls: ['./duration-input.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + FormsModule + ], + providers: [ + { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => DurationInputComponent), + multi: true + } + ] }) export class DurationInputComponent extends TemplateFormSectionBaseDirective { public ms = '0'; diff --git a/src/app/webapp-common/shared/ui-components/inputs/inline-edit/inline-edit.component.scss b/src/app/webapp-common/shared/ui-components/inputs/inline-edit/inline-edit.component.scss index 70cb895c..de1fb323 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/inline-edit/inline-edit.component.scss +++ b/src/app/webapp-common/shared/ui-components/inputs/inline-edit/inline-edit.component.scss @@ -1,8 +1,4 @@ -@import "variables"; - -$inline-edit-base-width: 93%; - - +@use "variables"; :host { --mdc-icon-button-icon-size: 20px; @@ -17,7 +13,6 @@ $inline-edit-base-width: 93%; position: relative; display: flex; flex-direction: row; - flex-direction: row; align-items: center; gap: 12px; @@ -68,12 +63,10 @@ $inline-edit-base-width: 93%; .inline-edit-input { // width: 100%; padding: 2px 6px; - background: transparent; - border: none; color: var(--color-on-surface); background-color: var(--color-surface-container-lowest); border: 1px solid color-mix(in srgb, var(--color-outline) 20%, transparent); - font-family: $font-family-base, sans-serif; + font-family: variables.$font-family-base, sans-serif; font-size: 14px; font-weight: 500; border-radius: 4px; @@ -89,7 +82,7 @@ $inline-edit-base-width: 93%; border: 1px solid var(--color-outline-variant); border-radius: 4px; color: var(--color-on-surface); - font-family: $font-family-base, sans-serif; + font-family: variables.$font-family-base, sans-serif; font-size: 14px; padding: 12px; resize: vertical; diff --git a/src/app/webapp-common/shared/ui-components/inputs/inline-edit/inline-edit.component.ts b/src/app/webapp-common/shared/ui-components/inputs/inline-edit/inline-edit.component.ts index 3d698041..90b71e39 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/inline-edit/inline-edit.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/inline-edit/inline-edit.component.ts @@ -10,19 +10,18 @@ import {MatIcon} from '@angular/material/icon'; import {MatIconButton} from '@angular/material/button'; @Component({ - selector: 'sm-inline-edit', - templateUrl: './inline-edit.component.html', - styleUrls: ['./inline-edit.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - FormsModule, - UniqueNameValidatorDirective, - TooltipDirective, - ClickStopPropagationDirective, - MatIcon, - MatIconButton, - ] + selector: 'sm-inline-edit', + templateUrl: './inline-edit.component.html', + styleUrls: ['./inline-edit.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + FormsModule, + UniqueNameValidatorDirective, + TooltipDirective, + ClickStopPropagationDirective, + MatIcon, + MatIconButton, + ] }) export class InlineEditComponent implements OnDestroy { public readonly cancelButton = 'CANCEL_BUTTON'; @@ -54,7 +53,7 @@ export class InlineEditComponent implements OnDestroy { @Output() inlineActiveStateChanged = new EventEmitter(); @Output() textChanged = new EventEmitter(); @Output() inlineFocusOutEvent = new EventEmitter(); - @Output() cancel = new EventEmitter(); + @Output() cancelEdit = new EventEmitter(); @Output() cancelClick = new EventEmitter(); @ViewChild('inlineInput') inlineInput: NgModel; @ViewChild('inlineInput', { read: ElementRef }) inlineInputRef: ElementRef; @@ -63,7 +62,7 @@ export class InlineEditComponent implements OnDestroy { @HostListener('document:click', []) clickOut() { - if (this.active) { + if (this.active && !this.multiline) { this.inlineCanceled(); } } @@ -75,18 +74,21 @@ export class InlineEditComponent implements OnDestroy { this.inlineValue = this.originalText; this.active = false; this.inlineActiveStateChanged.emit(false); - this.cancel.emit(); + this.cancelEdit.emit(); this.cdr.detectChanges(); } public inlineSaved() { this.inlineValue = this.inlineInput.value; - if (this.inlineValue != this.originalText) { + if (this.inlineValue !== this.originalText) { this.textChanged.emit(this.inlineValue); + this.active = false; + this.inlineActiveStateChanged.emit(false); + this.cdr.detectChanges(); + } else { + this.inlineCanceled(); } - this.active = false; - this.inlineActiveStateChanged.emit(false); - this.cdr.detectChanges(); + } public inlineActivated(event?: Event) { diff --git a/src/app/webapp-common/shared/ui-components/inputs/search/search.component.html b/src/app/webapp-common/shared/ui-components/inputs/search/search.component.html index 0b6f979d..c70151c3 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/search/search.component.html +++ b/src/app/webapp-common/shared/ui-components/inputs/search/search.component.html @@ -25,11 +25,11 @@ } @else { @if (searchBar.value.length === 0) { - } @else { - } diff --git a/src/app/webapp-common/shared/ui-components/inputs/search/search.component.scss b/src/app/webapp-common/shared/ui-components/inputs/search/search.component.scss index 2ea0deb8..aa033abb 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/search/search.component.scss +++ b/src/app/webapp-common/shared/ui-components/inputs/search/search.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - $search-font-size: 14px; :host { @@ -10,7 +8,7 @@ $search-font-size: 14px; display: flex; align-items: center; min-width: 32px; - width: 32px; + width: 36px; overflow: hidden; transition: width 0.4s ease; border-radius: 4px 4px 0 0; @@ -46,6 +44,7 @@ $search-font-size: 14px; border: none; background: none; color: var(--color-on-surface); + line-height: 32px; &.active { display: flex; @@ -98,6 +97,7 @@ $search-font-size: 14px; .match { flex-grow: 1; display: flex; + white-space: nowrap; justify-content: center; user-select: none; padding: 0 12px; @@ -110,39 +110,30 @@ $search-font-size: 14px; display: block; min-width: 36px; height: 36px; - border: 1px solid var(--color-outline-variant); + border: 1px solid var(--color-outline); + &.regex-error{ + border-color: var(--color-error) !important; + } border-radius: 18px; --mdc-icon-button-state-layer-size: 34px; background-color: var(--color-surface-container-lowest); -} - -:host.search-header { - .search-input-container { - &.active { - width: 284px; - } - - .search-input { - border-radius: 4px 4px 0 0; - - input { - background-color: var(--color-surface-container-high); - border-bottom: 2px solid; - border-color: var(--color-primary); - font-weight: 400; - padding-right: 40px; - height: 36px; - } - } + .search-input-container .search-input input { + padding-left: 16px; + padding-right: 54px; } - &.regex-error .search-input-container .search-input input { - padding-right: 74px; - border-color: var(--color-error) !important; +} + +:host.outline.contained-icon { + .search-input-container .search-input input { + padding-left: 18px; + padding-right: 80px; } } + + :host.underline-search { .search-input-container { height: inherit; diff --git a/src/app/webapp-common/shared/ui-components/inputs/search/search.component.ts b/src/app/webapp-common/shared/ui-components/inputs/search/search.component.ts index 159fc7b7..74d84450 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/search/search.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/search/search.component.ts @@ -1,31 +1,33 @@ import { ChangeDetectionStrategy, Component, - OnChanges, OnDestroy, - OnInit, SimpleChanges, - ViewChild, input, output, effect, signal + effect, ElementRef, + input, + OnChanges, + OnDestroy, + OnInit, + output, + signal, + SimpleChanges, + viewChild } from '@angular/core'; import {Subject, Subscription, timer} from 'rxjs'; import {debounce, distinctUntilChanged, filter, tap} from 'rxjs/operators'; -import {NgTemplateOutlet} from '@angular/common'; import {MatIcon} from '@angular/material/icon'; import {MatIconButton} from '@angular/material/button'; import {HesitateDirective} from '@common/shared/ui-components/directives/hesitate.directive'; - @Component({ - selector: 'sm-search', - templateUrl: './search.component.html', - styleUrls: ['./search.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - NgTemplateOutlet, - MatIcon, - MatIconButton, - HesitateDirective - ] + selector: 'sm-search', + templateUrl: './search.component.html', + styleUrls: ['./search.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatIcon, + MatIconButton, + HesitateDirective + ] }) export class SearchComponent implements OnInit, OnChanges, OnDestroy { @@ -46,11 +48,11 @@ export class SearchComponent implements OnInit, OnChanges, OnDestroy { value = input(''); valueChanged = output(); - @ViewChild('searchBar', {static: true}) searchBarInput; + searchBarInput = viewChild('searchBar'); constructor() { effect(() => { - this.searchBarInput.nativeElement.value = this.value() || ''; + this.searchBarInput().nativeElement.value = this.value() || ''; }); } @@ -82,21 +84,21 @@ export class SearchComponent implements OnInit, OnChanges, OnDestroy { this.clear(); } else if (event.key === 'Enter' && (!this.enableNavigation() || (this.searchCounterIndex() + 1 < this.searchResultsCount())) && - this.searchBarInput.nativeElement.value.length > 0 + this.searchBarInput().nativeElement.value.length > 0 ) { - this.valueChanged.emit(this.searchBarInput.nativeElement.value); + this.valueChanged.emit(this.searchBarInput().nativeElement.value); } } onValueChange() { - this.value$.next(this.searchBarInput.nativeElement.value); + this.value$.next(this.searchBarInput().nativeElement.value); } clear(focus = true) { this.value$.next(''); - this.searchBarInput.nativeElement.value = ''; + this.searchBarInput().nativeElement.value = ''; if (focus) { - this.searchBarInput.nativeElement.focus(); + this.searchBarInput().nativeElement.focus(); } } @@ -104,7 +106,7 @@ export class SearchComponent implements OnInit, OnChanges, OnDestroy { if (this.expandOnHover()) { if (this.empty()) { this.active = active; - this.searchBarInput.nativeElement.focus(); + this.searchBarInput().nativeElement.focus(); } else { this.active = true; } @@ -112,7 +114,7 @@ export class SearchComponent implements OnInit, OnChanges, OnDestroy { } findNext(backward?: boolean) { - this.valueChanged.emit(backward ? null : this.searchBarInput.nativeElement.value); + this.valueChanged.emit(backward ? null : this.searchBarInput().nativeElement.value); } ngOnChanges(changes: SimpleChanges): void { @@ -126,6 +128,6 @@ export class SearchComponent implements OnInit, OnChanges, OnDestroy { } getFocus() { - this.searchBarInput.nativeElement.focus(); + this.searchBarInput().nativeElement.focus(); } } diff --git a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.scss b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.scss index b85e44e6..784b217a 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.scss +++ b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { width: 100%; height: 100%; diff --git a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.ts b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.ts index 1ed906e0..474a7dca 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.ts @@ -27,28 +27,27 @@ export interface IOption { } @Component({ - selector: 'sm-select-autocomplete-for-template-forms', - templateUrl: './select-autocomplete-for-template-forms.component.html', - styleUrls: ['./select-autocomplete-for-template-forms.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - MatInputModule, - MatAutocompleteModule, - ReactiveFormsModule -], - providers: [ - { - provide: NG_VALUE_ACCESSOR, - useExisting: forwardRef(() => SelectAutocompleteForTemplateFormsComponent), - multi: true - }, - { - provide: NG_VALIDATORS, - useExisting: forwardRef(() => SelectAutocompleteForTemplateFormsComponent), - multi: true - } - ] + selector: 'sm-select-autocomplete-for-template-forms', + templateUrl: './select-autocomplete-for-template-forms.component.html', + styleUrls: ['./select-autocomplete-for-template-forms.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatInputModule, + MatAutocompleteModule, + ReactiveFormsModule + ], + providers: [ + { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => SelectAutocompleteForTemplateFormsComponent), + multi: true + }, + { + provide: NG_VALIDATORS, + useExisting: forwardRef(() => SelectAutocompleteForTemplateFormsComponent), + multi: true + } + ] }) export class SelectAutocompleteForTemplateFormsComponent implements ControlValueAccessor, Validator { diff --git a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.ts b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.ts index 984bb3c2..fa899167 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.ts @@ -31,19 +31,19 @@ export interface IOption { } @Component({ - selector: 'sm-select-autocomplete-with-chips', - templateUrl: './select-autocomplete-with-chips.component.html', - styleUrls: ['./select-autocomplete-with-chips.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - providers: [ - { - provide: NG_VALUE_ACCESSOR, - useExisting: forwardRef(() => SelectAutocompleteWithChipsComponent), - multi: true - }], - standalone: true, - imports: [ClickStopPropagationDirective, ChipsComponent, ReactiveFormsModule, MatChipGrid, - MatChipInput, MatAutocompleteTrigger, MatAutocomplete, MatOption, MatFormField, MatSuffix] + selector: 'sm-select-autocomplete-with-chips', + templateUrl: './select-autocomplete-with-chips.component.html', + styleUrls: ['./select-autocomplete-with-chips.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + providers: [ + { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => SelectAutocompleteWithChipsComponent), + multi: true + } + ], + imports: [ClickStopPropagationDirective, ChipsComponent, ReactiveFormsModule, MatChipGrid, + MatChipInput, MatAutocompleteTrigger, MatAutocomplete, MatOption, MatFormField, MatSuffix] }) export class SelectAutocompleteWithChipsComponent implements ControlValueAccessor { @@ -215,9 +215,10 @@ export class SelectAutocompleteWithChipsComponent implements ControlValueAccesso writeValue(val: IOption[] | IOption) { if (val) { + this.init = false; this.selected.set(Array.isArray(val) ? val : [val]); } - window.setTimeout(() => this.init = true); + window.setTimeout(() => this.init = true, 50); } registerOnChange(fn: () => void) { diff --git a/src/app/webapp-common/shared/ui-components/overlay/alert-dialog/alert-dialog.component.scss b/src/app/webapp-common/shared/ui-components/overlay/alert-dialog/alert-dialog.component.scss index 10f4d0e5..ef8145eb 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/alert-dialog/alert-dialog.component.scss +++ b/src/app/webapp-common/shared/ui-components/overlay/alert-dialog/alert-dialog.component.scss @@ -1,4 +1,5 @@ -@import "variables"; +@use "variables"; + :host { --dialog-icon-color: var(--color-warning); } @@ -9,7 +10,7 @@ padding: 0; min-width: 400px; max-width: 500px; - font-family: $font-family-monospace; + font-family: variables.$font-family-monospace; font-size: 12px; border: none; overflow: hidden; diff --git a/src/app/webapp-common/shared/ui-components/overlay/alert-dialog/alert-dialog.component.ts b/src/app/webapp-common/shared/ui-components/overlay/alert-dialog/alert-dialog.component.ts index e64b17a7..eb0e5562 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/alert-dialog/alert-dialog.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/alert-dialog/alert-dialog.component.ts @@ -7,16 +7,15 @@ import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-alert-dialog', - templateUrl: './alert-dialog.component.html', - styleUrls: ['./alert-dialog.component.scss'], - standalone: true, - imports: [ - DialogTemplateComponent, - MatDialogModule, - MatButton, - MatIcon - ] + selector: 'sm-alert-dialog', + templateUrl: './alert-dialog.component.html', + styleUrls: ['./alert-dialog.component.scss'], + imports: [ + DialogTemplateComponent, + MatDialogModule, + MatButton, + MatIcon + ] }) export class AlertDialogComponent { diff --git a/src/app/webapp-common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component.ts b/src/app/webapp-common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component.ts index b5357189..a32f9de5 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component.ts @@ -9,18 +9,17 @@ import { NgTemplateOutlet } from '@angular/common'; import {MatButton} from '@angular/material/button'; @Component({ - selector: 'sm-confirm-dialog', - templateUrl: './confirm-dialog.component.html', - styleUrls: ['./confirm-dialog.component.scss'], - standalone: true, - imports: [ - DialogTemplateComponent, - MatCheckboxModule, - FormsModule, - NgTemplateOutlet, - SaferPipe, - MatButton - ] + selector: 'sm-confirm-dialog', + templateUrl: './confirm-dialog.component.html', + styleUrls: ['./confirm-dialog.component.scss'], + imports: [ + DialogTemplateComponent, + MatCheckboxModule, + FormsModule, + NgTemplateOutlet, + SaferPipe, + MatButton + ] }) export class ConfirmDialogComponent { protected data = inject(MAT_DIALOG_DATA); diff --git a/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.ts b/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.ts index 07066391..0246b0f5 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.ts @@ -6,16 +6,15 @@ import {MatIcon} from '@angular/material/icon'; import {MatIconButton} from '@angular/material/button'; @Component({ - selector: 'sm-dialog-template', - templateUrl: './dialog-template.component.html', - styleUrls: ['./dialog-template.component.scss'], - imports: [ - CdkScrollableModule, - SaferPipe, - MatIcon, - MatIconButton - ], - standalone: true + selector: 'sm-dialog-template', + templateUrl: './dialog-template.component.html', + styleUrls: ['./dialog-template.component.scss'], + imports: [ + CdkScrollableModule, + SaferPipe, + MatIcon, + MatIconButton + ] }) export class DialogTemplateComponent { private dialog = inject>(MatDialogRef); diff --git a/src/app/webapp-common/shared/ui-components/overlay/edit-credential-label-dialog/edit-credential-label-dialog.component.ts b/src/app/webapp-common/shared/ui-components/overlay/edit-credential-label-dialog/edit-credential-label-dialog.component.ts index 2aaa1198..2ddac580 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/edit-credential-label-dialog/edit-credential-label-dialog.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/edit-credential-label-dialog/edit-credential-label-dialog.component.ts @@ -5,16 +5,15 @@ import {MatInputModule} from '@angular/material/input'; import {FormsModule} from '@angular/forms'; @Component({ - selector: 'sm-edit-credential-label-dialog', - templateUrl: './edit-credential-label-dialog.component.html', - styleUrls: ['./edit-credential-label-dialog.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - ConfirmDialogComponent, - MatInputModule, - FormsModule - ] + selector: 'sm-edit-credential-label-dialog', + templateUrl: './edit-credential-label-dialog.component.html', + styleUrls: ['./edit-credential-label-dialog.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + ConfirmDialogComponent, + MatInputModule, + FormsModule + ] }) export class EditCredentialLabelDialogComponent implements AfterViewInit { diff --git a/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.html b/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.html index ad6e8d26..e72cefd6 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.html +++ b/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.html @@ -1,4 +1,4 @@ - +
@if (!readOnly) { - + }
diff --git a/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.scss b/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.scss index 2695b550..e2e7dbfa 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.scss +++ b/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.scss @@ -37,5 +37,9 @@ } } +.sub-title { + margin-left: -32px; + margin-bottom: 12px; +} diff --git a/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.ts b/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.ts index d2996f6e..ec2513a6 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.ts @@ -13,22 +13,22 @@ export interface EditJsonData { textData?: string | object; readOnly?: boolean; title: string; + subtitle?: string; format?: 'json' | 'yaml' | 'hocon'; placeHolder?: string; reorder?: boolean; } @Component({ - selector: 'sm-edit-json', - templateUrl: './edit-json.component.html', - styleUrls: ['./edit-json.component.scss'], - providers: [{provide: JsonPipe, useClass: JsonPipe}], - standalone: true, - imports: [ - DialogTemplateComponent, - MatButton, - CodeEditorComponent - ] + selector: 'sm-edit-json', + templateUrl: './edit-json.component.html', + styleUrls: ['./edit-json.component.scss'], + providers: [{ provide: JsonPipe, useClass: JsonPipe }], + imports: [ + DialogTemplateComponent, + MatButton, + CodeEditorComponent + ] }) export class EditJsonComponent { protected data = inject(MAT_DIALOG_DATA); @@ -42,13 +42,14 @@ export class EditJsonComponent { private _readOnly: boolean; protected placeHolder: string; protected title: string; + protected subtitle: string; protected readonly typeJson: boolean; private readonly format?: 'json' | 'yaml' | 'hocon'; protected mode: string; protected editor = viewChild(CodeEditorComponent); protected aceCaretPosition = this.store.selectSignal(selectAceCaretPosition); - protected position = computed(() => this.aceCaretPosition?.[this.title] ?? null) + protected position = computed(() => this.aceCaretPosition()?.[this.title] ?? null) set readOnly(readOnly: boolean) { this._readOnly = readOnly; @@ -93,6 +94,7 @@ export class EditJsonComponent { } this.readOnly = this.data.readOnly; this.title = this.data.title; + this.subtitle = this.data.subtitle; switch (this.format) { case 'hocon': @@ -114,6 +116,7 @@ export class EditJsonComponent { if (isConfirmed) { try { const text = this.editor().aceCode; + this.textData = text; this.dialogRef.close(text ? (this.typeJson ? JSON.parse(text) : text) : ''); } catch { this.store.dispatch(addMessage('warn', 'Not a valid JSON')); diff --git a/src/app/webapp-common/shared/ui-components/overlay/leaf/leaf.component.scss b/src/app/webapp-common/shared/ui-components/overlay/leaf/leaf.component.scss index 2b83c869..96402e2f 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/leaf/leaf.component.scss +++ b/src/app/webapp-common/shared/ui-components/overlay/leaf/leaf.component.scss @@ -1,7 +1,7 @@ -@import "mixins/wizard-template"; +@use "mixins/wizard-template"; .choose-container { - @include choose-leaf; + @include wizard-template.choose-leaf; padding: 0 24px; } diff --git a/src/app/webapp-common/shared/ui-components/overlay/operation-error-dialog/operation-error-dialog.component.ts b/src/app/webapp-common/shared/ui-components/overlay/operation-error-dialog/operation-error-dialog.component.ts index 9150c610..93c64a7a 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/operation-error-dialog/operation-error-dialog.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/operation-error-dialog/operation-error-dialog.component.ts @@ -7,16 +7,15 @@ import {MatButton} from '@angular/material/button'; @Component({ - selector: 'sm-operation-error-dialog', - templateUrl: './operation-error-dialog.component.html', - styleUrls: ['./operation-error-dialog.component.scss'], - standalone: true, - imports: [ - DialogTemplateComponent, - MatDialogActions, - MatButton, - MatDialogClose - ] + selector: 'sm-operation-error-dialog', + templateUrl: './operation-error-dialog.component.html', + styleUrls: ['./operation-error-dialog.component.scss'], + imports: [ + DialogTemplateComponent, + MatDialogActions, + MatButton, + MatDialogClose + ] }) export class OperationErrorDialogComponent { public data = inject<{ diff --git a/src/app/webapp-common/shared/ui-components/overlay/overlay/overlay.component.ts b/src/app/webapp-common/shared/ui-components/overlay/overlay/overlay.component.ts index 9151b160..860ef824 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/overlay/overlay.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/overlay/overlay.component.ts @@ -2,13 +2,12 @@ import {Component, input} from '@angular/core'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; @Component({ - selector: 'sm-overlay', - templateUrl: './overlay.component.html', - styleUrls: ['./overlay.component.scss'], - standalone: true, - imports: [ - ClickStopPropagationDirective - ] + selector: 'sm-overlay', + templateUrl: './overlay.component.html', + styleUrls: ['./overlay.component.scss'], + imports: [ + ClickStopPropagationDirective + ] }) export class OverlayComponent { backdropActive = input(); diff --git a/src/app/webapp-common/shared/ui-components/overlay/share-dialog/share-dialog.component.scss b/src/app/webapp-common/shared/ui-components/overlay/share-dialog/share-dialog.component.scss index 3da95821..89511f5a 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/share-dialog/share-dialog.component.scss +++ b/src/app/webapp-common/shared/ui-components/overlay/share-dialog/share-dialog.component.scss @@ -1,10 +1,9 @@ -@import 'variables'; -@import "mixins/link"; +@use "mixins/link"; :host { width: 570px; - @include link(); + @include link.link(); .sub-title { max-width: 500px; diff --git a/src/app/webapp-common/shared/ui-components/overlay/share-dialog/share-dialog.component.ts b/src/app/webapp-common/shared/ui-components/overlay/share-dialog/share-dialog.component.ts index 5b716b72..2b7dd220 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/share-dialog/share-dialog.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/share-dialog/share-dialog.component.ts @@ -14,19 +14,18 @@ import {MatButton} from '@angular/material/button'; @Component({ - selector: 'sm-share-dialog', - templateUrl: './share-dialog.component.html', - styleUrls: ['./share-dialog.component.scss'], - standalone: true, - imports: [ - DialogTemplateComponent, - ClipboardModule, - ClickStopPropagationDirective, - SaferPipe, - MatIcon, - MatButton, - MatDialogActions - ] + selector: 'sm-share-dialog', + templateUrl: './share-dialog.component.html', + styleUrls: ['./share-dialog.component.scss'], + imports: [ + DialogTemplateComponent, + ClipboardModule, + ClickStopPropagationDirective, + SaferPipe, + MatIcon, + MatButton, + MatDialogActions + ] }) export class ShareDialogComponent { diff --git a/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.scss b/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.scss index 4daf87ba..d666c469 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.scss +++ b/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.scss @@ -1,4 +1,4 @@ -@import "variables"; +@use "variables"; .loader-container { position: fixed; @@ -7,6 +7,6 @@ align-items: center; z-index: 9999999; top: 50%; - left: calc(50% + #{$side-bar-close-width * 0.5}); + left: calc(50% + #{variables.$side-bar-close-width * 0.5}); transform: translate(-50%); } diff --git a/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.ts b/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.ts index 5008103b..c86a3f16 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.ts @@ -1,62 +1,42 @@ +import {PushPipe} from '@ngrx/component'; import {Store} from '@ngrx/store'; -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit} from '@angular/core'; -import {selectLoading} from '@common/core/reducers/view.reducer'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; +import {selectIsLoading} from '@common/core/reducers/view.reducer'; import {NavigationStart, Router} from '@angular/router'; -import {debounceTime, distinctUntilChanged, filter, map} from 'rxjs/operators'; +import {debounce, distinctUntilChanged, filter, map} from 'rxjs/operators'; import {resetLoader} from '@common/core/actions/layout.actions'; -import {Observable, Subscription} from 'rxjs'; -import {isEqual} from 'lodash-es'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; +import {interval} from 'rxjs'; @Component({ - selector: 'sm-spinner', - template: ` - @if (showSpinner) { + selector: 'sm-spinner', + template: ` + @if (loading$ | ngrxPush) {
} `, - styleUrls: ['./spinner.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, + styleUrls: ['./spinner.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, imports: [ - MatProgressSpinnerModule -] + MatProgressSpinnerModule, + PushPipe + ] }) -export class SpinnerComponent implements OnInit, OnDestroy { - public showSpinner: boolean; - private spinnerSubscribe: Subscription; - private navEndSubscription: Subscription; - private loading$: Observable<{ [p: string]: boolean }>; +export class SpinnerComponent { + protected loading$ = this.store.select(selectIsLoading) + .pipe(debounce(loading => interval((loading ? 0 : 200)))); - constructor(private store: Store, private router: Router, private cdr: ChangeDetectorRef) { - this.loading$ = store.select(selectLoading); - - } - - ngOnInit() { - this.spinnerSubscribe = this.loading$.pipe( - debounceTime(300), - distinctUntilChanged(isEqual) - ).subscribe(loaders => { - this.showSpinner = Object.values(loaders).some((value) => value); - this.cdr.detectChanges(); - }); - - this.navEndSubscription = this.router.events + constructor(private store: Store, private router: Router) { + this.router.events .pipe( filter(event => event instanceof NavigationStart), map((event: NavigationStart) => event.url.split('?')[0]), distinctUntilChanged() ).subscribe(() => { - this.store.dispatch(resetLoader()); - }); - } - - ngOnDestroy(): void { - this.navEndSubscription.unsubscribe(); - this.spinnerSubscribe.unsubscribe(); + this.store.dispatch(resetLoader()); + }); } } diff --git a/src/app/webapp-common/shared/ui-components/overlay/update-notifier/update-notifier.component.ts b/src/app/webapp-common/shared/ui-components/overlay/update-notifier/update-notifier.component.ts index ac32dcb2..d323ce7e 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/update-notifier/update-notifier.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/update-notifier/update-notifier.component.ts @@ -5,14 +5,13 @@ import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'sm-update-notifier', - templateUrl: './update-notifier.component.html', - styleUrls: ['./update-notifier.component.scss'], - standalone: true, - imports: [ - MatIconButton, - MatIcon - ] + selector: 'sm-update-notifier', + templateUrl: './update-notifier.component.html', + styleUrls: ['./update-notifier.component.scss'], + imports: [ + MatIconButton, + MatIcon + ] }) export class UpdateNotifierComponent { public active = signal(false); diff --git a/src/app/webapp-common/shared/ui-components/overlay/wizard-dialog-step/wizard-dialog-step.component.scss b/src/app/webapp-common/shared/ui-components/overlay/wizard-dialog-step/wizard-dialog-step.component.scss index 61a08a07..2683190e 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/wizard-dialog-step/wizard-dialog-step.component.scss +++ b/src/app/webapp-common/shared/ui-components/overlay/wizard-dialog-step/wizard-dialog-step.component.scss @@ -1,4 +1,4 @@ -@import "variables"; +@use "variables"; @keyframes hide-step { 0% { @@ -31,10 +31,10 @@ opacity: 1; padding-top: 5vh; padding-bottom: 2vh; - animation: show-step $transition-slow; + animation: show-step variables.$transition-slow; animation-fill-mode: forwards; &.hide-step { - animation: hide-step $transition-slow; + animation: hide-step variables.$transition-slow; animation-fill-mode: forwards; } @@ -58,10 +58,10 @@ font-size: 10vh; font-weight: 900; color: color-mix(in srgb, var(--color-secondary), transparent 50%); - animation: show-step $transition-slow; + animation: show-step variables.$transition-slow; animation-fill-mode: forwards; &.hide-step { - animation: hide-step $transition-slow; + animation: hide-step variables.$transition-slow; animation-fill-mode: forwards; } } @@ -82,7 +82,7 @@ background-size: contain; background-repeat: no-repeat; &.hide-step { - animation: hide-step $transition-slow; + animation: hide-step variables.$transition-slow; animation-fill-mode: forwards; } } @@ -95,7 +95,7 @@ &.hide-step { visibility: visible; - transition-delay: $transition-slow; + transition-delay: variables.$transition-slow; } } @@ -104,7 +104,7 @@ } .step{ &.hide-step{ - transition-delay: $transition-slow; + transition-delay: variables.$transition-slow; } } diff --git a/src/app/webapp-common/shared/ui-components/overlay/wizard-dialog-step/wizard-dialog-step.component.ts b/src/app/webapp-common/shared/ui-components/overlay/wizard-dialog-step/wizard-dialog-step.component.ts index 6c3b6f1e..a72ea88e 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/wizard-dialog-step/wizard-dialog-step.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/wizard-dialog-step/wizard-dialog-step.component.ts @@ -3,13 +3,12 @@ import {Component, input } from '@angular/core'; import {CdkScrollable} from '@angular/cdk/overlay'; @Component({ - selector: 'sm-wizard-dialog-step', - templateUrl: './wizard-dialog-step.component.html', - styleUrls: ['./wizard-dialog-step.component.scss'], - standalone: true, - imports: [ - CdkScrollable -] + selector: 'sm-wizard-dialog-step', + templateUrl: './wizard-dialog-step.component.html', + styleUrls: ['./wizard-dialog-step.component.scss'], + imports: [ + CdkScrollable + ] }) export class WizardDialogStepComponent { icon = input(); diff --git a/src/app/webapp-common/shared/ui-components/panel/card/card.component.scss b/src/app/webapp-common/shared/ui-components/panel/card/card.component.scss index 114628aa..83a92150 100644 --- a/src/app/webapp-common/shared/ui-components/panel/card/card.component.scss +++ b/src/app/webapp-common/shared/ui-components/panel/card/card.component.scss @@ -1,4 +1,4 @@ -@import "variables"; +@use "variables"; .card { border: solid 0; @@ -51,7 +51,7 @@ .card-container { position: relative; - transition: $transition-fast; + transition: variables.$transition-fast; height: 226px; width: 100%; border-radius: 6px; diff --git a/src/app/webapp-common/shared/ui-components/panel/card/card.component.ts b/src/app/webapp-common/shared/ui-components/panel/card/card.component.ts index 4f7b57be..cf00c107 100644 --- a/src/app/webapp-common/shared/ui-components/panel/card/card.component.ts +++ b/src/app/webapp-common/shared/ui-components/panel/card/card.component.ts @@ -3,14 +3,13 @@ import {ChangeDetectionStrategy, Component, signal, input } from '@angular/core' import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; @Component({ - selector: 'sm-card', - templateUrl: './card.component.html', - styleUrls: ['./card.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - ClickStopPropagationDirective -] + selector: 'sm-card', + templateUrl: './card.component.html', + styleUrls: ['./card.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + ClickStopPropagationDirective + ] }) export class CardComponent { diff --git a/src/app/webapp-common/shared/ui-components/panel/card2/card-component2.component.scss b/src/app/webapp-common/shared/ui-components/panel/card2/card-component2.component.scss index 0c4b9035..255a91a5 100644 --- a/src/app/webapp-common/shared/ui-components/panel/card2/card-component2.component.scss +++ b/src/app/webapp-common/shared/ui-components/panel/card2/card-component2.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - .al-card { .card-container { //background-color: var(--color-surface-container-low); diff --git a/src/app/webapp-common/shared/ui-components/panel/card2/card-component2.component.ts b/src/app/webapp-common/shared/ui-components/panel/card2/card-component2.component.ts index 6d3c8248..f8811046 100644 --- a/src/app/webapp-common/shared/ui-components/panel/card2/card-component2.component.ts +++ b/src/app/webapp-common/shared/ui-components/panel/card2/card-component2.component.ts @@ -1,10 +1,11 @@ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; @Component({ - selector : 'sm-card2', - templateUrl : './card-component2.component.html', - styleUrls : ['./card-component2.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-card2', + templateUrl: './card-component2.component.html', + styleUrls: ['./card-component2.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class CardComponent2 { diff --git a/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.scss b/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.scss index 72288baf..86fe0889 100644 --- a/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.scss +++ b/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { width: 100%; @@ -13,6 +11,11 @@ &.empty { height: 100%; } + + .empty-menu { + line-height: 32px; + padding: 0 12px; + } } mat-checkbox { diff --git a/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.ts b/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.ts index f762c29a..9bf968ab 100644 --- a/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.ts +++ b/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.ts @@ -28,18 +28,17 @@ export enum CheckboxState { } @Component({ - selector: 'sm-checkbox-three-state-list', - templateUrl: './checkbox-three-state-list.component.html', - styleUrls: ['./checkbox-three-state-list.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - MatCheckboxModule, - TooltipDirective, - ShowTooltipIfEllipsisDirective, - MatProgressSpinnerModule, - MatMenuModule -] + selector: 'sm-checkbox-three-state-list', + templateUrl: './checkbox-three-state-list.component.html', + styleUrls: ['./checkbox-three-state-list.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatCheckboxModule, + TooltipDirective, + ShowTooltipIfEllipsisDirective, + MatProgressSpinnerModule, + MatMenuModule + ] }) export class CheckboxThreeStateListComponent { @Input() options: { label: string; value: string; tooltip?: string }[]; diff --git a/src/app/webapp-common/shared/ui-components/panel/drawer/drawer.component.scss b/src/app/webapp-common/shared/ui-components/panel/drawer/drawer.component.scss index 351f531e..8703b4d2 100644 --- a/src/app/webapp-common/shared/ui-components/panel/drawer/drawer.component.scss +++ b/src/app/webapp-common/shared/ui-components/panel/drawer/drawer.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { display: block; diff --git a/src/app/webapp-common/shared/ui-components/panel/drawer/drawer.component.ts b/src/app/webapp-common/shared/ui-components/panel/drawer/drawer.component.ts index f467277e..af51dda7 100644 --- a/src/app/webapp-common/shared/ui-components/panel/drawer/drawer.component.ts +++ b/src/app/webapp-common/shared/ui-components/panel/drawer/drawer.component.ts @@ -11,14 +11,13 @@ import { import {MatIcon} from '@angular/material/icon'; @Component({ - selector: 'al-drawer', - templateUrl: './drawer.component.html', - styleUrls: ['./drawer.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - MatIcon - ] + selector: 'al-drawer', + templateUrl: './drawer.component.html', + styleUrls: ['./drawer.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatIcon + ] }) export class DrawerComponent { diff --git a/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.html b/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.html index 6b187539..561f7143 100644 --- a/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.html @@ -3,15 +3,15 @@ [class.dark-theme]="isDarkTheme()" [class]="containerClass()" [class.edit-mode]="inEditMode() && !disableInEditMode()" - [class.disable-edit]="disableEditable()" [class.force]="forceButtons()" (dblclick)="editable() && !disableEditable() && (!inEditMode()) && editModeChanged(true)" - > +>
@if (!disableEditable() && !inEditMode() && editable() && !hideEditButton()) { + >EDIT + } @if (!disableEditable() && !inEditMode() && editable()) { @@ -20,16 +20,16 @@
@if (inEditMode() && !disableInEditMode()) { -
+
@if (!hideSaveButton()) { - + }
} diff --git a/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.scss b/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.scss index 90c0ff6e..2ee0519a 100644 --- a/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.scss +++ b/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.scss @@ -11,10 +11,6 @@ background-color: transparent; } - &.disable-edit { - height: unset; - } - &.edit-mode { z-index: 101; border: 1px dashed var(--color-outline); @@ -60,12 +56,6 @@ } } -:host { - ::ng-deep .action-button button { - min-width: 70px; - } -} - :host-context(.generic-container) { .editable-container { border: 1px solid var(--color-outline-variant); diff --git a/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.ts b/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.ts index 19beea08..1b9ad32b 100644 --- a/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.ts +++ b/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.ts @@ -1,29 +1,21 @@ -import { - Component, - ElementRef, - HostListener, - OnDestroy, input, output, inject, ChangeDetectionStrategy, signal, computed -} from '@angular/core'; +import {ChangeDetectionStrategy, Component, computed, ElementRef, HostListener, inject, input, OnDestroy, output, signal} from '@angular/core'; import {Store} from '@ngrx/store'; import {setBackdrop} from '@common/core/actions/layout.actions'; import {MatDialog} from '@angular/material/dialog'; import {fromEvent, Subscription} from 'rxjs'; import {tap, throttleTime} from 'rxjs/operators'; -import {LoadingButtonComponent} from '@common/shared/ui-components/buttons/loading-button/loading-button.component'; import {MatButton} from '@angular/material/button'; import {computedPrevious} from 'ngxtension/computed-previous'; @Component({ - selector: 'sm-editable-section', - templateUrl: './editable-section.component.html', - styleUrls: ['./editable-section.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - LoadingButtonComponent, - MatButton - ] + selector: 'sm-editable-section', + templateUrl: './editable-section.component.html', + styleUrls: ['./editable-section.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatButton + ] }) export class EditableSectionComponent implements OnDestroy { private store = inject(Store); @@ -48,7 +40,7 @@ export class EditableSectionComponent implements OnDestroy { saving: this.saving(), inEditMode: signal(false) })); - get inEditMode () { + get inEditMode() { return this.state().inEditMode; } diff --git a/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.html b/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.html index 61967e00..ab493ea0 100644 --- a/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.html @@ -16,8 +16,6 @@
- -
INITIAL INPUT MODEL: diff --git a/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.scss b/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.scss index 0b96e70e..5d4fb37b 100644 --- a/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.scss +++ b/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.scss @@ -1,18 +1,18 @@ -@import "mixins/common"; +@use "mixins/common"; .top-labels { - @include counter-label(); + @include common.counter-label(); text-align: left; padding-top: 8px; } .sub-title { - @include counter-label(); + @include common.counter-label(); padding-right: 10px; } .experiment-tag { - @include card-header-tag(); + @include common.card-header-tag(); color: var(--color-surface-container-low); } diff --git a/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.ts b/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.ts index 59a7d16e..99677f0d 100644 --- a/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.ts +++ b/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.ts @@ -12,20 +12,19 @@ import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indic @Component({ - selector: 'sm-experiment-card', - templateUrl: './experiment-card.component.html', - styleUrls: ['./experiment-card.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [ - CardComponent, - TooltipDirective, - CopyClipboardComponent, - CircleStatusComponent, - DatePipe, - TimeAgoPipe, - ShowTooltipIfEllipsisDirective - ] + selector: 'sm-experiment-card', + templateUrl: './experiment-card.component.html', + styleUrls: ['./experiment-card.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + CardComponent, + TooltipDirective, + CopyClipboardComponent, + CircleStatusComponent, + DatePipe, + TimeAgoPipe, + ShowTooltipIfEllipsisDirective + ] }) export class ExperimentCardComponent { protected isEmpty = isEmpty; diff --git a/src/app/webapp-common/shared/ui-components/panel/menu-item/menu-item.component.ts b/src/app/webapp-common/shared/ui-components/panel/menu-item/menu-item.component.ts index 09ff9e54..268741e3 100644 --- a/src/app/webapp-common/shared/ui-components/panel/menu-item/menu-item.component.ts +++ b/src/app/webapp-common/shared/ui-components/panel/menu-item/menu-item.component.ts @@ -9,19 +9,18 @@ import {MatCheckbox} from '@angular/material/checkbox'; import {MatIconButton} from '@angular/material/button'; @Component({ - selector: 'sm-menu-item', - templateUrl: './menu-item.component.html', - styleUrls: ['./menu-item.component.scss'], - imports: [ - TooltipDirective, - MatMenuModule, - ShowTooltipIfEllipsisDirective, - MatIcon, - ClickStopPropagationDirective, - MatCheckbox, - MatIconButton - ], - standalone: true + selector: 'sm-menu-item', + templateUrl: './menu-item.component.html', + styleUrls: ['./menu-item.component.scss'], + imports: [ + TooltipDirective, + MatMenuModule, + ShowTooltipIfEllipsisDirective, + MatIcon, + ClickStopPropagationDirective, + MatCheckbox, + MatIconButton + ] }) export class MenuItemComponent { removable = input(false); diff --git a/src/app/webapp-common/shared/ui-components/panel/menu/menu.component.html b/src/app/webapp-common/shared/ui-components/panel/menu/menu.component.html index 9c8bb949..58a428c5 100644 --- a/src/app/webapp-common/shared/ui-components/panel/menu/menu.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/menu/menu.component.html @@ -1,6 +1,6 @@ - + @if (selectedQueue()?.entries?.length === 0) {
No tasks currently enqueued
} @@ -31,7 +31,7 @@ } - + @if (selectedQueue()?.workers?.length === 0) {
No workers currently assigned to this queue
} diff --git a/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.scss b/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.scss index 610337ef..ed6fc1db 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.scss +++ b/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.scss @@ -1,10 +1,9 @@ -@import "variables"; - :host { display: flex; position: relative; flex-direction: column; height: 100%; + background-color: var(--row-default-color); ::ng-deep{ .mat-mdc-tab-body-content{ overflow: unset; @@ -37,12 +36,21 @@ ::ng-deep .table-row { height: 40px; - border-bottom: 1px solid var(--color-outline-variant); + border-bottom: 1px solid var(--color-surface-container-high); padding: 0 !important; - line-height: 40px !important; &:last-of-type { - border-bottom-color: var(--color-outline-variant) !important - }; + border-bottom-color: var(--color-surface-container-high) !important; + } + } + + ::ng-deep { + .mat-mdc-tab-header { + background-color: var(--row-header-color); + height: 40px; + } + .mat-mdc-tab { + --mdc-secondary-navigation-tab-container-height: 39px; + } } sm-simple-table-2 ::ng-deep .headers { @@ -53,7 +61,7 @@ .close { position: absolute; right: 12px; - top: 6px; + top: 8px; z-index: 5; } diff --git a/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.ts b/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.ts index 744c476a..b8440f0b 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.ts +++ b/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.ts @@ -7,9 +7,10 @@ import {SelectQueueComponent} from '@common/experiments/shared/components/select import {Task} from '~/business-logic/model/tasks/task'; @Component({ - selector : 'sm-queue-info', - templateUrl: './queue-info.component.html', - styleUrls : ['./queue-info.component.scss'] + selector: 'sm-queue-info', + templateUrl: './queue-info.component.html', + styleUrls: ['./queue-info.component.scss'], + standalone: false }) export class QueueInfoComponent implements OnInit { private changeDetector = inject(ChangeDetectorRef); diff --git a/src/app/webapp-common/workers-and-queues/dumb/queue-task-table/queue-task-table.component.ts b/src/app/webapp-common/workers-and-queues/dumb/queue-task-table/queue-task-table.component.ts index ea76b838..a14a9049 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/queue-task-table/queue-task-table.component.ts +++ b/src/app/webapp-common/workers-and-queues/dumb/queue-task-table/queue-task-table.component.ts @@ -6,9 +6,10 @@ import {TIME_FORMAT_STRING} from '@common/constants'; import {ITableExperiment} from '@common/experiments/shared/common-experiment-model.model'; @Component({ - selector : 'sm-queue-task-table', - templateUrl: './queue-task-table.component.html', - styleUrls : ['./queue-task-table.component.scss'] + selector: 'sm-queue-task-table', + templateUrl: './queue-task-table.component.html', + styleUrls: ['./queue-task-table.component.scss'], + standalone: false }) export class QueueTaskTableComponent { diff --git a/src/app/webapp-common/workers-and-queues/dumb/queues-menu/queues-menu.component.ts b/src/app/webapp-common/workers-and-queues/dumb/queues-menu/queues-menu.component.ts index de93d265..eb3d9ecd 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/queues-menu/queues-menu.component.ts +++ b/src/app/webapp-common/workers-and-queues/dumb/queues-menu/queues-menu.component.ts @@ -3,9 +3,10 @@ import {ActivatedRoute} from '@angular/router'; import {Queue} from '@common/workers-and-queues/actions/queues.actions'; @Component({ - selector: 'sm-queues-menu', - templateUrl: './queues-menu.component.html', - styleUrls: ['./queues-menu.component.scss'] + selector: 'sm-queues-menu', + templateUrl: './queues-menu.component.html', + styleUrls: ['./queues-menu.component.scss'], + standalone: false }) export class QueuesMenuComponent { private route = inject(ActivatedRoute); diff --git a/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.html b/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.html index eb876447..7234f223 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.html +++ b/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.html @@ -1,23 +1,26 @@
- @switch (col.id) { @case (QUEUES_TABLE_COL_FIELDS.NAME) { -
+
{{queue?.caption}}
diff --git a/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.scss b/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.scss index 48cfdd73..a0be4b08 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.scss +++ b/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.scss @@ -1,5 +1,3 @@ -@import "variables"; - :host { .first { display: block; @@ -14,6 +12,7 @@ height: 100%; &.short { + height: 400px; max-height: 400px; } } diff --git a/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.ts b/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.ts index fff97542..4cd16ea5 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.ts +++ b/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.ts @@ -1,74 +1,78 @@ import { + ChangeDetectionStrategy, ChangeDetectorRef, - Component, - viewChild, - input, - output, + Component, computed, effect, inject, - ElementRef, - signal, - ChangeDetectionStrategy + input, + output, + signal } from '@angular/core'; import {ColHeaderTypeEnum, ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {find, get} from 'lodash-es'; import {QUEUES_TABLE_COL_FIELDS} from '../../workers-and-queues.consts'; import {BaseTableView} from '@common/shared/ui-components/data/table/base-table-view'; -import {ActivatedRoute} from '@angular/router'; import {Queue} from '@common/workers-and-queues/actions/queues.actions'; @Component({ - selector: 'sm-queues-table', - templateUrl: './queues-table.component.html', - styleUrls: ['./queues-table.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'sm-queues-table', + templateUrl: './queues-table.component.html', + styleUrls: ['./queues-table.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: false }) export class QueuesTableComponent extends BaseTableView { private changeDetector = inject(ChangeDetectorRef); - private route = inject(ActivatedRoute); - protected cols: ISmCol[] = [ - { - id: QUEUES_TABLE_COL_FIELDS.NAME, - headerType: ColHeaderTypeEnum.sortFilter, - header: 'QUEUE', - style: {width: '35%', maxWidth: '600px'}, - sortable: true, - }, - { - id: QUEUES_TABLE_COL_FIELDS.WORKERS, - headerType: ColHeaderTypeEnum.sortFilter, - header: 'WORKERS', - style: {width: '80px', maxWidth: '100px'}, - sortable: true, - }, - { - id: QUEUES_TABLE_COL_FIELDS.TASK, - headerType: ColHeaderTypeEnum.sortFilter, - header: 'NEXT TASK', - style: {width: '30%', maxWidth: '600px'}, - sortable: true, - }, - { - id: QUEUES_TABLE_COL_FIELDS.LAST_UPDATED, - headerType: ColHeaderTypeEnum.sortFilter, - header: 'LAST UPDATED', - style: {width: '150px', maxWidth: '200px'}, - sortable: true, - }, - { - id: QUEUES_TABLE_COL_FIELDS.IN_QUEUE, - headerType: ColHeaderTypeEnum.sortFilter, - header: 'IN QUEUE', - style: {width: '100px', maxWidth: '150px'}, - sortable: true, - } - ]; + protected cols = computed(() => { + const columns = [ + { + id: QUEUES_TABLE_COL_FIELDS.NAME, + headerType: ColHeaderTypeEnum.sortFilter, + header: 'QUEUE', + style: {width: '250px', minWidth: this.selectedQueue() ? '250px' : '600px'}, + sortable: true, + }, + { + id: QUEUES_TABLE_COL_FIELDS.WORKERS, + headerType: ColHeaderTypeEnum.sortFilter, + header: 'WORKERS', + style: {width: '100px'}, + sortable: true, + }, + { + id: QUEUES_TABLE_COL_FIELDS.TASK, + headerType: ColHeaderTypeEnum.sortFilter, + header: 'NEXT TASK', + style: {width: '250px' ,minWidth: this.selectedQueue() ? '250px' : '500px'}, + sortable: true, + }, + { + id: QUEUES_TABLE_COL_FIELDS.LAST_UPDATED, + headerType: ColHeaderTypeEnum.sortFilter, + header: 'LAST UPDATED', + style: {width: '180px', minWidth: '180px'}, + sortable: true, + }, + { + id: QUEUES_TABLE_COL_FIELDS.IN_QUEUE, + headerType: ColHeaderTypeEnum.sortFilter, + header: 'IN QUEUE', + style: {width: '150px', minWidth: '150px'}, + sortable: true, + } + ] + return this.selectedQueue() ? columns : [...columns, { + id: 'last', + headerType: ColHeaderTypeEnum.title, + header: '', + style: {width: '600px'} + }]; + }) protected readonly QUEUES_TABLE_COL_FIELDS = QUEUES_TABLE_COL_FIELDS; - protected menuOpen: boolean; - protected queuesManager = this.route.snapshot.data.queuesManager; + protected menuOpen = signal(false); contextQueue: Queue; queues = input(); @@ -83,7 +87,6 @@ export class QueuesTableComponent extends BaseTableView { colId: ISmCol['id']; }>(); - tableContainer = viewChild>('tableContainer'); public menuPosition = signal<{ x: number; y: number }>(null); @@ -117,26 +120,21 @@ export class QueuesTableComponent extends BaseTableView { openContextMenu(data) { data.e.preventDefault(); this.contextQueue = data.rowData; - this.menuOpen = false; + this.menuOpen.set(false); setTimeout(() => { this.menuPosition.set({x: data.e.clientX, y: data.e.clientY}); - this.menuOpen = true; + this.menuOpen.set(true); this.changeDetector.detectChanges(); }, 0); } - override scrollTableToTop() { - this.tableContainer().nativeElement.scroll({top: 0}); - } onSortChanged(isShift: boolean, colId: ISmCol['id']) { this.sortedChanged.emit({isShift, colId}); this.scrollTableToTop(); } - override afterTableInit(): void { - } // eslint-disable-next-line @typescript-eslint/no-unused-vars emitSelection(selection: any[]) { diff --git a/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.html b/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.html index 6b7bb766..eb5bd201 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.html +++ b/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.html @@ -1,4 +1,4 @@ - @@ -36,9 +36,9 @@ {{row?.display_name ?? row?.name}} + smShowTooltipIfEllipsis>{{row?.display_name || row.name}} (); diff --git a/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.html b/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.html index f4c26991..fbe52170 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.html +++ b/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.html @@ -1,7 +1,7 @@
(); + selectedWorker = input(); + workerSelected = output(); + sortedChanged = output<{ + isShift: boolean; + colId: ISmCol['id']; + }>(); - get workers() { - return this._workers; - } - - @Input() selectedWorker: WorkerExt; - @Output() workerSelected = new EventEmitter(); - @Output() sortedChanged = new EventEmitter<{ isShift: boolean; colId: ISmCol['id'] }>(); - - @ViewChild('tableContainer', {static: true}) tableContainer; + tableContainer = viewChild('tableContainer'); constructor() { super(); - this.cols = [ - { - id: WORKERS_TABLE_COL_FIELDS.ID, - headerType: ColHeaderTypeEnum.sortFilter, - header: 'AVAILABLE WORKERS', - style: {width: '30%', maxWidth: '700px'}, - sortable: true, - }, - { - id: WORKERS_TABLE_COL_FIELDS.TASK, - headerType: ColHeaderTypeEnum.sortFilter, - header: 'CURRENTLY RUNNING TASK', - style: {width: '30%', maxWidth: '700px'}, - sortable: true, - }, - { - id: WORKERS_TABLE_COL_FIELDS.TASK_RUNNING_TIME, - headerType: ColHeaderTypeEnum.sortFilter, - header: 'TASK RUNNING TIME', - style: {width: '160px', maxWidth: '200px'}, - sortable: true, - }, - { - id: WORKERS_TABLE_COL_FIELDS.TASK_ITERATIONS, - headerType: ColHeaderTypeEnum.sortFilter, - header: 'ITERATION', - style: {width: '100px', maxWidth: '150px'}, - sortable: true, - }, - ]; + effect(() => { + if (this.workers() && this.selectedWorker()) { + this.table?.focusSelected(); + const index = this.workers().findIndex(w => w.id === this.selectedWorker().id) + if (index > -1) { + this.tables.forEach(table => table.scrollToIndex(index)) + } + } + }); } getBodyData(rowData: any, col: ISmCol): any { @@ -75,7 +78,7 @@ export class WorkersTableComponent extends BaseTableView { } override scrollTableToTop() { - this.tableContainer.nativeElement.scroll({top: 0}); + this.tableContainer().scroll({top: 0}); } onSortChanged(isShift: boolean, colId: ISmCol['id']) { @@ -83,13 +86,9 @@ export class WorkersTableComponent extends BaseTableView { this.scrollTableToTop(); } - override afterTableInit(): void { - } // eslint-disable-next-line @typescript-eslint/no-unused-vars - emitSelection(selection: any[]) { - } + emitSelection(selection: any[]) {} - openContextMenu(data: { e: Event; rowData; single?: boolean; backdrop?: boolean }) { - } + openContextMenu(data: { e: Event; rowData; single?: boolean; backdrop?: boolean }) {} } diff --git a/src/app/webapp-common/workers-and-queues/effects/workers.effects.ts b/src/app/webapp-common/workers-and-queues/effects/workers.effects.ts index 471e846b..977c057d 100644 --- a/src/app/webapp-common/workers-and-queues/effects/workers.effects.ts +++ b/src/app/webapp-common/workers-and-queues/effects/workers.effects.ts @@ -21,14 +21,16 @@ import {MESSAGES_SEVERITY} from '@common/constants'; const prepareStatsQuery = (entitie: string, keys: { key: string }[], range: number, granularity: number): WorkersGetStatsRequest => { const now = Math.floor((new Date()).getTime() / 1000); + const typeKeys = castArray(keys); + const keyList = typeKeys.map(key => key.key); + const requiresSplit = keyList.some(key => key === 'cpu_usage' || key === 'gpu_memory_used'); return { - from_date: now - range, to_date: now, worker_ids: entitie ? [entitie] : null, - items: castArray(keys), - interval: granularity - + items: typeKeys, + interval: granularity, + ...(requiresSplit && { split_by_resource: true }) }; }; diff --git a/src/app/webapp-common/workers-and-queues/workers-and-queues.consts.ts b/src/app/webapp-common/workers-and-queues/workers-and-queues.consts.ts index 5c1e67cf..7b2e8688 100644 --- a/src/app/webapp-common/workers-and-queues/workers-and-queues.consts.ts +++ b/src/app/webapp-common/workers-and-queues/workers-and-queues.consts.ts @@ -17,24 +17,14 @@ export const WORKERS_TABLE_COL_FIELDS = { TASK_ITERATIONS : 'task.last_iteration' }; -export const SOURCES_TABLE_COL_FIELDS = { - ID : 'id', - KEY : 'key', - GPU : 'avgGpuUtil', - CPU : 'avgCpuLoad', - RAM_TOTAL : 'ramTotal', - RAM_FREE : 'ramFree', - HOME_FREE : 'homeFree', - WORKERS_COUNT : 'workerCount', - NETWORK : 'network', -}; + const MiB = 1024 * 1024; export const WORKER_STATS_PARAM_INFO = { - cpu_usage : {title: 'CPU Usage', multiply: 1}, - gpu_usage : {title: 'GPU Usage', multiply: 1}, + cpu_usage : {title: 'CPU', multiply: 1, suffix: 'Usage' }, + gpu_usage : {title: 'GPU', multiply: 1, suffix: 'Usage' }, memory_used : {title: 'Memory Used', multiply: MiB}, - gpu_memory_used: {title: 'GPU Memory', multiply: MiB}, + gpu_memory_used: {title: 'GPU', multiply: MiB, suffix: 'Memory' }, network_rx : {title: 'Network Receive', multiply: MiB}, network_tx : {title: 'Network Transmit', multiply: MiB} }; diff --git a/src/assets/ignite_logo.svg b/src/assets/ignite_logo.svg deleted file mode 100644 index 8007a51f..00000000 --- a/src/assets/ignite_logo.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/src/environments/base.ts b/src/environments/base.ts index deef20de..79ea24c0 100644 --- a/src/environments/base.ts +++ b/src/environments/base.ts @@ -48,16 +48,19 @@ export interface Environment { showSurvey: boolean; plotlyURL: string; slackLink: string; - docsLink: string; + docsLink?: string; + supportEmail?: string; useFilesProxy: boolean; branding?: {faviconUrl?: string; logo?: string; logoSmall?: string}; gettingStartedContext?: GettingStartedContext; serverDownMessage?: string; legal: Legal; loginPopup?: string; + platformYoutubeChannel: string; appsYouTubeIntroVideoId?: string; newExperimentYouTubeVideoId: string; baseHref?: string; + loginFallback?: 'password-less' | 'error'; // defaults to 'password-less' displayTips: boolean; onlyPasswordLogin: boolean; blockUserScript?: boolean; @@ -97,10 +100,12 @@ export const BASE_ENV = { plotlyURL: 'app/webapp-common/assets/plotly-2.35.0.min.js', slackLink: 'https://joinslack.clear.ml', docsLink: 'https://clear.ml/docs', + supportEmail: 'support@clear.ml', branding: {logo: 'assets/logo-white.svg?v=7', logoSmall: 'assets/small-logo-white.svg?=2'}, serverDownMessage: 'The ClearML server is currently unavailable.
' + 'Please try to reload this page in a little while.
' + 'If the problem persists, verify your network connection is working and check the ClearML server logs for possible errors', + platformYoutubeChannel: 'https://www.youtube.com/c/ClearML/featured', newExperimentYouTubeVideoId: 's3k9ntmQmD4', displayTips: true, } as Environment; diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json new file mode 100644 index 00000000..7d7c716d --- /dev/null +++ b/src/tsconfig.app.json @@ -0,0 +1,13 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/app", + "types": [] + }, + "files": [ + "src/main.ts" + ], + "include": [ + "src/**/*.d.ts" + ] +} diff --git a/src/tsconfig.json b/src/tsconfig.json new file mode 100644 index 00000000..36d2ace6 --- /dev/null +++ b/src/tsconfig.json @@ -0,0 +1,45 @@ +{ + "compileOnSave": false, + "compilerOptions": { + "baseUrl": "./", + "outDir": "./dist/out-tsc", + "forceConsistentCasingInFileNames": true, + "noImplicitOverride": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "sourceMap": true, + "declaration": false, + "experimentalDecorators": true, + "moduleResolution": "node", + "importHelpers": true, + "esModuleInterop": true, + "target": "ES2022", + "module": "ES2022", + "useDefineForClassFields": false, + "resolveJsonModule": true, + "typeRoots": [ + "node_modules/@types" + ], + "lib": [ + "ES2022", + "dom", + "ES2023.Array" + ], + "paths": { + "@common/*": [ + "src/app/webapp-common/*" + ], + "~/*": [ + "src/app/*" + ] + }, + "skipLibCheck": true + }, + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "strictTemplates": true, + "preserveWhitespaces": false + } +} diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json new file mode 100644 index 00000000..ac0bf067 --- /dev/null +++ b/src/tsconfig.spec.json @@ -0,0 +1,18 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/spec", + "types": [ + "jasmine", + "node" + ], + }, + "files": [ + "test.ts", + "polyfills.ts" + ], + "include": [ + "**/*.spec.ts", + "**/*.d.ts" + ] +} diff --git a/src/version.json b/src/version.json index f0121e14..3923fba7 100644 --- a/src/version.json +++ b/src/version.json @@ -1,5 +1,5 @@ { - "version": "1.14.0-000", + "version": "2.1.0-000", "trains-server-treeish": "master", "trains-server-commit": "master", "webapp-treeish": "master", diff --git a/tsconfig.spec.json b/tsconfig.spec.json index a2c80259..ac0bf067 100644 --- a/tsconfig.spec.json +++ b/tsconfig.spec.json @@ -1,17 +1,18 @@ { - "extends": "./tsconfig.json", + "extends": "../tsconfig.json", "compilerOptions": { - "outDir": "./out-tsc/spec", + "outDir": "../out-tsc/spec", "types": [ - "jasmine" - ] + "jasmine", + "node" + ], }, "files": [ - "src/test.ts", + "test.ts", "polyfills.ts" ], "include": [ - "src/**/*.spec.ts", - "src/**/*.d.ts" + "**/*.spec.ts", + "**/*.d.ts" ] }
+ @switch (col.id) { + @case ('created') { +
+ {{ event?.[col.id] | date:'MMM d yyyy H:mm' }} +
+ } + @case ('operation') { +
{{OPERATIONS[event.operation]?? (event.operation | titlecase)}}
+ } + @case ('user') { +
{{ event.user?.name }}
+ } + @default { + {{ event?.[col.id] }} + } + } +
{{credential?.last_used_from ? credential?.last_used_from : 'Not available'}}
- - + +
{{ metricVariant.firstMetricRow ? metricVariant.metric : '' }}