diff --git a/.eslintrc.json b/.eslintrc.json deleted file mode 100644 index 356d70c6..00000000 --- a/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates", - "plugin:@ngrx/recommended-requiring-type-checking" - ], - "rules": { - "no-console": "error", - "no-debugger": "error", - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "sm", - "style": "camelCase" - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "sm", - "style": "kebab-case" - } - ], - "@ngrx/prefer-effect-callback-in-block-statement": "off" - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": { - "@angular-eslint/template/use-track-by-function": "warn" - } - } - ] -} diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 00000000..f32b5889 --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,52 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + ignores: ["node_modules/*", "build/*", "dist/*", "electron/*"], + files: ["**/*.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "no-console": "error", + "no-debugger": "error", + "quotes": ["error", "single", { + "allowTemplateLiterals": true + }], + "@angular-eslint/directive-selector": [ + "error", + { + "type": "attribute", + "prefix": "sm", + "style": "camelCase" + } + ], + "@angular-eslint/component-selector": [ + "error", + { + "type": "element", + "prefix": "sm", + "style": "kebab-case" + } + ], + "@ngrx/prefer-effect-callback-in-block-statement": "off" + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: { + "@angular-eslint/template/use-track-by-function": "warn" + }, + } +); diff --git a/package-lock.json b/package-lock.json index d1a0d92b..1af233e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,109 +1,107 @@ { "name": "clearml-webapp", - "version": "1.16.0", + "version": "1.17.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "clearml-webapp", - "version": "1.16.0", - "dependencies": { - "@angular/animations": "^17.3.7", - "@angular/cdk": "^17.3.7", - "@angular/common": "^17.3.7", - "@angular/compiler": "^17.3.7", - "@angular/core": "^17.3.7", - "@angular/forms": "^17.3.7", - "@angular/material": "^17.3.7", - "@angular/platform-browser": "^17.3.7", - "@angular/platform-browser-dynamic": "^17.3.7", - "@angular/platform-server": "^17.3.7", - "@angular/router": "^17.3.7", - "@angular/service-worker": "^17.3.7", - "@angular/youtube-player": "^17.3.7", - "@aws-sdk/client-s3": "^3.569.0", - "@aws-sdk/s3-request-presigner": "^3.569.0", + "version": "1.17.0", + "dependencies": { + "@angular/animations": "^18.2.10", + "@angular/cdk": "^18.2.11", + "@angular/common": "^18.2.10", + "@angular/compiler": "^18.2.10", + "@angular/core": "^18.2.10", + "@angular/forms": "^18.2.10", + "@angular/material": "^18.2.11", + "@angular/platform-browser": "^18.2.10", + "@angular/platform-browser-dynamic": "^18.2.10", + "@angular/platform-server": "^18.2.10", + "@angular/router": "^18.2.10", + "@angular/service-worker": "^18.2.10", + "@angular/youtube-player": "^18.2.11", + "@aws-sdk/client-s3": "^3.637.0", + "@aws-sdk/s3-request-presigner": "^3.637.0", "@ctrl/ngx-github-buttons": "^9.0.0", "@ctrl/tinycolor": "^4.1.0", "@ngneat/dag": "^2.0.0", - "@ngrx/effects": "^17.2.0", - "@ngrx/entity": "^17.2.0", - "@ngrx/router-store": "^17.2.0", - "@ngrx/store": "^17.2.0", - "ace-builds": "^1.33.1", + "@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", + "ace-builds": "^1.36.2", "angular-resizable-element": "^7.0.2", "angular-split": "^17.2.0", "ansi-to-html": "^0.7.2", "bootstrap": "^5.3.3", - "chart.js": "^4.4.2", + "chart.js": "^4.4.4", "chartjs-adapter-date-fns": "^3.0.0", "chartjs-plugin-annotation": "^3.0.1", "chartjs-plugin-zoom": "^2.0.1", - "curved-arrows": "^0.2.0", + "curved-arrows": "^0.3.0", "d3-selection": "^3.0.0", "date-fns": "^3.6.0", "diff": "^5.2.0", "dom-to-image": "^2.6.0", - "dompurify": "^3.1.3", + "dompurify": "^3.1.6", "export-to-csv": "^1.3.0", - "filesize": "^10.1.1", - "has-ansi": "^5.0.1", + "filesize": "^10.1.4", + "has-ansi": "^6.0.0", "hocon-parser": "^1.0.1", - "localforage": "^1.10.0", "lodash-es": "^4.17.21", "lucene": "^2.1.1", "marked": "^12.0.2", "ng2-charts": "^6.0.1", "ngx-clipboard": "^16.0.0", - "ngx-color-picker": "^16.0.0", - "ngx-device-detector": "^7.0.0", + "ngx-color-picker": "^17.0.0", + "ngx-device-detector": "^8.0.0", "ngx-markdown-editor": "^5.3.4", "ngx-print": "^1.5.1", "ngx-window-token": "^7.0.0", + "ngxtension": "^4.1.0", "object-hash": "^3.0.0", "primeicons": "^7.0.0", - "primeng": "^17.16.0", + "primeng": "^17.18.9", "rxjs": "^7.8.1", "string-to-color": "^2.2.2", "taira": "^3.2.2", - "tslib": "^2.6.2", - "url": "^0.11.3", - "uuid": "^9.0.1", - "zone.js": "~0.14.5" + "tslib": "^2.7.0", + "url": "^0.11.4", + "uuid": "^10.0.0", + "zone.js": "~0.15.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^17.3.6", - "@angular-devkit/core": "^17.3.6", - "@angular-devkit/schematics": "^17.3.6", - "@angular-devkit/schematics-cli": "^17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "^17.3.6", - "@angular/compiler-cli": "^17.3.7", - "@angular/language-service": "^17.3.7", - "@fortawesome/fontawesome-free": "^6.5.2", - "@ngrx/eslint-plugin": "^17.2.0", - "@ngrx/schematics": "^17.2.0", - "@ngrx/store-devtools": "^17.2.0", + "@angular-devkit/build-angular": "^18.2.11", + "@angular-devkit/core": "^18.2.11", + "@angular-devkit/schematics": "^18.2.11", + "@angular-devkit/schematics-cli": "^18.2.1", + "@angular/cli": "^18.2.11", + "@angular/compiler-cli": "^18.2.10", + "@angular/language-service": "^18.2.10", + "@fortawesome/fontawesome-free": "^6.6.0", + "@ngrx/eslint-plugin": "^18.1.1", + "@ngrx/schematics": "^18.1.1", + "@ngrx/store-devtools": "^18.1.1", "@types/d3-selection": "^3.0.10", "@types/dom-to-image": "^2.6.7", + "@types/dompurify": "^3.0.5", "@types/has-ansi": "^5.0.2", "@types/jasmine": "^5.1.4", "@types/lodash-es": "^4.17.12", - "@types/node": "^20.12.10", - "@types/plotly.js": "^2.29.3", + "@types/node": "^20.14.10", + "@types/plotly.js": "^2.33.3", "@types/tinycolor2": "^1.4.6", - "@types/uuid": "^9.0.8", - "@typescript-eslint/eslint-plugin": "^7.8.0", - "@typescript-eslint/parser": "^7.8.0", - "eslint": "^8.57.0", - "eslint-plugin-import": "^2.29.1", - "eslint-plugin-jsdoc": "^48.2.3", - "eslint-plugin-prefer-arrow": "^1.2.3", - "typescript": "~5.4.5" + "@types/uuid": "^10.0.0", + "angular-eslint": "^18.3.0", + "eslint": "^9.9.1", + "eslint-plugin-import": "2.29.1", + "eslint-plugin-jsdoc": "^50.2.2", + "eslint-plugin-prefer-arrow": "1.2.3", + "typescript": "^5.5.4", + "typescript-eslint": "^8.2.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -120,6 +118,7 @@ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" @@ -129,112 +128,113 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.1703.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.6.tgz", - "integrity": "sha512-Ck501FD/QuOjeKVFs7hU92w8+Ffetv0d5Sq09XY2/uygo5c/thMzp9nkevaIWBxUSeU5RqYZizDrhFVgYzbbOw==", + "version": "0.1802.11", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.11.tgz", + "integrity": "sha512-p+XIc/j51aI83ExNdeZwvkm1F4wkuKMGUUoj0MVUUi5E6NoiMlXYm6uU8+HbRvPBzGy5+3KOiGp3Fks0UmDSAA==", "dev": true, + "license": "MIT", "dependencies": { - "@angular-devkit/core": "17.3.6", + "@angular-devkit/core": "18.2.11", "rxjs": "7.8.1" }, "engines": { - "node": "^18.13.0 || >=20.9.0", + "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-devkit/build-angular": { - "version": "17.3.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.6.tgz", - "integrity": "sha512-K4CEZvhQZUUOpmXPVoI1YBM8BARbIlqE6FZRxakmnr+YOtVTYE5s+Dr1wgja8hZIohNz6L7j167G9Aut7oPU/w==", + "version": "18.2.11", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.11.tgz", + "integrity": "sha512-09Ln3NAdlMw/wMLgnwYU5VgWV5TPBEHolZUIvE9D8b6SFWBCowk3B3RWeAMgg7Peuf9SKwqQHBz2b1C7RTP/8g==", "dev": true, + "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1703.6", - "@angular-devkit/build-webpack": "0.1703.6", - "@angular-devkit/core": "17.3.6", - "@babel/core": "7.24.0", - "@babel/generator": "7.23.6", - "@babel/helper-annotate-as-pure": "7.22.5", - "@babel/helper-split-export-declaration": "7.22.6", - "@babel/plugin-transform-async-generator-functions": "7.23.9", - "@babel/plugin-transform-async-to-generator": "7.23.3", - "@babel/plugin-transform-runtime": "7.24.0", - "@babel/preset-env": "7.24.0", - "@babel/runtime": "7.24.0", - "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "17.3.6", + "@angular-devkit/architect": "0.1802.11", + "@angular-devkit/build-webpack": "0.1802.11", + "@angular-devkit/core": "18.2.11", + "@angular/build": "18.2.11", + "@babel/core": "7.25.2", + "@babel/generator": "7.25.0", + "@babel/helper-annotate-as-pure": "7.24.7", + "@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.11", "@vitejs/plugin-basic-ssl": "1.1.0", "ansi-colors": "4.1.3", - "autoprefixer": "10.4.18", + "autoprefixer": "10.4.20", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", "browserslist": "^4.21.5", - "copy-webpack-plugin": "11.0.0", - "critters": "0.0.22", - "css-loader": "6.10.0", - "esbuild-wasm": "0.20.1", + "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": "2.0.6", - "https-proxy-agent": "7.0.4", - "inquirer": "9.2.15", - "jsonc-parser": "3.2.1", + "http-proxy-middleware": "3.0.3", + "https-proxy-agent": "7.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-loader": "11.1.0", + "less-loader": "12.2.0", "license-webpack-plugin": "4.0.2", - "loader-utils": "3.2.1", - "magic-string": "0.30.8", - "mini-css-extract-plugin": "2.8.1", + "loader-utils": "3.3.1", + "magic-string": "0.30.11", + "mini-css-extract-plugin": "2.9.0", "mrmime": "2.0.0", - "open": "8.4.2", + "open": "10.1.0", "ora": "5.4.1", "parse5-html-rewriting-stream": "7.0.0", - "picomatch": "4.0.1", - "piscina": "4.4.0", - "postcss": "8.4.35", + "picomatch": "4.0.2", + "piscina": "4.6.1", + "postcss": "8.4.41", "postcss-loader": "8.1.1", "resolve-url-loader": "5.0.0", "rxjs": "7.8.1", - "sass": "1.71.1", - "sass-loader": "14.1.1", - "semver": "7.6.0", + "sass": "1.77.6", + "sass-loader": "16.0.0", + "semver": "7.6.3", "source-map-loader": "5.0.0", "source-map-support": "0.5.21", - "terser": "5.29.1", + "terser": "5.31.6", "tree-kill": "1.2.2", - "tslib": "2.6.2", - "undici": "6.11.1", - "vite": "5.1.7", - "watchpack": "2.4.0", - "webpack": "5.90.3", - "webpack-dev-middleware": "6.1.2", - "webpack-dev-server": "4.15.1", - "webpack-merge": "5.10.0", + "tslib": "2.6.3", + "vite": "5.4.6", + "watchpack": "2.4.1", + "webpack": "5.94.0", + "webpack-dev-middleware": "7.4.2", + "webpack-dev-server": "5.0.4", + "webpack-merge": "6.0.1", "webpack-subresource-integrity": "5.1.0" }, "engines": { - "node": "^18.13.0 || >=20.9.0", + "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": { - "esbuild": "0.20.1" + "esbuild": "0.23.0" }, "peerDependencies": { - "@angular/compiler-cli": "^17.0.0", - "@angular/localize": "^17.0.0", - "@angular/platform-server": "^17.0.0", - "@angular/service-worker": "^17.0.0", + "@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", "browser-sync": "^3.0.2", "jest": "^29.5.0", "jest-environment-jsdom": "^29.5.0", "karma": "^6.3.0", - "ng-packagr": "^17.0.0", + "ng-packagr": "^18.0.0", "protractor": "^7.0.0", "tailwindcss": "^2.0.0 || ^3.0.0", - "typescript": ">=5.2 <5.5" + "typescript": ">=5.4 <5.6" }, "peerDependenciesMeta": { "@angular/localize": { @@ -272,62 +272,60 @@ } } }, - "node_modules/@angular-devkit/build-angular/node_modules/@babel/core": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.0.tgz", - "integrity": "sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==", + "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": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.23.5", - "@babel/generator": "^7.23.6", - "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.24.0", - "@babel/parser": "^7.24.0", - "@babel/template": "^7.24.0", - "@babel/traverse": "^7.24.0", - "@babel/types": "^7.24.0", - "convert-source-map": "^2.0.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" + "is-inside-container": "^1.0.0" }, "engines": { - "node": ">=6.9.0" + "node": ">=16" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" + "url": "https://github.com/sponsors/sindresorhus" } }, - "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==", + "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, - "bin": { - "semver": "bin/semver.js" + "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/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 - }, - "node_modules/@angular-devkit/build-angular/node_modules/jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", - "dev": true - }, "node_modules/@angular-devkit/build-angular/node_modules/picomatch": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz", - "integrity": "sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==", + "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" }, @@ -335,55 +333,49 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/@angular-devkit/build-angular/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "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, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } + "license": "0BSD" }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1703.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.6.tgz", - "integrity": "sha512-pJu0et2SiF0kfXenHSTtAART0omzbWpLgBfeUo4hBh4uwX5IaT+mRpYpr8gCXMq+qsjoQp3HobSU3lPDeBn+bg==", + "version": "0.1802.11", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.11.tgz", + "integrity": "sha512-G76rNsyn1iQk7qjyr+K4rnDzfalmEswmwXQorypSDGaHYzIDY1SZXMoP4225WMq5fJNBOJrk82FA0PSfnPE+zQ==", "dev": true, + "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.1703.6", + "@angular-devkit/architect": "0.1802.11", "rxjs": "7.8.1" }, "engines": { - "node": "^18.13.0 || >=20.9.0", + "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": "^4.0.0" + "webpack-dev-server": "^5.0.2" } }, "node_modules/@angular-devkit/core": { - "version": "17.3.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.6.tgz", - "integrity": "sha512-FVbkT9dEwHEvjnxr4mvMNSMg2bCFoGoP4X68xXU9dhLEUpC05opLvfbaR3Qh543eCJ5AstosBFVzB/krfIkOvA==", + "version": "18.2.11", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.11.tgz", + "integrity": "sha512-H9P1shRGigORWJHUY2BRa2YurT+DVminrhuaYHsbhXBRsPmgB2Dx/30YLTnC1s5XmR9QIRUCsg/d3kyT1wd5Zg==", "dev": true, + "license": "MIT", "dependencies": { - "ajv": "8.12.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.1", - "picomatch": "4.0.1", + "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.13.0 || >=20.9.0", + "node": "^18.19.1 || ^20.11.1 || >=22.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, @@ -396,17 +388,12 @@ } } }, - "node_modules/@angular-devkit/core/node_modules/jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", - "dev": true - }, "node_modules/@angular-devkit/core/node_modules/picomatch": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz", - "integrity": "sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==", + "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" }, @@ -415,33 +402,35 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "17.3.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.6.tgz", - "integrity": "sha512-2G1YuPInd8znG7uUgKOS7z72Aku50lTzB/2csWkWPJLAFkh7vKC8QZ40x8S1nC9npVYPhI5CRLX/HVpBh9CyxA==", + "version": "18.2.11", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.11.tgz", + "integrity": "sha512-efRK3FotTFp4KD5u42jWfXpHUALXB9kJNsWiB4wEImKFH6CN+vjBspJQuLqk2oeBFh/7D2qRMc5P+2tZHM5hdw==", "dev": true, + "license": "MIT", "dependencies": { - "@angular-devkit/core": "17.3.6", - "jsonc-parser": "3.2.1", - "magic-string": "0.30.8", + "@angular-devkit/core": "18.2.11", + "jsonc-parser": "3.3.1", + "magic-string": "0.30.11", "ora": "5.4.1", "rxjs": "7.8.1" }, "engines": { - "node": "^18.13.0 || >=20.9.0", + "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-devkit/schematics-cli": { - "version": "17.3.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-17.3.6.tgz", - "integrity": "sha512-PeUQm6453515ZbBjE8r7FjYJHCRRh4Abvi7xl0JMGPeyk//E7ogblCdUJ1uYlafl9KvD8bRBe2SaqMRfIdlKdQ==", + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-18.2.2.tgz", + "integrity": "sha512-+PB99lr2eYxMvYx0N8l8CQDnlLNCceWjXVwgmzp7rNkssFR8jNEIfVLGcNwrm2YQP1g/XAsZw3RLtsmE3OdYXQ==", "dev": true, + "license": "MIT", "dependencies": { - "@angular-devkit/core": "17.3.6", - "@angular-devkit/schematics": "17.3.6", + "@angular-devkit/core": "18.2.2", + "@angular-devkit/schematics": "18.2.2", + "@inquirer/prompts": "5.3.8", "ansi-colors": "4.1.3", - "inquirer": "9.2.15", "symbol-observable": "4.0.0", "yargs-parser": "21.1.1" }, @@ -449,1102 +438,859 @@ "schematics": "bin/schematics.js" }, "engines": { - "node": "^18.13.0 || >=20.9.0", + "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-devkit/schematics/node_modules/jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", - "dev": true + "node_modules/@angular-devkit/schematics-cli/node_modules/@angular-devkit/core": { + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.2.tgz", + "integrity": "sha512-Zz0tGptI/QQnUBDdp+1G5wGwQWMjpfe2oO+UohkrDVgFS71yVj4VDnOy51kMTxBvzw+36evTgthPpmzqPIfxBw==", + "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": "^3.5.2" + }, + "peerDependenciesMeta": { + "chokidar": { + "optional": true + } + } }, - "node_modules/@angular-eslint/builder": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-17.3.0.tgz", - "integrity": "sha512-JXSZE7+KA3UGU6jwc0v9lwOIMptosrvLIOXGlXqrhHWEXfkfu3ENPq1Lm3K8jLndQ57XueEhC+Nab/AuUiWA/Q==", + "node_modules/@angular-devkit/schematics-cli/node_modules/@angular-devkit/schematics": { + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.2.tgz", + "integrity": "sha512-PU6+3nX+gQ3gofR7BGwXuvNUNeeV2raURaZjlPfGpBqjyTBxukMV71QsTTWptAZT4WibCWkTFp6X1gvsOGbjMg==", "dev": true, + "license": "MIT", "dependencies": { - "@nx/devkit": "^17.2.8 || ^18.0.0", - "nx": "^17.2.8 || ^18.0.0" + "@angular-devkit/core": "18.2.2", + "jsonc-parser": "3.3.1", + "magic-string": "0.30.11", + "ora": "5.4.1", + "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-devkit/schematics-cli/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-eslint/builder": { + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.3.0.tgz", + "integrity": "sha512-httEQyqyBw3+0CRtAa7muFxHrauRfkEfk/jmrh5fn2Eiu+I53hAqFPgrwVi1V6AP/kj2zbAiWhd5xM3pMJdoRQ==", + "dev": true, + "license": "MIT", "peerDependencies": { - "eslint": "^7.20.0 || ^8.0.0", + "eslint": "^8.57.0 || ^9.0.0", "typescript": "*" } }, "node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.3.0.tgz", - "integrity": "sha512-ejfNzRuBeHUV8m2fkgs+M809rj5STuCuQo4fdfc6ccQpzXDI6Ha7BKpTznWfg5g529q/wrkoGSGgFxU9Yc2/dQ==", - "dev": true + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.3.0.tgz", + "integrity": "sha512-v/59FxUKnMzymVce99gV43huxoqXWMb85aKvzlNvLN+ScDu6ZE4YMiTQNpfapVL2lkxhs0uwB3jH17EYd5TcsA==", + "license": "MIT" }, "node_modules/@angular-eslint/eslint-plugin": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-17.3.0.tgz", - "integrity": "sha512-81cQbOEPoQupFX8WmpqZn+y8VA7JdVRGBtt+uJNKBXcJknTpPWdLBZRFlgVakmC24iEZ0Fint/N3NBBQI3mz2A==", + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.3.0.tgz", + "integrity": "sha512-Vl7gfPMXxvtHTjYdlzR161aj5xrqW6T57wd8ToQ7Gqzm0qHGfY6kE4SQobUa2LCYckTNSlv+zXe48C4ah/dSjw==", "dev": true, + "license": "MIT", "dependencies": { - "@angular-eslint/utils": "17.3.0", - "@typescript-eslint/utils": "7.2.0" + "@angular-eslint/bundled-angular-compiler": "18.3.0", + "@angular-eslint/utils": "18.3.0" }, "peerDependencies": { - "eslint": "^7.20.0 || ^8.0.0", + "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", + "eslint": "^8.57.0 || ^9.0.0", "typescript": "*" } }, "node_modules/@angular-eslint/eslint-plugin-template": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-17.3.0.tgz", - "integrity": "sha512-9l/aRfpE9MCRVDWRb+rSB9Zei0paep1vqV6M/87VUnzBnzqeMRnVuPvQowilh2zweVSGKBF25Vp4HkwOL6ExDQ==", + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.3.0.tgz", + "integrity": "sha512-ddR/qwYbUeq9IpyVKrPbfZyRBTy6V8uc5I0JcBKttQ4CZ4joXhqsVgWFsI+JAMi8E66uNj1VC7NuKCOjDINv2Q==", "dev": true, + "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "17.3.0", - "@angular-eslint/utils": "17.3.0", - "@typescript-eslint/type-utils": "7.2.0", - "@typescript-eslint/utils": "7.2.0", + "@angular-eslint/bundled-angular-compiler": "18.3.0", + "@angular-eslint/utils": "18.3.0", "aria-query": "5.3.0", - "axobject-query": "4.0.0" + "axobject-query": "4.1.0" }, "peerDependencies": { - "eslint": "^7.20.0 || ^8.0.0", + "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", + "eslint": "^8.57.0 || ^9.0.0", "typescript": "*" } }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz", - "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==", + "node_modules/@angular-eslint/schematics": { + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.3.0.tgz", + "integrity": "sha512-rQ4DEWwf3f5n096GAK6JvXD0SRzRJ52WRaIyKg8MMkk6qvUDfZI8seOkcbjDtZoIe6Ds7DfqSfJgNVte75qvPQ==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/visitor-keys": "7.2.0" + "@angular-eslint/eslint-plugin": "18.3.0", + "@angular-eslint/eslint-plugin-template": "18.3.0", + "ignore": "5.3.2", + "semver": "7.6.3", + "strip-json-comments": "3.1.1" }, - "engines": { - "node": "^16.0.0 || >=18.0.0" + "peerDependencies": { + "@angular-devkit/core": ">= 18.0.0 < 19.0.0", + "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0" + } + }, + "node_modules/@angular-eslint/template-parser": { + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.3.0.tgz", + "integrity": "sha512-1mUquqcnugI4qsoxcYZKZ6WMi6RPelDcJZg2YqGyuaIuhWmi3ZqJZLErSSpjP60+TbYZu7wM8Kchqa1bwJtEaQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "18.3.0", + "eslint-scope": "^8.0.2" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": "*" } }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/types": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz", - "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==", + "node_modules/@angular-eslint/utils": { + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.3.0.tgz", + "integrity": "sha512-sCrkHkpxBJZLuCikdboZoawCfc2UgbJv+T14tu2uQCv+Vwzeadnu04vkeY2vTkA8GeBdBij/G9/N/nvwmwVw3g==", "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "18.3.0" + }, + "peerDependencies": { + "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", + "eslint": "^8.57.0 || ^9.0.0", + "typescript": "*" + } + }, + "node_modules/@angular/animations": { + "version": "18.2.10", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.10.tgz", + "integrity": "sha512-LT5+CocFZJ4t5jXsXLx5w/sBuWSxOEjmNTYga13usRcLOblrAB902pjUdFCHEZyrCUgm4MH8vov9fMS+Ks2GCw==", + "license": "MIT", + "dependencies": { + "tslib": "^2.3.0" + }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "peerDependencies": { + "@angular/core": "18.2.10" } }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/typescript-estree": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz", - "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==", + "node_modules/@angular/build": { + "version": "18.2.11", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.11.tgz", + "integrity": "sha512-AgirvSCmqUKiDE3C0rl3JA68OkOqQWDKUvjqRHXCkhxldLVOVoeIl87+jBYK/v9gcmk+K+ju+5wbGEfu1FjhiQ==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/visitor-keys": "7.2.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "minimatch": "9.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" + "@ampproject/remapping": "2.3.0", + "@angular-devkit/architect": "0.1802.11", + "@babel/core": "7.25.2", + "@babel/helper-annotate-as-pure": "7.24.7", + "@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", + "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", + "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" }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": "^18.19.1 || ^20.11.1 || >=22.0.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "peerDependencies": { + "@angular/compiler-cli": "^18.0.0", + "@angular/localize": "^18.0.0", + "@angular/platform-server": "^18.0.0", + "@angular/service-worker": "^18.0.0", + "less": "^4.2.0", + "postcss": "^8.4.0", + "tailwindcss": "^2.0.0 || ^3.0.0", + "typescript": ">=5.4 <5.6" }, "peerDependenciesMeta": { - "typescript": { + "@angular/localize": { + "optional": true + }, + "@angular/platform-server": { + "optional": true + }, + "@angular/service-worker": { + "optional": true + }, + "less": { + "optional": true + }, + "postcss": { + "optional": true + }, + "tailwindcss": { "optional": true } } }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/utils": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz", - "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==", + "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==", "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "7.2.0", - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/typescript-estree": "7.2.0", - "semver": "^7.5.4" - }, + "license": "MIT", "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": ">=12" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/@angular/cdk": { + "version": "18.2.11", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.11.tgz", + "integrity": "sha512-FuvfhrSz2ch0gyOVHrkWq2C/I2PnOzKYSXlG/VEG+ize/WNrvlYy//5WVrTh/hv+HD9sdoWPr9ULXsfFfgbo7w==", + "license": "MIT", + "dependencies": { + "tslib": "^2.3.0" + }, + "optionalDependencies": { + "parse5": "^7.1.2" }, "peerDependencies": { - "eslint": "^8.56.0" + "@angular/common": "^18.0.0 || ^19.0.0", + "@angular/core": "^18.0.0 || ^19.0.0", + "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/visitor-keys": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz", - "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "7.2.0", - "eslint-visitor-keys": "^3.4.1" + "node_modules/@angular/cli": { + "version": "18.2.11", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.11.tgz", + "integrity": "sha512-0JI1xjOLRemBPjdT/yVlabxc3Zkjqa/lhvVxxVC1XhKoW7yGxIGwNrQ4pka4CcQtCuktO6KPMmTGIu8YgC3cpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-devkit/architect": "0.1802.11", + "@angular-devkit/core": "18.2.11", + "@angular-devkit/schematics": "18.2.11", + "@inquirer/prompts": "5.3.8", + "@listr2/prompt-adapter-inquirer": "2.0.15", + "@schematics/angular": "18.2.11", + "@yarnpkg/lockfile": "1.1.0", + "ini": "4.1.3", + "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", + "semver": "7.6.3", + "symbol-observable": "4.0.0", + "yargs": "17.7.2" }, - "engines": { - "node": "^16.0.0 || >=18.0.0" + "bin": { + "ng": "bin/ng.js" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "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-eslint/eslint-plugin-template/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, + "node_modules/@angular/common": { + "version": "18.2.10", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.10.tgz", + "integrity": "sha512-YzTCmuqLiOuT+Yv07vuKymDWiebOVZ8BuXakJiz4EM7FMoOw5gICHJ04jepZSjDNWpA16e7kJSdt5ucnmvCFDQ==", + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "tslib": "^2.3.0" + }, + "engines": { + "node": "^18.19.1 || ^20.11.1 || >=22.0.0" + }, + "peerDependencies": { + "@angular/core": "18.2.10", + "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, + "node_modules/@angular/compiler": { + "version": "18.2.10", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.10.tgz", + "integrity": "sha512-cu+Uq1nnyl00Glg0+2uvm+Xpaq5b4YvWpaLGGtit7uGETAJ4L/frlBVeaTRhEoaIAGBI+RRlyuFLae+etQDA0w==", + "license": "MIT", "dependencies": { - "brace-expansion": "^2.0.1" + "tslib": "^2.3.0" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "peerDependencies": { + "@angular/core": "18.2.10" + }, + "peerDependenciesMeta": { + "@angular/core": { + "optional": true + } } }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "node_modules/@angular/compiler-cli": { + "version": "18.2.10", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.10.tgz", + "integrity": "sha512-CNFStKWMB89MFKAZZFUOhoQi+fHqRLgNOOrI73LjizXixvngEh3BDZJRtK9hbSGG+giujBrummEA60CWAw69MA==", "dev": true, + "license": "MIT", "dependencies": { - "lru-cache": "^6.0.0" + "@babel/core": "7.25.2", + "@jridgewell/sourcemap-codec": "^1.4.14", + "chokidar": "^4.0.0", + "convert-source-map": "^1.5.1", + "reflect-metadata": "^0.2.0", + "semver": "^7.0.0", + "tslib": "^2.3.0", + "yargs": "^17.2.1" }, "bin": { - "semver": "bin/semver.js" + "ng-xi18n": "bundles/src/bin/ng_xi18n.js", + "ngc": "bundles/src/bin/ngc.js", + "ngcc": "bundles/ngcc/index.js" }, "engines": { - "node": ">=10" + "node": "^18.19.1 || ^20.11.1 || >=22.0.0" + }, + "peerDependencies": { + "@angular/compiler": "18.2.10", + "typescript": ">=5.4 <5.6" } }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz", - "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==", + "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, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/visitor-keys": "7.2.0" + "readdirp": "^4.0.1" }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": ">= 14.16.0" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz", - "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==", + "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, + "license": "MIT", "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": ">= 14.16.0" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz", - "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==", - "dev": true, + "node_modules/@angular/core": { + "version": "18.2.10", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.10.tgz", + "integrity": "sha512-EfxVz0pLaxnOppOYkdhnaUkk8HZT+uxaAGpJD3ppAa7YAWTE9xIGoNJmtS33cZNNOnvriMkdv7yn6pDtV4ct+Q==", + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/visitor-keys": "7.2.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "minimatch": "9.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" + "tslib": "^2.3.0" }, "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "peerDependencies": { + "rxjs": "^6.5.3 || ^7.4.0", + "zone.js": "~0.14.10" } }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz", - "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==", - "dev": true, + "node_modules/@angular/forms": { + "version": "18.2.10", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.10.tgz", + "integrity": "sha512-2VprGB+enJIeqfz2oALmP/G/UiFzpZW6PHgyZXhk/0J/UMsa26JoYxwDFvfdm/WGTrB+VaQEG7in5xwiFPAFtQ==", + "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "7.2.0", - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/typescript-estree": "7.2.0", - "semver": "^7.5.4" + "tslib": "^2.3.0" }, "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "eslint": "^8.56.0" + "@angular/common": "18.2.10", + "@angular/core": "18.2.10", + "@angular/platform-browser": "18.2.10", + "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz", - "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==", + "node_modules/@angular/language-service": { + "version": "18.2.10", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.10.tgz", + "integrity": "sha512-V5yslbkFrBhGr70yK7Bauk8186Di9W8OQtR41fEvPEHecQ5IWjnXzPabl0rjOPtpcAARAYnbIq3sqjQygiX6fw==", "dev": true, - "dependencies": { - "@typescript-eslint/types": "7.2.0", - "eslint-visitor-keys": "^3.4.1" - }, + "license": "MIT", "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": "^18.19.1 || ^20.11.1 || >=22.0.0" } }, - "node_modules/@angular-eslint/eslint-plugin/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, + "node_modules/@angular/material": { + "version": "18.2.11", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.11.tgz", + "integrity": "sha512-VPfnpwmg6p5DsH1UMfOXjKA+qAbUx6nyinGWpx4+ntr/T1oEhRk5CnoOtVS0Xk0rnRSbEF6ayjDBH2YPR9ol3A==", + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/animations": "^18.0.0 || ^19.0.0", + "@angular/cdk": "18.2.11", + "@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", + "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, + "node_modules/@angular/platform-browser": { + "version": "18.2.10", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.10.tgz", + "integrity": "sha512-zKyRKFr3AaEA4SE/DEeb5FWHJutT26avHZog6ZGDkMeMN12zMtSqjPuTSgmDXCWleoOkzbb+nhAQ+fK/EyGyPA==", + "license": "MIT", "dependencies": { - "brace-expansion": "^2.0.1" + "tslib": "^2.3.0" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "peerDependencies": { + "@angular/animations": "18.2.10", + "@angular/common": "18.2.10", + "@angular/core": "18.2.10" + }, + "peerDependenciesMeta": { + "@angular/animations": { + "optional": true + } } }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, + "node_modules/@angular/platform-browser-dynamic": { + "version": "18.2.10", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.10.tgz", + "integrity": "sha512-syKyOTgfQnMxfpDRP1khTSPZ5dsMgA8YQwNF6KsB3eZQl15CKSka7bzjMOUWeZ8M3WShOp1AzTf0MfwNeh0UBA==", + "license": "MIT", "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" + "tslib": "^2.3.0" }, "engines": { - "node": ">=10" - } - }, - "node_modules/@angular-eslint/schematics": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-17.3.0.tgz", - "integrity": "sha512-5yssd5EOomxlKt9vN/OXXCTCuI3Pmfj16pkjBDoW0wzC8/M2l5zlXIEfoKumHYv2wtF553LhaMXVYVU35e0lTw==", - "dev": true, - "dependencies": { - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@nx/devkit": "^17.2.8 || ^18.0.0", - "ignore": "5.3.1", - "nx": "^17.2.8 || ^18.0.0", - "strip-json-comments": "3.1.1", - "tmp": "0.2.3" + "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/cli": ">= 17.0.0 < 18.0.0" + "@angular/common": "18.2.10", + "@angular/compiler": "18.2.10", + "@angular/core": "18.2.10", + "@angular/platform-browser": "18.2.10" } }, - "node_modules/@angular-eslint/template-parser": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-17.3.0.tgz", - "integrity": "sha512-m+UzAnWgtjeS0x6skSmR0eXltD/p7HZA+c8pPyAkiHQzkxE7ohhfyZc03yWGuYJvWQUqQAKKdO/nQop14TP0bg==", - "dev": true, + "node_modules/@angular/platform-server": { + "version": "18.2.10", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-18.2.10.tgz", + "integrity": "sha512-vewG3K03uLmxmHyjQivzIxvCBQ334hO33vC1rFZpbe3TX+rpVg7FYmz9ArdTgwbuxMSvImrcBWIYs8m/ZpKs9Q==", + "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "17.3.0", - "eslint-scope": "^8.0.0" + "tslib": "^2.3.0", + "xhr2": "^0.2.0" + }, + "engines": { + "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "eslint": "^7.20.0 || ^8.0.0", - "typescript": "*" + "@angular/animations": "18.2.10", + "@angular/common": "18.2.10", + "@angular/compiler": "18.2.10", + "@angular/core": "18.2.10", + "@angular/platform-browser": "18.2.10" } }, - "node_modules/@angular-eslint/template-parser/node_modules/eslint-scope": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.0.tgz", - "integrity": "sha512-zj3Byw6jX4TcFCJmxOzLt6iol5FAr9xQyZZSQjEzW2UiCJXLwXdRIKCYVFftnpZckaC9Ps9xlC7jB8tSeWWOaw==", - "dev": true, + "node_modules/@angular/router": { + "version": "18.2.10", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.10.tgz", + "integrity": "sha512-ZqJgOGOfvW0epsc7pIo7DffZqYHo3O9aUCVepZAhOxqtjF/sfhX2fy+A0xopTIiR0eM3LrT823V+2hjlBHj+CA==", + "license": "MIT", "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" + "tslib": "^2.3.0" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, - "funding": { - "url": "https://opencollective.com/eslint" + "peerDependencies": { + "@angular/common": "18.2.10", + "@angular/core": "18.2.10", + "@angular/platform-browser": "18.2.10", + "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/@angular-eslint/template-parser/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, + "node_modules/@angular/service-worker": { + "version": "18.2.10", + "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-18.2.10.tgz", + "integrity": "sha512-hfZ5XqsmtZg5HdHoPFORAzGV0uX1DcZ894op79i4lp6HOoIgYMQ+ajB6Fa7HVUdXS3esFUc2iw4nBgSR0ZssCg==", + "license": "MIT", + "dependencies": { + "tslib": "^2.3.0" + }, + "bin": { + "ngsw-config": "ngsw-config.js" + }, "engines": { - "node": ">=4.0" + "node": "^18.19.1 || ^20.11.1 || >=22.0.0" + }, + "peerDependencies": { + "@angular/common": "18.2.10", + "@angular/core": "18.2.10" } }, - "node_modules/@angular-eslint/utils": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-17.3.0.tgz", - "integrity": "sha512-PJT9pxWqpvI9OXO+7L5SIVhvMW+RFjeafC7PYjtvSbNFpz+kF644BiAcfMJ0YqBnkrw3JXt+RAX25CT4mXIoXw==", - "dev": true, + "node_modules/@angular/youtube-player": { + "version": "18.2.11", + "resolved": "https://registry.npmjs.org/@angular/youtube-player/-/youtube-player-18.2.11.tgz", + "integrity": "sha512-kptoPRD2NzD8RXrN3KZd4G3LX0Ja8N/eqC/5Kb6l03KzuKF0uMkVcxEDZPx3CMTC/nkj+jWzTbQ+ZgNaqb+Mzw==", + "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "17.3.0", - "@typescript-eslint/utils": "7.2.0" + "@types/youtube": "^0.0.50", + "tslib": "^2.3.0" }, "peerDependencies": { - "eslint": "^7.20.0 || ^8.0.0", - "typescript": "*" + "@angular/common": "^18.0.0 || ^19.0.0", + "@angular/core": "^18.0.0 || ^19.0.0", + "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/scope-manager": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz", - "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==", - "dev": true, + "node_modules/@aws-crypto/crc32": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz", + "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==", + "license": "Apache-2.0", "dependencies": { - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/visitor-keys": "7.2.0" + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "tslib": "^2.6.2" }, "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": ">=16.0.0" } }, - "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/types": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz", - "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==", - "dev": true, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node_modules/@aws-crypto/crc32c": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz", + "integrity": "sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "tslib": "^2.6.2" } }, - "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz", - "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==", - "dev": true, + "node_modules/@aws-crypto/sha1-browser": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz", + "integrity": "sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==", + "license": "Apache-2.0", "dependencies": { - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/visitor-keys": "7.2.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "minimatch": "9.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" + "@aws-crypto/supports-web-crypto": "^5.2.0", + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "@aws-sdk/util-locate-window": "^3.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@aws-crypto/sha1-browser/node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" }, "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "node": ">=14.0.0" } }, - "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/utils": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz", - "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==", - "dev": true, + "node_modules/@aws-crypto/sha1-browser/node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "license": "Apache-2.0", "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "7.2.0", - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/typescript-estree": "7.2.0", - "semver": "^7.5.4" + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" }, "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.56.0" + "node": ">=14.0.0" } }, - "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz", - "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==", - "dev": true, + "node_modules/@aws-crypto/sha1-browser/node_modules/@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "license": "Apache-2.0", "dependencies": { - "@typescript-eslint/types": "7.2.0", - "eslint-visitor-keys": "^3.4.1" + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" }, "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": ">=14.0.0" } }, - "node_modules/@angular-eslint/utils/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, + "node_modules/@aws-crypto/sha256-browser": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz", + "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==", + "license": "Apache-2.0", "dependencies": { - "balanced-match": "^1.0.0" + "@aws-crypto/sha256-js": "^5.2.0", + "@aws-crypto/supports-web-crypto": "^5.2.0", + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "@aws-sdk/util-locate-window": "^3.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" } }, - "node_modules/@angular-eslint/utils/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "license": "Apache-2.0", "dependencies": { - "brace-expansion": "^2.0.1" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=14.0.0" } }, - "node_modules/@angular-eslint/utils/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "license": "Apache-2.0", "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=10" + "node": ">=14.0.0" } }, - "node_modules/@angular/animations": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.7.tgz", - "integrity": "sha512-ahenGALPPweeHgqtl9BMkGIAV4fUNI5kOWUrLNbKBfwIJN+aOBOYV1Jz6NKUQq6eYn/1ZYtm0f3lIkHIdtLKEw==", + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" }, "engines": { - "node": "^18.13.0 || >=20.9.0" - }, - "peerDependencies": { - "@angular/core": "17.3.7" + "node": ">=14.0.0" } }, - "node_modules/@angular/cdk": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-17.3.7.tgz", - "integrity": "sha512-aFEh8tzKFOwini6aNEp57S54Ocp9T7YIJfBVMESptu2TCPdMTlJ1HJTg5XS8NcQO+vwi9cFPGVwGF1frOx4LXA==", + "node_modules/@aws-crypto/sha256-js": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz", + "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" - }, - "optionalDependencies": { - "parse5": "^7.1.2" + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "tslib": "^2.6.2" }, - "peerDependencies": { - "@angular/common": "^17.0.0 || ^18.0.0", - "@angular/core": "^17.0.0 || ^18.0.0", - "rxjs": "^6.5.3 || ^7.4.0" + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@angular/cli": { - "version": "17.3.6", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.3.6.tgz", - "integrity": "sha512-poKaRPeI+hFqX+AxIaEriaIggFVcC3XqlT9E1/uBC2rfHirE1n5F9Z7xqEDtMHduKwLbNXhQIPoKIKya8+Hnew==", - "dev": true, + "node_modules/@aws-crypto/supports-web-crypto": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz", + "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==", + "license": "Apache-2.0", "dependencies": { - "@angular-devkit/architect": "0.1703.6", - "@angular-devkit/core": "17.3.6", - "@angular-devkit/schematics": "17.3.6", - "@schematics/angular": "17.3.6", - "@yarnpkg/lockfile": "1.1.0", - "ansi-colors": "4.1.3", - "ini": "4.1.2", - "inquirer": "9.2.15", - "jsonc-parser": "3.2.1", - "npm-package-arg": "11.0.1", - "npm-pick-manifest": "9.0.0", - "open": "8.4.2", - "ora": "5.4.1", - "pacote": "17.0.6", - "resolve": "1.22.8", - "semver": "7.6.0", - "symbol-observable": "4.0.0", - "yargs": "17.7.2" - }, - "bin": { - "ng": "bin/ng.js" - }, - "engines": { - "node": "^18.13.0 || >=20.9.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - } - }, - "node_modules/@angular/cli/node_modules/jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", - "dev": true - }, - "node_modules/@angular/cli/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@angular/common": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-17.3.7.tgz", - "integrity": "sha512-A7LRJu1vVCGGgrfZXjU+njz50SiU4weheKCar5PIUprcdIofS1IrHAJDqYh+kwXxkjXbZMOr/ijQY0+AESLEsw==", - "dependencies": { - "tslib": "^2.3.0" - }, - "engines": { - "node": "^18.13.0 || >=20.9.0" - }, - "peerDependencies": { - "@angular/core": "17.3.7", - "rxjs": "^6.5.3 || ^7.4.0" - } - }, - "node_modules/@angular/compiler": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-17.3.7.tgz", - "integrity": "sha512-AlKiqPoxnrpQ0hn13fIaQPSVodaVAIjBW4vpFyuKFqs2LBKg6iolwZ21s8rEI0KR2gXl+8ugj0/UZ6YADiVM5w==", - "dependencies": { - "tslib": "^2.3.0" - }, - "engines": { - "node": "^18.13.0 || >=20.9.0" - }, - "peerDependencies": { - "@angular/core": "17.3.7" - }, - "peerDependenciesMeta": { - "@angular/core": { - "optional": true - } - } - }, - "node_modules/@angular/compiler-cli": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-17.3.7.tgz", - "integrity": "sha512-vSg5IQZ9jGmvYjpbfH8KbH4Sl1IVeE+Mr1ogcxkGEsURSRvKo7EWc0K7LSEI9+gg0VLamMiP9EyCJdPxiJeLJQ==", - "dev": true, - "dependencies": { - "@babel/core": "7.23.9", - "@jridgewell/sourcemap-codec": "^1.4.14", - "chokidar": "^3.0.0", - "convert-source-map": "^1.5.1", - "reflect-metadata": "^0.2.0", - "semver": "^7.0.0", - "tslib": "^2.3.0", - "yargs": "^17.2.1" - }, - "bin": { - "ng-xi18n": "bundles/src/bin/ng_xi18n.js", - "ngc": "bundles/src/bin/ngc.js", - "ngcc": "bundles/ngcc/index.js" - }, - "engines": { - "node": "^18.13.0 || >=20.9.0" - }, - "peerDependencies": { - "@angular/compiler": "17.3.7", - "typescript": ">=5.2 <5.5" - } - }, - "node_modules/@angular/core": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-17.3.7.tgz", - "integrity": "sha512-HWcrbxqnvIMSxFuQdN0KPt08bc87hqr0LKm89yuRTUwx/2sNJlNQUobk6aJj4trswGBttcRDT+GOS4DQP2Nr4g==", - "dependencies": { - "tslib": "^2.3.0" - }, - "engines": { - "node": "^18.13.0 || >=20.9.0" - }, - "peerDependencies": { - "rxjs": "^6.5.3 || ^7.4.0", - "zone.js": "~0.14.0" - } - }, - "node_modules/@angular/forms": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-17.3.7.tgz", - "integrity": "sha512-FEhXh/VmT++XCoO8i7bBtzxG7Am/cE1zrr9aF+fWW+4jpWvJvVN1IaSiJxgBB+iPsOJ9lTBRwfRW3onlcDkhrw==", - "dependencies": { - "tslib": "^2.3.0" - }, - "engines": { - "node": "^18.13.0 || >=20.9.0" - }, - "peerDependencies": { - "@angular/common": "17.3.7", - "@angular/core": "17.3.7", - "@angular/platform-browser": "17.3.7", - "rxjs": "^6.5.3 || ^7.4.0" - } - }, - "node_modules/@angular/language-service": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-17.3.7.tgz", - "integrity": "sha512-mt/Q2Hp4B0vFbOp+L709sN0zQRD0Cojfneo6XrHHHRYWpHuaQUhaWGp2ney7X6BgwqMubpxSWb0+5f0R6GRgjw==", - "dev": true, - "engines": { - "node": "^18.13.0 || >=20.9.0" - } - }, - "node_modules/@angular/material": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-17.3.7.tgz", - "integrity": "sha512-wjSKkk9KZE8QiBPkMd5axh5u/3pUSxoLKNO7OasFhEagMmSv5oYTLm40cErhtb4UdkSmbC19WuuluS6P3leoPA==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/auto-init": "15.0.0-canary.7f224ddd4.0", - "@material/banner": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/button": "15.0.0-canary.7f224ddd4.0", - "@material/card": "15.0.0-canary.7f224ddd4.0", - "@material/checkbox": "15.0.0-canary.7f224ddd4.0", - "@material/chips": "15.0.0-canary.7f224ddd4.0", - "@material/circular-progress": "15.0.0-canary.7f224ddd4.0", - "@material/data-table": "15.0.0-canary.7f224ddd4.0", - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/dialog": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/drawer": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/fab": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/floating-label": "15.0.0-canary.7f224ddd4.0", - "@material/form-field": "15.0.0-canary.7f224ddd4.0", - "@material/icon-button": "15.0.0-canary.7f224ddd4.0", - "@material/image-list": "15.0.0-canary.7f224ddd4.0", - "@material/layout-grid": "15.0.0-canary.7f224ddd4.0", - "@material/line-ripple": "15.0.0-canary.7f224ddd4.0", - "@material/linear-progress": "15.0.0-canary.7f224ddd4.0", - "@material/list": "15.0.0-canary.7f224ddd4.0", - "@material/menu": "15.0.0-canary.7f224ddd4.0", - "@material/menu-surface": "15.0.0-canary.7f224ddd4.0", - "@material/notched-outline": "15.0.0-canary.7f224ddd4.0", - "@material/radio": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/segmented-button": "15.0.0-canary.7f224ddd4.0", - "@material/select": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/slider": "15.0.0-canary.7f224ddd4.0", - "@material/snackbar": "15.0.0-canary.7f224ddd4.0", - "@material/switch": "15.0.0-canary.7f224ddd4.0", - "@material/tab": "15.0.0-canary.7f224ddd4.0", - "@material/tab-bar": "15.0.0-canary.7f224ddd4.0", - "@material/tab-indicator": "15.0.0-canary.7f224ddd4.0", - "@material/tab-scroller": "15.0.0-canary.7f224ddd4.0", - "@material/textfield": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tooltip": "15.0.0-canary.7f224ddd4.0", - "@material/top-app-bar": "15.0.0-canary.7f224ddd4.0", - "@material/touch-target": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.3.0" - }, - "peerDependencies": { - "@angular/animations": "^17.0.0 || ^18.0.0", - "@angular/cdk": "17.3.7", - "@angular/common": "^17.0.0 || ^18.0.0", - "@angular/core": "^17.0.0 || ^18.0.0", - "@angular/forms": "^17.0.0 || ^18.0.0", - "@angular/platform-browser": "^17.0.0 || ^18.0.0", - "rxjs": "^6.5.3 || ^7.4.0" - } - }, - "node_modules/@angular/platform-browser": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.7.tgz", - "integrity": "sha512-Nn8ZMaftAvO9dEwribWdNv+QBHhYIBrRkv85G6et80AXfXoYAr/xcfnQECRFtZgPmANqHC5auv/xrmExQG+Yeg==", - "dependencies": { - "tslib": "^2.3.0" - }, - "engines": { - "node": "^18.13.0 || >=20.9.0" - }, - "peerDependencies": { - "@angular/animations": "17.3.7", - "@angular/common": "17.3.7", - "@angular/core": "17.3.7" - }, - "peerDependenciesMeta": { - "@angular/animations": { - "optional": true - } + "tslib": "^2.6.2" } }, - "node_modules/@angular/platform-browser-dynamic": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.7.tgz", - "integrity": "sha512-9c2I4u0L1p2v1/lW8qy+WaNHisUWbyy6wqsv2v9FfCaSM49Lxymgo9LPFPC4qEG5ei5nE+eIQ2ocRiXXsf5QkQ==", + "node_modules/@aws-crypto/util": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz", + "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" - }, - "engines": { - "node": "^18.13.0 || >=20.9.0" - }, - "peerDependencies": { - "@angular/common": "17.3.7", - "@angular/compiler": "17.3.7", - "@angular/core": "17.3.7", - "@angular/platform-browser": "17.3.7" + "@aws-sdk/types": "^3.222.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" } }, - "node_modules/@angular/platform-server": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-17.3.7.tgz", - "integrity": "sha512-jrDDgU2znawP7O0DfWkH2dYttMiIEhlecy+yF2aWqvS4a0thbWNIcZZk0GVy03S2Lft8AmRICZjrCpwRX0E7ew==", + "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0", - "xhr2": "^0.2.0" + "tslib": "^2.6.2" }, "engines": { - "node": "^18.13.0 || >=20.9.0" - }, - "peerDependencies": { - "@angular/animations": "17.3.7", - "@angular/common": "17.3.7", - "@angular/compiler": "17.3.7", - "@angular/core": "17.3.7", - "@angular/platform-browser": "17.3.7" + "node": ">=14.0.0" } }, - "node_modules/@angular/router": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-17.3.7.tgz", - "integrity": "sha512-lMkuRrc1ZjP5JPDxNHqoAhB0uAnfPQ/q6mJrw1s8IZoVV6VyM+FxR5r13ajNcXWC38xy/YhBjpXPF1vBdxuLXg==", + "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" }, "engines": { - "node": "^18.13.0 || >=20.9.0" - }, - "peerDependencies": { - "@angular/common": "17.3.7", - "@angular/core": "17.3.7", - "@angular/platform-browser": "17.3.7", - "rxjs": "^6.5.3 || ^7.4.0" + "node": ">=14.0.0" } }, - "node_modules/@angular/service-worker": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-17.3.7.tgz", - "integrity": "sha512-x09Mr0QarAgGusG8Hei6cqBd0tEG9sWaSxp29yvSemAkuG9APewm1WJk0RnuDmjIB7g1Z+FQlZfe+Lo/zyms6A==", + "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" - }, - "bin": { - "ngsw-config": "ngsw-config.js" + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" }, "engines": { - "node": "^18.13.0 || >=20.9.0" - }, - "peerDependencies": { - "@angular/common": "17.3.7", - "@angular/core": "17.3.7" - } - }, - "node_modules/@angular/youtube-player": { - "version": "17.3.7", - "resolved": "https://registry.npmjs.org/@angular/youtube-player/-/youtube-player-17.3.7.tgz", - "integrity": "sha512-VLzp6MuaF60Gf0m/hcDihOP49dDiS6f7PW8y2vst3V6YvooS+/xyldp4o94ihIOJv9hiTpLa3dkXGey3jlZFTw==", - "dependencies": { - "@types/youtube": "^0.0.42", - "tslib": "^2.3.0" - }, - "peerDependencies": { - "@angular/common": "^17.0.0 || ^18.0.0", - "@angular/core": "^17.0.0 || ^18.0.0", - "rxjs": "^6.5.3 || ^7.4.0" - } - }, - "node_modules/@aws-crypto/crc32": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz", - "integrity": "sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==", - "dependencies": { - "@aws-crypto/util": "^3.0.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^1.11.1" - } - }, - "node_modules/@aws-crypto/crc32/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@aws-crypto/crc32c": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-3.0.0.tgz", - "integrity": "sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==", - "dependencies": { - "@aws-crypto/util": "^3.0.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^1.11.1" - } - }, - "node_modules/@aws-crypto/crc32c/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@aws-crypto/ie11-detection": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz", - "integrity": "sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==", - "dependencies": { - "tslib": "^1.11.1" - } - }, - "node_modules/@aws-crypto/ie11-detection/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@aws-crypto/sha1-browser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-3.0.0.tgz", - "integrity": "sha512-NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==", - "dependencies": { - "@aws-crypto/ie11-detection": "^3.0.0", - "@aws-crypto/supports-web-crypto": "^3.0.0", - "@aws-crypto/util": "^3.0.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" - } - }, - "node_modules/@aws-crypto/sha1-browser/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@aws-crypto/sha256-browser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz", - "integrity": "sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==", - "dependencies": { - "@aws-crypto/ie11-detection": "^3.0.0", - "@aws-crypto/sha256-js": "^3.0.0", - "@aws-crypto/supports-web-crypto": "^3.0.0", - "@aws-crypto/util": "^3.0.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" - } - }, - "node_modules/@aws-crypto/sha256-browser/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@aws-crypto/sha256-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz", - "integrity": "sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==", - "dependencies": { - "@aws-crypto/util": "^3.0.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^1.11.1" - } - }, - "node_modules/@aws-crypto/sha256-js/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@aws-crypto/supports-web-crypto": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz", - "integrity": "sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==", - "dependencies": { - "tslib": "^1.11.1" - } - }, - "node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@aws-crypto/util": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz", - "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==", - "dependencies": { - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" + "node": ">=14.0.0" } }, - "node_modules/@aws-crypto/util/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/@aws-sdk/client-s3": { - "version": "3.569.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.569.0.tgz", - "integrity": "sha512-J+iE1t++9RsqKUidGL/9sOS/NhO7SZBJQGDZq2MilO7pHqo6l2tPUv+hNnIPmmO2D+jfktj/s2Uugxs6xQmv2A==", - "dependencies": { - "@aws-crypto/sha1-browser": "3.0.0", - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.569.0", - "@aws-sdk/client-sts": "3.569.0", - "@aws-sdk/core": "3.567.0", - "@aws-sdk/credential-provider-node": "3.569.0", - "@aws-sdk/middleware-bucket-endpoint": "3.568.0", - "@aws-sdk/middleware-expect-continue": "3.567.0", - "@aws-sdk/middleware-flexible-checksums": "3.567.0", - "@aws-sdk/middleware-host-header": "3.567.0", - "@aws-sdk/middleware-location-constraint": "3.567.0", - "@aws-sdk/middleware-logger": "3.568.0", - "@aws-sdk/middleware-recursion-detection": "3.567.0", - "@aws-sdk/middleware-sdk-s3": "3.569.0", - "@aws-sdk/middleware-signing": "3.567.0", - "@aws-sdk/middleware-ssec": "3.567.0", - "@aws-sdk/middleware-user-agent": "3.567.0", - "@aws-sdk/region-config-resolver": "3.567.0", - "@aws-sdk/signature-v4-multi-region": "3.569.0", - "@aws-sdk/types": "3.567.0", - "@aws-sdk/util-endpoints": "3.567.0", - "@aws-sdk/util-user-agent-browser": "3.567.0", - "@aws-sdk/util-user-agent-node": "3.568.0", - "@aws-sdk/xml-builder": "3.567.0", - "@smithy/config-resolver": "^2.2.0", - "@smithy/core": "^1.4.2", - "@smithy/eventstream-serde-browser": "^2.2.0", - "@smithy/eventstream-serde-config-resolver": "^2.2.0", - "@smithy/eventstream-serde-node": "^2.2.0", - "@smithy/fetch-http-handler": "^2.5.0", - "@smithy/hash-blob-browser": "^2.2.0", - "@smithy/hash-node": "^2.2.0", - "@smithy/hash-stream-node": "^2.2.0", - "@smithy/invalid-dependency": "^2.2.0", - "@smithy/md5-js": "^2.2.0", - "@smithy/middleware-content-length": "^2.2.0", - "@smithy/middleware-endpoint": "^2.5.1", - "@smithy/middleware-retry": "^2.3.1", - "@smithy/middleware-serde": "^2.3.0", - "@smithy/middleware-stack": "^2.2.0", - "@smithy/node-config-provider": "^2.3.0", - "@smithy/node-http-handler": "^2.5.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", - "@smithy/url-parser": "^2.2.0", - "@smithy/util-base64": "^2.3.0", - "@smithy/util-body-length-browser": "^2.2.0", - "@smithy/util-body-length-node": "^2.3.0", - "@smithy/util-defaults-mode-browser": "^2.2.1", - "@smithy/util-defaults-mode-node": "^2.3.1", - "@smithy/util-endpoints": "^1.2.0", - "@smithy/util-retry": "^2.2.0", - "@smithy/util-stream": "^2.2.0", - "@smithy/util-utf8": "^2.3.0", - "@smithy/util-waiter": "^2.2.0", + "version": "3.637.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.637.0.tgz", + "integrity": "sha512-y6UC94fsMvhKbf0dzfnjVP1HePeGjplfcYfilZU1COIJLyTkMcUv4XcT4I407CGIrvgEafONHkiC09ygqUauNA==", + "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.637.0", + "@aws-sdk/client-sts": "3.637.0", + "@aws-sdk/core": "3.635.0", + "@aws-sdk/credential-provider-node": "3.637.0", + "@aws-sdk/middleware-bucket-endpoint": "3.620.0", + "@aws-sdk/middleware-expect-continue": "3.620.0", + "@aws-sdk/middleware-flexible-checksums": "3.620.0", + "@aws-sdk/middleware-host-header": "3.620.0", + "@aws-sdk/middleware-location-constraint": "3.609.0", + "@aws-sdk/middleware-logger": "3.609.0", + "@aws-sdk/middleware-recursion-detection": "3.620.0", + "@aws-sdk/middleware-sdk-s3": "3.635.0", + "@aws-sdk/middleware-ssec": "3.609.0", + "@aws-sdk/middleware-user-agent": "3.637.0", + "@aws-sdk/region-config-resolver": "3.614.0", + "@aws-sdk/signature-v4-multi-region": "3.635.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.637.0", + "@aws-sdk/util-user-agent-browser": "3.609.0", + "@aws-sdk/util-user-agent-node": "3.614.0", + "@aws-sdk/xml-builder": "3.609.0", + "@smithy/config-resolver": "^3.0.5", + "@smithy/core": "^2.4.0", + "@smithy/eventstream-serde-browser": "^3.0.6", + "@smithy/eventstream-serde-config-resolver": "^3.0.3", + "@smithy/eventstream-serde-node": "^3.0.5", + "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/hash-blob-browser": "^3.1.2", + "@smithy/hash-node": "^3.0.3", + "@smithy/hash-stream-node": "^3.1.2", + "@smithy/invalid-dependency": "^3.0.3", + "@smithy/md5-js": "^3.0.3", + "@smithy/middleware-content-length": "^3.0.5", + "@smithy/middleware-endpoint": "^3.1.0", + "@smithy/middleware-retry": "^3.0.15", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/node-http-handler": "^3.1.4", + "@smithy/protocol-http": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@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.15", + "@smithy/util-defaults-mode-node": "^3.0.15", + "@smithy/util-endpoints": "^2.0.5", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", + "@smithy/util-stream": "^3.1.3", + "@smithy/util-utf8": "^3.0.0", + "@smithy/util-waiter": "^3.1.2", "tslib": "^2.6.2" }, "engines": { @@ -1552,47 +1298,48 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.568.0.tgz", - "integrity": "sha512-LSD7k0ZBQNWouTN5dYpUkeestoQ+r5u6cp6o+FATKeiFQET85RNA3xJ4WPnOI5rBC1PETKhQXvF44863P3hCaQ==", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/core": "3.567.0", - "@aws-sdk/middleware-host-header": "3.567.0", - "@aws-sdk/middleware-logger": "3.568.0", - "@aws-sdk/middleware-recursion-detection": "3.567.0", - "@aws-sdk/middleware-user-agent": "3.567.0", - "@aws-sdk/region-config-resolver": "3.567.0", - "@aws-sdk/types": "3.567.0", - "@aws-sdk/util-endpoints": "3.567.0", - "@aws-sdk/util-user-agent-browser": "3.567.0", - "@aws-sdk/util-user-agent-node": "3.568.0", - "@smithy/config-resolver": "^2.2.0", - "@smithy/core": "^1.4.2", - "@smithy/fetch-http-handler": "^2.5.0", - "@smithy/hash-node": "^2.2.0", - "@smithy/invalid-dependency": "^2.2.0", - "@smithy/middleware-content-length": "^2.2.0", - "@smithy/middleware-endpoint": "^2.5.1", - "@smithy/middleware-retry": "^2.3.1", - "@smithy/middleware-serde": "^2.3.0", - "@smithy/middleware-stack": "^2.2.0", - "@smithy/node-config-provider": "^2.3.0", - "@smithy/node-http-handler": "^2.5.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", - "@smithy/url-parser": "^2.2.0", - "@smithy/util-base64": "^2.3.0", - "@smithy/util-body-length-browser": "^2.2.0", - "@smithy/util-body-length-node": "^2.3.0", - "@smithy/util-defaults-mode-browser": "^2.2.1", - "@smithy/util-defaults-mode-node": "^2.3.1", - "@smithy/util-endpoints": "^1.2.0", - "@smithy/util-middleware": "^2.2.0", - "@smithy/util-retry": "^2.2.0", - "@smithy/util-utf8": "^2.3.0", + "version": "3.637.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.637.0.tgz", + "integrity": "sha512-+KjLvgX5yJYROWo3TQuwBJlHCY0zz9PsLuEolmXQn0BVK1L/m9GteZHtd+rEdAoDGBpE0Xqjy1oz5+SmtsaRUw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.635.0", + "@aws-sdk/middleware-host-header": "3.620.0", + "@aws-sdk/middleware-logger": "3.609.0", + "@aws-sdk/middleware-recursion-detection": "3.620.0", + "@aws-sdk/middleware-user-agent": "3.637.0", + "@aws-sdk/region-config-resolver": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.637.0", + "@aws-sdk/util-user-agent-browser": "3.609.0", + "@aws-sdk/util-user-agent-node": "3.614.0", + "@smithy/config-resolver": "^3.0.5", + "@smithy/core": "^2.4.0", + "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/hash-node": "^3.0.3", + "@smithy/invalid-dependency": "^3.0.3", + "@smithy/middleware-content-length": "^3.0.5", + "@smithy/middleware-endpoint": "^3.1.0", + "@smithy/middleware-retry": "^3.0.15", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/node-http-handler": "^3.1.4", + "@smithy/protocol-http": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@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.15", + "@smithy/util-defaults-mode-node": "^3.0.15", + "@smithy/util-endpoints": "^2.0.5", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { @@ -1600,99 +1347,103 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.569.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.569.0.tgz", - "integrity": "sha512-u5DEjNEvRvlKKh1QLCDuQ8GIrx+OFvJFLfhorsp4oCxDylvORs+KfyKKnJAw4wYEEHyxyz9GzHD7p6a8+HLVHw==", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.569.0", - "@aws-sdk/core": "3.567.0", - "@aws-sdk/credential-provider-node": "3.569.0", - "@aws-sdk/middleware-host-header": "3.567.0", - "@aws-sdk/middleware-logger": "3.568.0", - "@aws-sdk/middleware-recursion-detection": "3.567.0", - "@aws-sdk/middleware-user-agent": "3.567.0", - "@aws-sdk/region-config-resolver": "3.567.0", - "@aws-sdk/types": "3.567.0", - "@aws-sdk/util-endpoints": "3.567.0", - "@aws-sdk/util-user-agent-browser": "3.567.0", - "@aws-sdk/util-user-agent-node": "3.568.0", - "@smithy/config-resolver": "^2.2.0", - "@smithy/core": "^1.4.2", - "@smithy/fetch-http-handler": "^2.5.0", - "@smithy/hash-node": "^2.2.0", - "@smithy/invalid-dependency": "^2.2.0", - "@smithy/middleware-content-length": "^2.2.0", - "@smithy/middleware-endpoint": "^2.5.1", - "@smithy/middleware-retry": "^2.3.1", - "@smithy/middleware-serde": "^2.3.0", - "@smithy/middleware-stack": "^2.2.0", - "@smithy/node-config-provider": "^2.3.0", - "@smithy/node-http-handler": "^2.5.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", - "@smithy/url-parser": "^2.2.0", - "@smithy/util-base64": "^2.3.0", - "@smithy/util-body-length-browser": "^2.2.0", - "@smithy/util-body-length-node": "^2.3.0", - "@smithy/util-defaults-mode-browser": "^2.2.1", - "@smithy/util-defaults-mode-node": "^2.3.1", - "@smithy/util-endpoints": "^1.2.0", - "@smithy/util-middleware": "^2.2.0", - "@smithy/util-retry": "^2.2.0", - "@smithy/util-utf8": "^2.3.0", + "version": "3.637.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.637.0.tgz", + "integrity": "sha512-27bHALN6Qb6m6KZmPvRieJ/QRlj1lyac/GT2Rn5kJpre8Mpp+yxrtvp3h9PjNBty4lCeFEENfY4dGNSozBuBcw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.635.0", + "@aws-sdk/credential-provider-node": "3.637.0", + "@aws-sdk/middleware-host-header": "3.620.0", + "@aws-sdk/middleware-logger": "3.609.0", + "@aws-sdk/middleware-recursion-detection": "3.620.0", + "@aws-sdk/middleware-user-agent": "3.637.0", + "@aws-sdk/region-config-resolver": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.637.0", + "@aws-sdk/util-user-agent-browser": "3.609.0", + "@aws-sdk/util-user-agent-node": "3.614.0", + "@smithy/config-resolver": "^3.0.5", + "@smithy/core": "^2.4.0", + "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/hash-node": "^3.0.3", + "@smithy/invalid-dependency": "^3.0.3", + "@smithy/middleware-content-length": "^3.0.5", + "@smithy/middleware-endpoint": "^3.1.0", + "@smithy/middleware-retry": "^3.0.15", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/node-http-handler": "^3.1.4", + "@smithy/protocol-http": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@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.15", + "@smithy/util-defaults-mode-node": "^3.0.15", + "@smithy/util-endpoints": "^2.0.5", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.637.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.569.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.569.0.tgz", - "integrity": "sha512-3AyipQ2zHszkcTr8n1Sp7CiMUi28aMf1vOhEo0KKi0DWGo1Z1qJEpWeRP363KG0n9/8U3p1IkXGz5FRbpXZxIw==", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.569.0", - "@aws-sdk/core": "3.567.0", - "@aws-sdk/credential-provider-node": "3.569.0", - "@aws-sdk/middleware-host-header": "3.567.0", - "@aws-sdk/middleware-logger": "3.568.0", - "@aws-sdk/middleware-recursion-detection": "3.567.0", - "@aws-sdk/middleware-user-agent": "3.567.0", - "@aws-sdk/region-config-resolver": "3.567.0", - "@aws-sdk/types": "3.567.0", - "@aws-sdk/util-endpoints": "3.567.0", - "@aws-sdk/util-user-agent-browser": "3.567.0", - "@aws-sdk/util-user-agent-node": "3.568.0", - "@smithy/config-resolver": "^2.2.0", - "@smithy/core": "^1.4.2", - "@smithy/fetch-http-handler": "^2.5.0", - "@smithy/hash-node": "^2.2.0", - "@smithy/invalid-dependency": "^2.2.0", - "@smithy/middleware-content-length": "^2.2.0", - "@smithy/middleware-endpoint": "^2.5.1", - "@smithy/middleware-retry": "^2.3.1", - "@smithy/middleware-serde": "^2.3.0", - "@smithy/middleware-stack": "^2.2.0", - "@smithy/node-config-provider": "^2.3.0", - "@smithy/node-http-handler": "^2.5.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", - "@smithy/url-parser": "^2.2.0", - "@smithy/util-base64": "^2.3.0", - "@smithy/util-body-length-browser": "^2.2.0", - "@smithy/util-body-length-node": "^2.3.0", - "@smithy/util-defaults-mode-browser": "^2.2.1", - "@smithy/util-defaults-mode-node": "^2.3.1", - "@smithy/util-endpoints": "^1.2.0", - "@smithy/util-middleware": "^2.2.0", - "@smithy/util-retry": "^2.2.0", - "@smithy/util-utf8": "^2.3.0", + "version": "3.637.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.637.0.tgz", + "integrity": "sha512-xUi7x4qDubtA8QREtlblPuAcn91GS/09YVEY/RwU7xCY0aqGuFwgszAANlha4OUIqva8oVj2WO4gJuG+iaSnhw==", + "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.637.0", + "@aws-sdk/core": "3.635.0", + "@aws-sdk/credential-provider-node": "3.637.0", + "@aws-sdk/middleware-host-header": "3.620.0", + "@aws-sdk/middleware-logger": "3.609.0", + "@aws-sdk/middleware-recursion-detection": "3.620.0", + "@aws-sdk/middleware-user-agent": "3.637.0", + "@aws-sdk/region-config-resolver": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.637.0", + "@aws-sdk/util-user-agent-browser": "3.609.0", + "@aws-sdk/util-user-agent-node": "3.614.0", + "@smithy/config-resolver": "^3.0.5", + "@smithy/core": "^2.4.0", + "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/hash-node": "^3.0.3", + "@smithy/invalid-dependency": "^3.0.3", + "@smithy/middleware-content-length": "^3.0.5", + "@smithy/middleware-endpoint": "^3.1.0", + "@smithy/middleware-retry": "^3.0.15", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/node-http-handler": "^3.1.4", + "@smithy/protocol-http": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@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.15", + "@smithy/util-defaults-mode-node": "^3.0.15", + "@smithy/util-endpoints": "^2.0.5", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { @@ -1700,16 +1451,20 @@ } }, "node_modules/@aws-sdk/core": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.567.0.tgz", - "integrity": "sha512-zUDEQhC7blOx6sxhHdT75x98+SXQVdUIMu8z8AjqMWiYK2v4WkOS8i6dOS4E5OjL5J1Ac+ruy8op/Bk4AFqSIw==", - "dependencies": { - "@smithy/core": "^1.4.2", - "@smithy/protocol-http": "^3.3.0", - "@smithy/signature-v4": "^2.3.0", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", - "fast-xml-parser": "4.2.5", + "version": "3.635.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.635.0.tgz", + "integrity": "sha512-i1x/E/sgA+liUE1XJ7rj1dhyXpAKO1UKFUcTTHXok2ARjWTvszHnSXMOsB77aPbmn0fUp1JTx2kHUAZ1LVt5Bg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/core": "^2.4.0", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/property-provider": "^3.1.3", + "@smithy/protocol-http": "^4.1.0", + "@smithy/signature-v4": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", + "@smithy/util-middleware": "^3.0.3", + "fast-xml-parser": "4.4.1", "tslib": "^2.6.2" }, "engines": { @@ -1717,13 +1472,14 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.568.0.tgz", - "integrity": "sha512-MVTQoZwPnP1Ev5A7LG+KzeU6sCB8BcGkZeDT1z1V5Wt7GPq0MgFQTSSjhImnB9jqRSZkl1079Bt3PbO6lfIS8g==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/property-provider": "^2.2.0", - "@smithy/types": "^2.12.0", + "version": "3.620.1", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.620.1.tgz", + "integrity": "sha512-ExuILJ2qLW5ZO+rgkNRj0xiAipKT16Rk77buvPP8csR7kkCflT/gXTyzRe/uzIiETTxM7tr8xuO9MP/DQXqkfg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1731,18 +1487,19 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.568.0.tgz", - "integrity": "sha512-gL0NlyI2eW17hnCrh45hZV+qjtBquB+Bckiip9R6DIVRKqYcoILyiFhuOgf2bXeF23gVh6j18pvUvIoTaFWs5w==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/fetch-http-handler": "^2.5.0", - "@smithy/node-http-handler": "^2.5.0", - "@smithy/property-provider": "^2.2.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", - "@smithy/util-stream": "^2.2.0", + "version": "3.635.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.635.0.tgz", + "integrity": "sha512-iJyRgEjOCQlBMXqtwPLIKYc7Bsc6nqjrZybdMDenPDa+kmLg7xh8LxHsu9088e+2/wtLicE34FsJJIfzu3L82g==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/node-http-handler": "^3.1.4", + "@smithy/property-provider": "^3.1.3", + "@smithy/protocol-http": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", + "@smithy/util-stream": "^3.1.3", "tslib": "^2.6.2" }, "engines": { @@ -1750,44 +1507,47 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.568.0.tgz", - "integrity": "sha512-m5DUN9mpto5DhEvo6w3+8SS6q932ja37rTNvpPqWJIaWhj7OorAwVirSaJQAQB/M8+XCUIrUonxytphZB28qGQ==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.568.0", - "@aws-sdk/credential-provider-process": "3.568.0", - "@aws-sdk/credential-provider-sso": "3.568.0", - "@aws-sdk/credential-provider-web-identity": "3.568.0", - "@aws-sdk/types": "3.567.0", - "@smithy/credential-provider-imds": "^2.3.0", - "@smithy/property-provider": "^2.2.0", - "@smithy/shared-ini-file-loader": "^2.4.0", - "@smithy/types": "^2.12.0", + "version": "3.637.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.637.0.tgz", + "integrity": "sha512-h+PFCWfZ0Q3Dx84SppET/TFpcQHmxFW8/oV9ArEvMilw4EBN+IlxgbL0CnHwjHW64szcmrM0mbebjEfHf4FXmw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.620.1", + "@aws-sdk/credential-provider-http": "3.635.0", + "@aws-sdk/credential-provider-process": "3.620.1", + "@aws-sdk/credential-provider-sso": "3.637.0", + "@aws-sdk/credential-provider-web-identity": "3.621.0", + "@aws-sdk/types": "3.609.0", + "@smithy/credential-provider-imds": "^3.2.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.568.0" + "@aws-sdk/client-sts": "^3.637.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.569.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.569.0.tgz", - "integrity": "sha512-7jH4X2qlPU3PszZP1zvHJorhLARbU1tXvp8ngBe8ArXBrkFpl/dQ2Y/IRAICPm/pyC1IEt8L/CvKp+dz7v/eRw==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.568.0", - "@aws-sdk/credential-provider-http": "3.568.0", - "@aws-sdk/credential-provider-ini": "3.568.0", - "@aws-sdk/credential-provider-process": "3.568.0", - "@aws-sdk/credential-provider-sso": "3.568.0", - "@aws-sdk/credential-provider-web-identity": "3.568.0", - "@aws-sdk/types": "3.567.0", - "@smithy/credential-provider-imds": "^2.3.0", - "@smithy/property-provider": "^2.2.0", - "@smithy/shared-ini-file-loader": "^2.4.0", - "@smithy/types": "^2.12.0", + "version": "3.637.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.637.0.tgz", + "integrity": "sha512-yoEhoxJJfs7sPVQ6Is939BDQJZpZCoUgKr/ySse4YKOZ24t4VqgHA6+wV7rYh+7IW24Rd91UTvEzSuHYTlxlNA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.620.1", + "@aws-sdk/credential-provider-http": "3.635.0", + "@aws-sdk/credential-provider-ini": "3.637.0", + "@aws-sdk/credential-provider-process": "3.620.1", + "@aws-sdk/credential-provider-sso": "3.637.0", + "@aws-sdk/credential-provider-web-identity": "3.621.0", + "@aws-sdk/types": "3.609.0", + "@smithy/credential-provider-imds": "^3.2.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1795,14 +1555,15 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.568.0.tgz", - "integrity": "sha512-r01zbXbanP17D+bQUb7mD8Iu2SuayrrYZ0Slgvx32qgz47msocV9EPCSwI4Hkw2ZtEPCeLQR4XCqFJB1D9P50w==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/property-provider": "^2.2.0", - "@smithy/shared-ini-file-loader": "^2.4.0", - "@smithy/types": "^2.12.0", + "version": "3.620.1", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.620.1.tgz", + "integrity": "sha512-hWqFMidqLAkaV9G460+1at6qa9vySbjQKKc04p59OT7lZ5cO5VH5S4aI05e+m4j364MBROjjk2ugNvfNf/8ILg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1810,16 +1571,17 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.568.0.tgz", - "integrity": "sha512-+TA77NWOEXMUcfLoOuim6xiyXFg1GqHj55ggI1goTKGVvdHYZ+rhxZbwjI29+ewzPt/qcItDJcvhrjOrg9lCag==", - "dependencies": { - "@aws-sdk/client-sso": "3.568.0", - "@aws-sdk/token-providers": "3.568.0", - "@aws-sdk/types": "3.567.0", - "@smithy/property-provider": "^2.2.0", - "@smithy/shared-ini-file-loader": "^2.4.0", - "@smithy/types": "^2.12.0", + "version": "3.637.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.637.0.tgz", + "integrity": "sha512-Mvz+h+e62/tl+dVikLafhv+qkZJ9RUb8l2YN/LeKMWkxQylPT83CPk9aimVhCV89zth1zpREArl97+3xsfgQvA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/client-sso": "3.637.0", + "@aws-sdk/token-providers": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1827,33 +1589,35 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.568.0.tgz", - "integrity": "sha512-ZJSmTmoIdg6WqAULjYzaJ3XcbgBzVy36lir6Y0UBMRGaxDgos1AARuX6EcYzXOl+ksLvxt/xMQ+3aYh1LWfKSw==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/property-provider": "^2.2.0", - "@smithy/types": "^2.12.0", + "version": "3.621.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.621.0.tgz", + "integrity": "sha512-w7ASSyfNvcx7+bYGep3VBgC3K6vEdLmlpjT7nSIHxxQf+WSdvy+HynwJosrpZax0sK5q0D1Jpn/5q+r5lwwW6w==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.568.0" + "@aws-sdk/client-sts": "^3.621.0" } }, "node_modules/@aws-sdk/middleware-bucket-endpoint": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.568.0.tgz", - "integrity": "sha512-uc/nbSpXv64ct/wV3Ksz0/bXAsEtXuoZu5J9FTcFnM7c2MSofa0YQrtrJ8cG65uGbdeiFoJwPA048BTG/ilhCA==", + "version": "3.620.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.620.0.tgz", + "integrity": "sha512-eGLL0W6L3HDb3OACyetZYOWpHJ+gLo0TehQKeQyy2G8vTYXqNTeqYhuI6up9HVjBzU9eQiULVQETmgQs7TFaRg==", + "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.567.0", + "@aws-sdk/types": "3.609.0", "@aws-sdk/util-arn-parser": "3.568.0", - "@smithy/node-config-provider": "^2.3.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/types": "^2.12.0", - "@smithy/util-config-provider": "^2.3.0", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", + "@smithy/util-config-provider": "^3.0.0", "tslib": "^2.6.2" }, "engines": { @@ -1861,13 +1625,14 @@ } }, "node_modules/@aws-sdk/middleware-expect-continue": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.567.0.tgz", - "integrity": "sha512-diFpWk0HEkzWMc5+PanwlwiCp8iy9INc2ID/dS0jSQQVH3vIj2F129oX5spRVmCk+N5Dt2zRlVmyrPRYbPWnoA==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/types": "^2.12.0", + "version": "3.620.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.620.0.tgz", + "integrity": "sha512-QXeRFMLfyQ31nAHLbiTLtk0oHzG9QLMaof5jIfqcUwnOkO8YnQdeqzakrg1Alpy/VQ7aqzIi8qypkBe2KXZz0A==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1875,17 +1640,18 @@ } }, "node_modules/@aws-sdk/middleware-flexible-checksums": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.567.0.tgz", - "integrity": "sha512-HwDONfEbfOgaB7TAKMr194mLyott4djz4QKEGtcR2qUduV5D9yzsDGzth14fyFRVZvdtpeixsXOcQTyqQpRLhA==", - "dependencies": { - "@aws-crypto/crc32": "3.0.0", - "@aws-crypto/crc32c": "3.0.0", - "@aws-sdk/types": "3.567.0", - "@smithy/is-array-buffer": "^2.2.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/types": "^2.12.0", - "@smithy/util-utf8": "^2.3.0", + "version": "3.620.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.620.0.tgz", + "integrity": "sha512-ftz+NW7qka2sVuwnnO1IzBku5ccP+s5qZGeRTPgrKB7OzRW85gthvIo1vQR2w+OwHFk7WJbbhhWwbCbktnP4UA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/crc32": "5.2.0", + "@aws-crypto/crc32c": "5.2.0", + "@aws-sdk/types": "3.609.0", + "@smithy/is-array-buffer": "^3.0.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { @@ -1893,13 +1659,14 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.567.0.tgz", - "integrity": "sha512-zQHHj2N3in9duKghH7AuRNrOMLnKhW6lnmb7dznou068DJtDr76w475sHp2TF0XELsOGENbbBsOlN/S5QBFBVQ==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/types": "^2.12.0", + "version": "3.620.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.620.0.tgz", + "integrity": "sha512-VMtPEZwqYrII/oUkffYsNWY9PZ9xpNJpMgmyU0rlDQ25O1c0Hk3fJmZRe6pEkAJ0omD7kLrqGl1DUjQVxpd/Rg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1907,12 +1674,13 @@ } }, "node_modules/@aws-sdk/middleware-location-constraint": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.567.0.tgz", - "integrity": "sha512-XiGTH4VxrJ5fj6zeF6UL5U5EuJwLqj9bHW5pB+EKfw0pmbnyqfRdYNt46v4GsQql2iVOq1Z/Fiv754nIItBI/A==", + "version": "3.609.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.609.0.tgz", + "integrity": "sha512-xzsdoTkszGVqGVPjUmgoP7TORiByLueMHieI1fhQL888WPdqctwAx3ES6d/bA9Q/i8jnc6hs+Fjhy8UvBTkE9A==", + "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/types": "^2.12.0", + "@aws-sdk/types": "3.609.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1920,12 +1688,13 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.568.0.tgz", - "integrity": "sha512-BinH72RG7K3DHHC1/tCulocFv+ZlQ9SrPF9zYT0T1OT95JXuHhB7fH8gEABrc6DAtOdJJh2fgxQjPy5tzPtsrA==", + "version": "3.609.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.609.0.tgz", + "integrity": "sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==", + "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/types": "^2.12.0", + "@aws-sdk/types": "3.609.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1933,13 +1702,14 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.567.0.tgz", - "integrity": "sha512-rFk3QhdT4IL6O/UWHmNdjJiURutBCy+ogGqaNHf/RELxgXH3KmYorLwCe0eFb5hq8f6vr3zl4/iH7YtsUOuo1w==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/types": "^2.12.0", + "version": "3.620.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.620.0.tgz", + "integrity": "sha512-nh91S7aGK3e/o1ck64sA/CyoFw+gAYj2BDOnoNa6ouyCrVJED96ZXWbhye/fz9SgmNUZR2g7GdVpiLpMKZoI5w==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1947,35 +1717,24 @@ } }, "node_modules/@aws-sdk/middleware-sdk-s3": { - "version": "3.569.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.569.0.tgz", - "integrity": "sha512-qCmeG3qSq0Tv2sXJmtmEYHUFikRLa8OAkcGW/OXVUHf5XY06YFRPRCL5NFMayXusTEHb0Gb1ek3awZ4gix9gnQ==", + "version": "3.635.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.635.0.tgz", + "integrity": "sha512-RLdYJPEV4JL/7NBoFUs7VlP90X++5FlJdxHz0DzCjmiD3qCviKy+Cym3qg1gBgHwucs5XisuClxDrGokhAdTQw==", + "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.567.0", + "@aws-sdk/core": "3.635.0", + "@aws-sdk/types": "3.609.0", "@aws-sdk/util-arn-parser": "3.568.0", - "@smithy/node-config-provider": "^2.3.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/signature-v4": "^2.3.0", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", - "@smithy/util-config-provider": "^2.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/middleware-signing": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.567.0.tgz", - "integrity": "sha512-aE4/ysosM01di2sGs0q7UfhZ4EXMhEfOKrgQhi6b3h4BuClDdsP7bo3bkHEkx7aCKD6mb5/q4qlbph9FRQeTFg==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/property-provider": "^2.2.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/signature-v4": "^2.3.0", - "@smithy/types": "^2.12.0", - "@smithy/util-middleware": "^2.2.0", + "@smithy/core": "^2.4.0", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/protocol-http": "^4.1.0", + "@smithy/signature-v4": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", + "@smithy/util-config-provider": "^3.0.0", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-stream": "^3.1.3", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { @@ -1983,12 +1742,13 @@ } }, "node_modules/@aws-sdk/middleware-ssec": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.567.0.tgz", - "integrity": "sha512-lhpBwFi3Tcw+jlOdaCsg3lCAg4oOSJB00bW/aLTFeZWutwi9VexMmsddZllx99lN+LDeCjryNyVd2TCRCKwYhQ==", + "version": "3.609.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.609.0.tgz", + "integrity": "sha512-GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg==", + "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/types": "^2.12.0", + "@aws-sdk/types": "3.609.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1996,14 +1756,15 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.567.0.tgz", - "integrity": "sha512-a7DBGMRBLWJU3BqrQjOtKS4/RcCh/BhhKqwjCE0FEhhm6A/GGuAs/DcBGOl6Y8Wfsby3vejSlppTLH/qtV1E9w==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@aws-sdk/util-endpoints": "3.567.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/types": "^2.12.0", + "version": "3.637.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.637.0.tgz", + "integrity": "sha512-EYo0NE9/da/OY8STDsK2LvM4kNa79DBsf4YVtaG4P5pZ615IeFsD8xOHZeuJmUrSMlVQ8ywPRX7WMucUybsKug==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.637.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2011,15 +1772,16 @@ } }, "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.567.0.tgz", - "integrity": "sha512-VMDyYi5Dh2NydDiIARZ19DwMfbyq0llS736cp47qopmO6wzdeul7WRTx8NKfEYN0/AwEaqmTW0ohx58jSB1lYg==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/node-config-provider": "^2.3.0", - "@smithy/types": "^2.12.0", - "@smithy/util-config-provider": "^2.3.0", - "@smithy/util-middleware": "^2.2.0", + "version": "3.614.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.614.0.tgz", + "integrity": "sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/types": "^3.3.0", + "@smithy/util-config-provider": "^3.0.0", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -2027,17 +1789,18 @@ } }, "node_modules/@aws-sdk/s3-request-presigner": { - "version": "3.569.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.569.0.tgz", - "integrity": "sha512-jEU9PI6j83Dz9eYTjmmIEsmsyT6nK2bBCROmqeDZw1Et0izx374Z2SITtIsirKFsUpsfPtu/UMfl04LdwrT1Qg==", - "dependencies": { - "@aws-sdk/signature-v4-multi-region": "3.569.0", - "@aws-sdk/types": "3.567.0", - "@aws-sdk/util-format-url": "3.567.0", - "@smithy/middleware-endpoint": "^2.5.1", - "@smithy/protocol-http": "^3.3.0", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", + "version": "3.637.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.637.0.tgz", + "integrity": "sha512-URRiEDZEICyfAXmXcXREQCsvZrapITAymvg46p1Xjnuv7PTnUB0SF18B2omPL0E5d/X+T3O9NKdtot+BqJbIWw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/signature-v4-multi-region": "3.635.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-format-url": "3.609.0", + "@smithy/middleware-endpoint": "^3.1.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2045,15 +1808,16 @@ } }, "node_modules/@aws-sdk/signature-v4-multi-region": { - "version": "3.569.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.569.0.tgz", - "integrity": "sha512-uCf/7fDPcU3Q0hL+0jzoSodHJW+HZJTMP51egY3W+otMbr+6+JVfjlrKhHKsT3OtG5AUh+4cDU2k83oeGHxHVQ==", - "dependencies": { - "@aws-sdk/middleware-sdk-s3": "3.569.0", - "@aws-sdk/types": "3.567.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/signature-v4": "^2.3.0", - "@smithy/types": "^2.12.0", + "version": "3.635.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.635.0.tgz", + "integrity": "sha512-J6QY4/invOkpogCHjSaDON1hF03viPpOnsrzVuCvJMmclS/iG62R4EY0wq1alYll0YmSdmKlpJwHMWwGtqK63Q==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/middleware-sdk-s3": "3.635.0", + "@aws-sdk/types": "3.609.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/signature-v4": "^4.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2061,29 +1825,31 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.568.0.tgz", - "integrity": "sha512-mCQElYzY5N2JlXB7LyjOoLvRN/JiSV+E9szLwhYN3dleTUCMbGqWb7RiAR2V3fO+mz8f9kR7DThTExKJbKogKw==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/property-provider": "^2.2.0", - "@smithy/shared-ini-file-loader": "^2.4.0", - "@smithy/types": "^2.12.0", + "version": "3.614.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.614.0.tgz", + "integrity": "sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sso-oidc": "^3.568.0" + "@aws-sdk/client-sso-oidc": "^3.614.0" } }, "node_modules/@aws-sdk/types": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.567.0.tgz", - "integrity": "sha512-JBznu45cdgQb8+T/Zab7WpBmfEAh77gsk99xuF4biIb2Sw1mdseONdoGDjEJX57a25TzIv/WUJ2oABWumckz1A==", + "version": "3.609.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz", + "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2094,6 +1860,7 @@ "version": "3.568.0", "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.568.0.tgz", "integrity": "sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, @@ -2102,13 +1869,14 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.567.0.tgz", - "integrity": "sha512-WVhot3qmi0BKL9ZKnUqsvCd++4RF2DsJIG32NlRaml1FT9KaqSzNv0RXeA6k/kYwiiNT7y3YWu3Lbzy7c6vG9g==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/types": "^2.12.0", - "@smithy/util-endpoints": "^1.2.0", + "version": "3.637.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.637.0.tgz", + "integrity": "sha512-pAqOKUHeVWHEXXDIp/qoMk/6jyxIb6GGjnK1/f8dKHtKIEs4tKsnnL563gceEvdad53OPXIt86uoevCcCzmBnw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/types": "^3.3.0", + "@smithy/util-endpoints": "^2.0.5", "tslib": "^2.6.2" }, "engines": { @@ -2116,13 +1884,14 @@ } }, "node_modules/@aws-sdk/util-format-url": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.567.0.tgz", - "integrity": "sha512-zqfuUrSFVYoT02mWnHaP0I7TRjjS3ZE8GhAVyHRUvVOv/O2dFWopFI9jFtMsT21vns7c9yQ1ACH/Kcn3s9t2EQ==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/querystring-builder": "^2.2.0", - "@smithy/types": "^2.12.0", + "version": "3.609.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.609.0.tgz", + "integrity": "sha512-fuk29BI/oLQlJ7pfm6iJ4gkEpHdavffAALZwXh9eaY1vQ0ip0aKfRTiNudPoJjyyahnz5yJ1HkmlcDitlzsOrQ==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/querystring-builder": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2130,35 +1899,38 @@ } }, "node_modules/@aws-sdk/util-locate-window": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz", - "integrity": "sha512-iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg==", + "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==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.1" + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.567.0.tgz", - "integrity": "sha512-cqP0uXtZ7m7hRysf3fRyJwcY1jCgQTpJy7BHB5VpsE7DXlXHD5+Ur5L42CY7UrRPrB6lc6YGFqaAOs5ghMcLyA==", + "version": "3.609.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.609.0.tgz", + "integrity": "sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==", + "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/types": "^2.12.0", + "@aws-sdk/types": "3.609.0", + "@smithy/types": "^3.3.0", "bowser": "^2.11.0", "tslib": "^2.6.2" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.568.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.568.0.tgz", - "integrity": "sha512-NVoZoLnKF+eXPBvXg+KqixgJkPSrerR6Gqmbjwqbv14Ini+0KNKB0/MXas1mDGvvEgtNkHI/Cb9zlJ3KXpti2A==", - "dependencies": { - "@aws-sdk/types": "3.567.0", - "@smithy/node-config-provider": "^2.3.0", - "@smithy/types": "^2.12.0", + "version": "3.614.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.614.0.tgz", + "integrity": "sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2173,20 +1945,13 @@ } } }, - "node_modules/@aws-sdk/util-utf8-browser": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz", - "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==", - "dependencies": { - "tslib": "^2.3.1" - } - }, "node_modules/@aws-sdk/xml-builder": { - "version": "3.567.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.567.0.tgz", - "integrity": "sha512-Db25jK9sZdGa7PEQTdm60YauUVbeYGsSEMQOHGP6ifbXfCknqgkPgWV16DqAKJUsbII0xgkJ9LpppkmYal3K/g==", + "version": "3.609.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.609.0.tgz", + "integrity": "sha512-l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2194,12 +1959,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.24.2", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz", - "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/highlight": "^7.24.2", + "@babel/highlight": "^7.24.7", "picocolors": "^1.0.0" }, "engines": { @@ -2207,30 +1973,32 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz", - "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", + "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==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz", - "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", + "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", "dev": true, + "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.23.5", - "@babel/generator": "^7.23.6", - "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.23.9", - "@babel/parser": "^7.23.9", - "@babel/template": "^7.23.9", - "@babel/traverse": "^7.23.9", - "@babel/types": "^7.23.9", + "@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", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -2245,30 +2013,26 @@ "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 - }, "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/@babel/generator": { - "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", - "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz", + "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.23.6", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", + "@babel/types": "^7.25.0", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" }, "engines": { @@ -2276,38 +2040,42 @@ } }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", - "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz", - "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==", + "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/types": "^7.22.15" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", - "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", + "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.23.5", - "@babel/helper-validator-option": "^7.23.5", - "browserslist": "^4.22.2", + "@babel/compat-data": "^7.25.2", + "@babel/helper-validator-option": "^7.24.8", + "browserslist": "^4.23.1", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -2320,6 +2088,7 @@ "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" } @@ -2329,6 +2098,7 @@ "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" } @@ -2337,22 +2107,22 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.5.tgz", - "integrity": "sha512-uRc4Cv8UQWnE4NXlYTIIdM7wfFkOqlFztcC/gVXDKohKoVB3OyonfelUBaJzSwpBntZ2KYGF/9S7asCHsXwW6g==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-member-expression-to-functions": "^7.24.5", - "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/helper-replace-supers": "^7.24.1", - "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.24.5", + "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==", + "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", "semver": "^6.3.1" }, "engines": { @@ -2362,34 +2132,24 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-split-export-declaration": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz", - "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.5" - }, - "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", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz", - "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-annotate-as-pure": "^7.24.7", "regexpu-core": "^5.3.1", "semver": "^6.3.1" }, @@ -2405,6 +2165,7 @@ "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" } @@ -2414,6 +2175,7 @@ "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==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-compilation-targets": "^7.22.6", "@babel/helper-plugin-utils": "^7.22.5", @@ -2425,75 +2187,45 @@ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", - "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", - "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", - "dev": true, - "dependencies": { - "@babel/template": "^7.22.15", - "@babel/types": "^7.23.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.5.tgz", - "integrity": "sha512-4owRteeihKWKamtqg4JmWSsEZU445xpFRXPEwp44HbgbxdWlUV1b4Agg4lkA806Lil5XM/e+FJyS0vj5T6vmcA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.24.5" + "@babel/traverse": "^7.24.8", + "@babel/types": "^7.24.8" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", - "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.15" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", - "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-module-imports": "^7.22.15", - "@babel/helper-simple-access": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.20" + "@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" }, "engines": { "node": ">=6.9.0" @@ -2503,35 +2235,38 @@ } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz", - "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz", - "integrity": "sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==", + "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==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz", - "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-wrap-function": "^7.22.20" + "@babel/helper-annotate-as-pure": "^7.24.7", + "@babel/helper-wrap-function": "^7.25.0", + "@babel/traverse": "^7.25.0" }, "engines": { "node": ">=6.9.0" @@ -2541,14 +2276,15 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz", - "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-member-expression-to-functions": "^7.23.0", - "@babel/helper-optimise-call-expression": "^7.22.5" + "@babel/helper-member-expression-to-functions": "^7.24.8", + "@babel/helper-optimise-call-expression": "^7.24.7", + "@babel/traverse": "^7.25.0" }, "engines": { "node": ">=6.9.0" @@ -2558,103 +2294,113 @@ } }, "node_modules/@babel/helper-simple-access": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", - "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", + "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/types": "^7.22.5" + "@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.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz", - "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", - "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", + "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", - "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", + "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==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz", - "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", - "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", + "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==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.5.tgz", - "integrity": "sha512-/xxzuNvgRl4/HLNKvnFwdhdgN3cpLxgLROeLDl83Yx0AJ1SGvq1ak0OszTOjDfiB8Vx03eJbeDWh9r+jCCWttw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-function-name": "^7.23.0", - "@babel/template": "^7.24.0", - "@babel/types": "^7.24.5" + "@babel/template": "^7.25.0", + "@babel/traverse": "^7.25.0", + "@babel/types": "^7.25.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.5.tgz", - "integrity": "sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", + "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/template": "^7.24.0", - "@babel/traverse": "^7.24.5", - "@babel/types": "^7.24.5" + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.5.tgz", - "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==", + "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.5", + "@babel/helper-validator-identifier": "^7.24.7", "chalk": "^2.4.2", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" @@ -2663,11 +2409,83 @@ "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.24.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.5.tgz", - "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", + "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.25.6" + }, "bin": { "parser": "bin/babel-parser.js" }, @@ -2675,13 +2493,47 @@ "node": ">=6.0.0" } }, + "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==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.8", + "@babel/traverse": "^7.25.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "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==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.8" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.24.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.24.1.tgz", - "integrity": "sha512-y4HqEnkelJIOQGd+3g1bTeKsA5c6qM7eOn7VggGVbBc0y8MLSKHacwcIE2PplNlQSj0PqS9rrXL/nkPVK+kUNg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -2691,14 +2543,15 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.1.tgz", - "integrity": "sha512-Hj791Ii4ci8HqnaKHAlLNs+zaLXb0EzSDhiAWp5VNlyvCNymYfacs64pxTxbH1znW/NcArSmwpmG9IKE/TUVVQ==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", - "@babel/plugin-transform-optional-chaining": "^7.24.1" + "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", + "@babel/plugin-transform-optional-chaining": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -2708,13 +2561,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.1.tgz", - "integrity": "sha512-m9m/fXsXLiHfwdgydIFnpk+7jlVbnvlK5B2EKiPdLUb6WX654ZaaEWJUjk8TftRbZpK0XibovlLWX4KIZhV6jw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.8", + "@babel/traverse": "^7.25.0" }, "engines": { "node": ">=6.9.0" @@ -2728,6 +2582,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" }, @@ -2740,6 +2595,7 @@ "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" }, @@ -2752,6 +2608,7 @@ "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" }, @@ -2764,6 +2621,7 @@ "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" }, @@ -2779,6 +2637,7 @@ "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" }, @@ -2791,6 +2650,7 @@ "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" }, @@ -2799,12 +2659,13 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz", - "integrity": "sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -2814,12 +2675,13 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.1.tgz", - "integrity": "sha512-zhQTMH0X2nVLnb04tz+s7AMuasX8U0FnpE+nHTOhSOINjWMnopoZTxtIKsd45n4GQ/HIZLyfIpoul8e2m0DnRA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -2833,6 +2695,7 @@ "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" }, @@ -2845,6 +2708,7 @@ "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" }, @@ -2857,6 +2721,7 @@ "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" }, @@ -2869,6 +2734,7 @@ "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" }, @@ -2881,6 +2747,7 @@ "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" }, @@ -2893,6 +2760,7 @@ "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" }, @@ -2905,6 +2773,7 @@ "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" }, @@ -2917,6 +2786,7 @@ "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" }, @@ -2929,6 +2799,7 @@ "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" }, @@ -2944,6 +2815,7 @@ "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" }, @@ -2959,6 +2831,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.18.6", "@babel/helper-plugin-utils": "^7.18.6" @@ -2971,12 +2844,13 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz", - "integrity": "sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -2986,15 +2860,16 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz", - "integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.20", - "@babel/plugin-syntax-async-generators": "^7.8.4" + "@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" }, "engines": { "node": ">=6.9.0" @@ -3004,14 +2879,15 @@ } }, "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz", - "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.22.15", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.20" + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-remap-async-to-generator": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3021,12 +2897,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz", - "integrity": "sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3036,12 +2913,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.5.tgz", - "integrity": "sha512-sMfBc3OxghjC95BkYrYocHL3NaOplrcaunblzwXhGmlPwpmfsxr4vK+mBBt49r+S240vahmv+kUxkeKgs+haCw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.5" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -3051,13 +2929,14 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.1.tgz", - "integrity": "sha512-OMLCXi0NqvJfORTaPQBwqLXHhb93wkBKZ4aNwMl6WtehO7ar+cmp+89iPEQPqxAnxsOKTaMcs3POz3rKayJ72g==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.1", - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-create-class-features-plugin": "^7.25.4", + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -3067,13 +2946,14 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.24.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.4.tgz", - "integrity": "sha512-B8q7Pz870Hz/q9UgP8InNpY01CSLDSCyqX7zcRuv3FcPl87A2G17lASroHWaCtbdIcbYzOZ7kWmXFKbijMSmFg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.4", - "@babel/helper-plugin-utils": "^7.24.0", + "@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" }, "engines": { @@ -3084,18 +2964,17 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.5.tgz", - "integrity": "sha512-gWkLP25DFj2dwe9Ck8uwMOpko4YsqyfZJrOmqqcegeDYEbp7rmn4U6UQZNj08UF6MaX39XenSpKRCvpDRBtZ7Q==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-plugin-utils": "^7.24.5", - "@babel/helper-replace-supers": "^7.24.1", - "@babel/helper-split-export-declaration": "^7.24.5", + "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==", + "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", "globals": "^11.1.0" }, "engines": { @@ -3105,26 +2984,31 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-split-export-declaration": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz", - "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.24.5" + "@babel/helper-plugin-utils": "^7.24.7", + "@babel/template": "^7.24.7" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz", - "integrity": "sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", - "@babel/template": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -3133,13 +3017,15 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.5.tgz", - "integrity": "sha512-SZuuLyfxvsm+Ah57I/i1HVjveBENYK9ue8MJ7qkc7ndoNjqquJiElzA7f5yaAXjyW2hKojosOTAQQRX50bPSVg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.5" + "@babel/helper-create-regexp-features-plugin": "^7.24.7", + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3148,14 +3034,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.1.tgz", - "integrity": "sha512-p7uUxgSoZwZ2lPNMzUkqCts3xlp8n+o05ikjy7gbtFJSt9gdU88jAmtfmOxHM14noQXBxfgzf2yRWECiNVhTCw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.15", - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3164,28 +3050,31 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.1.tgz", - "integrity": "sha512-msyzuUnvsjsaSaocV6L7ErfNsa5nDWL1XKNnDePLgmz+WdU4w/J8+AxBMrWfi9m4IxfL5sZQKUPQKDQeeAT6lA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-create-regexp-features-plugin": "^7.25.0", + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.0.0" } }, "node_modules/@babel/plugin-transform-dynamic-import": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.1.tgz", - "integrity": "sha512-av2gdSTyXcJVdI+8aFZsCAtR29xJt0S5tas+Ef8NvBNmD1a+N/3ecMLeMBgfcK+xzsjdLDT6oHt+DFPyeqUbDA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-dynamic-import": "^7.8.3" }, "engines": { @@ -3196,13 +3085,14 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.1.tgz", - "integrity": "sha512-U1yX13dVBSwS23DEAqU+Z/PkwE9/m7QQy8Y9/+Tdb8UWYaGNDYwTLi19wqIAiROr8sXVum9A/rtiH5H0boUcTw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15", - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7", + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3212,12 +3102,13 @@ } }, "node_modules/@babel/plugin-transform-export-namespace-from": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.1.tgz", - "integrity": "sha512-Ft38m/KFOyzKw2UaJFkWG9QnHPG/Q/2SkOrRk4pNBPg5IPZ+dOxcmkK5IyuBcxiNPyyYowPGUReyBvrvZs7IlQ==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-export-namespace-from": "^7.8.3" }, "engines": { @@ -3228,13 +3119,14 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz", - "integrity": "sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3244,14 +3136,15 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz", - "integrity": "sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-compilation-targets": "^7.24.8", + "@babel/helper-plugin-utils": "^7.24.8", + "@babel/traverse": "^7.25.1" }, "engines": { "node": ">=6.9.0" @@ -3261,12 +3154,13 @@ } }, "node_modules/@babel/plugin-transform-json-strings": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.1.tgz", - "integrity": "sha512-U7RMFmRvoasscrIFy5xA4gIp8iWnWubnKkKuUGJjsuOH7GfbMkB+XZzeslx2kLdEGdOJDamEmCqOks6e8nv8DQ==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-json-strings": "^7.8.3" }, "engines": { @@ -3277,12 +3171,13 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz", - "integrity": "sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -3292,12 +3187,13 @@ } }, "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.1.tgz", - "integrity": "sha512-OhN6J4Bpz+hIBqItTeWJujDOfNP+unqv/NJgyhlpSqgBTPm37KkMmZV6SYcOj+pnDbdcl1qRGV/ZiIjX9Iy34w==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" }, "engines": { @@ -3308,12 +3204,13 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz", - "integrity": "sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3323,13 +3220,14 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.1.tgz", - "integrity": "sha512-lAxNHi4HVtjnHd5Rxg3D5t99Xm6H7b04hUS7EHIXcUl2EV4yl1gWdqZrNzXnSrHveL9qMdbODlLF55mvgjAfaQ==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.23.3", - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-module-transforms": "^7.24.7", + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3339,14 +3237,15 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz", - "integrity": "sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.23.3", - "@babel/helper-plugin-utils": "^7.24.0", - "@babel/helper-simple-access": "^7.22.5" + "@babel/helper-module-transforms": "^7.24.8", + "@babel/helper-plugin-utils": "^7.24.8", + "@babel/helper-simple-access": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3356,15 +3255,16 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.1.tgz", - "integrity": "sha512-mqQ3Zh9vFO1Tpmlt8QPnbwGHzNz3lpNEMxQb1kAemn/erstyqw1r9KeOlOfo3y6xAnFEcOv2tSyrXfmMk+/YZA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-module-transforms": "^7.23.3", - "@babel/helper-plugin-utils": "^7.24.0", - "@babel/helper-validator-identifier": "^7.22.20" + "@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" }, "engines": { "node": ">=6.9.0" @@ -3374,13 +3274,14 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.1.tgz", - "integrity": "sha512-tuA3lpPj+5ITfcCluy6nWonSL7RvaG0AOTeAuvXqEKS34lnLzXpDb0dcP6K8jD0zWZFNDVly90AGFJPnm4fOYg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.23.3", - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-module-transforms": "^7.24.7", + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3390,13 +3291,14 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz", - "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-create-regexp-features-plugin": "^7.24.7", + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3406,12 +3308,13 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.1.tgz", - "integrity": "sha512-/rurytBM34hYy0HKZQyA0nHbQgQNFm4Q/BOc9Hflxi2X3twRof7NaE5W46j4kQitm7SvACVRXsa6N/tSZxvPug==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3421,12 +3324,13 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.1.tgz", - "integrity": "sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" }, "engines": { @@ -3437,12 +3341,13 @@ } }, "node_modules/@babel/plugin-transform-numeric-separator": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.1.tgz", - "integrity": "sha512-7GAsGlK4cNL2OExJH1DzmDeKnRv/LXq0eLUSvudrehVA5Rgg4bIrqEUW29FbKMBRT0ztSqisv7kjP+XIC4ZMNw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-numeric-separator": "^7.10.4" }, "engines": { @@ -3453,15 +3358,16 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.5.tgz", - "integrity": "sha512-7EauQHszLGM3ay7a161tTQH7fj+3vVM/gThlz5HpFtnygTxjrlvoeq7MPVA1Vy9Q555OB8SnAOsMkLShNkkrHA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-plugin-utils": "^7.24.5", + "@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.5" + "@babel/plugin-transform-parameters": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3471,13 +3377,14 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz", - "integrity": "sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", - "@babel/helper-replace-supers": "^7.24.1" + "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-replace-supers": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3487,12 +3394,13 @@ } }, "node_modules/@babel/plugin-transform-optional-catch-binding": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.1.tgz", - "integrity": "sha512-oBTH7oURV4Y+3EUrf6cWn1OHio3qG/PVwO5J03iSJmBg6m2EhKjkAu/xuaXaYwWW9miYtvbWv4LNf0AmR43LUA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" }, "engines": { @@ -3503,13 +3411,14 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.5.tgz", - "integrity": "sha512-xWCkmwKT+ihmA6l7SSTpk8e4qQl/274iNbSKRRS8mpqFR32ksy36+a+LWY8OXCCEefF8WFlnOHVsaDI2231wBg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.5", - "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/helper-plugin-utils": "^7.24.8", + "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", "@babel/plugin-syntax-optional-chaining": "^7.8.3" }, "engines": { @@ -3520,12 +3429,13 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.5.tgz", - "integrity": "sha512-9Co00MqZ2aoky+4j2jhofErthm6QVLKbpQrvz20c3CH9KQCLHyNB+t2ya4/UrRpQGR+Wrwjg9foopoeSdnHOkA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", + "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.5" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3535,13 +3445,14 @@ } }, "node_modules/@babel/plugin-transform-private-methods": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.1.tgz", - "integrity": "sha512-tGvisebwBO5em4PaYNqt4fkw56K2VALsAbAakY0FjTYqJp7gfdrgr7YX76Or8/cpik0W6+tj3rZ0uHU9Oil4tw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.1", - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-create-class-features-plugin": "^7.25.4", + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -3551,14 +3462,15 @@ } }, "node_modules/@babel/plugin-transform-private-property-in-object": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.5.tgz", - "integrity": "sha512-JM4MHZqnWR04jPMujQDTBVRnqxpLLpx2tkn7iPn+Hmsc0Gnb79yvRWOkvqFOx3Z7P7VxiRIR22c4eGSNj87OBQ==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-create-class-features-plugin": "^7.24.5", - "@babel/helper-plugin-utils": "^7.24.5", + "@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" }, "engines": { @@ -3569,12 +3481,13 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz", - "integrity": "sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3584,12 +3497,13 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.1.tgz", - "integrity": "sha512-sJwZBCzIBE4t+5Q4IGLaaun5ExVMRY0lYwos/jNecjMrVCygCdph3IKv0tkP5Fc87e/1+bebAmEAGBfnRD+cnw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-plugin-utils": "^7.24.7", "regenerator-transform": "^0.15.2" }, "engines": { @@ -3600,12 +3514,13 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.1.tgz", - "integrity": "sha512-JAclqStUfIwKN15HrsQADFgeZt+wexNQ0uLhuqvqAUFoqPMjEcFCYZBhq0LUdz6dZK/mD+rErhW71fbx8RYElg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3615,16 +3530,17 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz", - "integrity": "sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.22.15", - "@babel/helper-plugin-utils": "^7.24.0", - "babel-plugin-polyfill-corejs2": "^0.4.8", - "babel-plugin-polyfill-corejs3": "^0.9.0", - "babel-plugin-polyfill-regenerator": "^0.5.5", + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-plugin-utils": "^7.24.7", + "babel-plugin-polyfill-corejs2": "^0.4.10", + "babel-plugin-polyfill-corejs3": "^0.10.1", + "babel-plugin-polyfill-regenerator": "^0.6.1", "semver": "^6.3.1" }, "engines": { @@ -3639,17 +3555,19 @@ "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/@babel/plugin-transform-shorthand-properties": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz", - "integrity": "sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3659,13 +3577,14 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz", - "integrity": "sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz", + "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3675,12 +3594,13 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.1.tgz", - "integrity": "sha512-9v0f1bRXgPVcPrngOQvLXeGNNVLc8UjMVfebo9ka0WF3/7+aVUHmaJVT3sa0XCzEFioPfPHZiOcYG9qOsH63cw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3690,12 +3610,13 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz", - "integrity": "sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3705,12 +3626,13 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.5.tgz", - "integrity": "sha512-UTGnhYVZtTAjdwOTzT+sCyXmTn8AhaxOS/MjG9REclZ6ULHWF9KoCZur0HSGU7hk8PdBFKKbYe6+gqdXWz84Jg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.5" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -3720,12 +3642,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.1.tgz", - "integrity": "sha512-RlkVIcWT4TLI96zM660S877E7beKlQw7Ig+wqkKBiWfj0zH5Q4h50q6er4wzZKRNSYpfo6ILJ+hrJAGSX2qcNw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3735,13 +3658,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-property-regex": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.1.tgz", - "integrity": "sha512-Ss4VvlfYV5huWApFsF8/Sq0oXnGO+jB+rijFEFugTd3cwSObUSnUi88djgR5528Csl0uKlrI331kRqe56Ov2Ng==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.15", - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-create-regexp-features-plugin": "^7.24.7", + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3751,13 +3675,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.1.tgz", - "integrity": "sha512-2A/94wgZgxfTsiLaQ2E36XAOdcZmGAaEEgVmxQWwZXWkGhvoHbaqXcKnU8zny4ycpu3vNqg0L/PcCiYtHtA13g==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.15", - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-create-regexp-features-plugin": "^7.24.7", + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3767,13 +3692,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-sets-regex": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.1.tgz", - "integrity": "sha512-fqj4WuzzS+ukpgerpAoOnMfQXwUHFxXUZUE84oL2Kao2N8uSlvcpnAidKASgsNgzZHBsHWvcm8s9FPWUhAb8fA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.15", - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-create-regexp-features-plugin": "^7.25.2", + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -3783,26 +3709,29 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.0.tgz", - "integrity": "sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.23.5", - "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-plugin-utils": "^7.24.0", - "@babel/helper-validator-option": "^7.23.5", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7", + "version": "7.25.3", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.3.tgz", + "integrity": "sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==", + "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/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.23.3", - "@babel/plugin-syntax-import-attributes": "^7.23.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", @@ -3814,59 +3743,60 @@ "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.23.3", - "@babel/plugin-transform-async-generator-functions": "^7.23.9", - "@babel/plugin-transform-async-to-generator": "^7.23.3", - "@babel/plugin-transform-block-scoped-functions": "^7.23.3", - "@babel/plugin-transform-block-scoping": "^7.23.4", - "@babel/plugin-transform-class-properties": "^7.23.3", - "@babel/plugin-transform-class-static-block": "^7.23.4", - "@babel/plugin-transform-classes": "^7.23.8", - "@babel/plugin-transform-computed-properties": "^7.23.3", - "@babel/plugin-transform-destructuring": "^7.23.3", - "@babel/plugin-transform-dotall-regex": "^7.23.3", - "@babel/plugin-transform-duplicate-keys": "^7.23.3", - "@babel/plugin-transform-dynamic-import": "^7.23.4", - "@babel/plugin-transform-exponentiation-operator": "^7.23.3", - "@babel/plugin-transform-export-namespace-from": "^7.23.4", - "@babel/plugin-transform-for-of": "^7.23.6", - "@babel/plugin-transform-function-name": "^7.23.3", - "@babel/plugin-transform-json-strings": "^7.23.4", - "@babel/plugin-transform-literals": "^7.23.3", - "@babel/plugin-transform-logical-assignment-operators": "^7.23.4", - "@babel/plugin-transform-member-expression-literals": "^7.23.3", - "@babel/plugin-transform-modules-amd": "^7.23.3", - "@babel/plugin-transform-modules-commonjs": "^7.23.3", - "@babel/plugin-transform-modules-systemjs": "^7.23.9", - "@babel/plugin-transform-modules-umd": "^7.23.3", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", - "@babel/plugin-transform-new-target": "^7.23.3", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4", - "@babel/plugin-transform-numeric-separator": "^7.23.4", - "@babel/plugin-transform-object-rest-spread": "^7.24.0", - "@babel/plugin-transform-object-super": "^7.23.3", - "@babel/plugin-transform-optional-catch-binding": "^7.23.4", - "@babel/plugin-transform-optional-chaining": "^7.23.4", - "@babel/plugin-transform-parameters": "^7.23.3", - "@babel/plugin-transform-private-methods": "^7.23.3", - "@babel/plugin-transform-private-property-in-object": "^7.23.4", - "@babel/plugin-transform-property-literals": "^7.23.3", - "@babel/plugin-transform-regenerator": "^7.23.3", - "@babel/plugin-transform-reserved-words": "^7.23.3", - "@babel/plugin-transform-shorthand-properties": "^7.23.3", - "@babel/plugin-transform-spread": "^7.23.3", - "@babel/plugin-transform-sticky-regex": "^7.23.3", - "@babel/plugin-transform-template-literals": "^7.23.3", - "@babel/plugin-transform-typeof-symbol": "^7.23.3", - "@babel/plugin-transform-unicode-escapes": "^7.23.3", - "@babel/plugin-transform-unicode-property-regex": "^7.23.3", - "@babel/plugin-transform-unicode-regex": "^7.23.3", - "@babel/plugin-transform-unicode-sets-regex": "^7.23.3", + "@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/preset-modules": "0.1.6-no-external-plugins", - "babel-plugin-polyfill-corejs2": "^0.4.8", - "babel-plugin-polyfill-corejs3": "^0.9.0", - "babel-plugin-polyfill-regenerator": "^0.5.5", - "core-js-compat": "^3.31.0", + "babel-plugin-polyfill-corejs2": "^0.4.10", + "babel-plugin-polyfill-corejs3": "^0.10.4", + "babel-plugin-polyfill-regenerator": "^0.6.1", + "core-js-compat": "^3.37.1", "semver": "^6.3.1" }, "engines": { @@ -3881,6 +3811,7 @@ "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" } @@ -3890,6 +3821,7 @@ "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", "@babel/types": "^7.4.4", @@ -3903,13 +3835,15 @@ "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 + "dev": true, + "license": "MIT" }, "node_modules/@babel/runtime": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz", - "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz", + "integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==", "dev": true, + "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -3918,33 +3852,32 @@ } }, "node_modules/@babel/template": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", - "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", + "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.23.5", - "@babel/parser": "^7.24.0", - "@babel/types": "^7.24.0" + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.25.0", + "@babel/types": "^7.25.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.5.tgz", - "integrity": "sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.24.2", - "@babel/generator": "^7.24.5", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.24.5", - "@babel/parser": "^7.24.5", - "@babel/types": "^7.24.5", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", + "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", + "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", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -3953,12 +3886,13 @@ } }, "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.5.tgz", - "integrity": "sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", + "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.24.5", + "@babel/types": "^7.25.6", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -3967,26 +3901,15 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/@babel/helper-split-export-declaration": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz", - "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/types": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.5.tgz", - "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", + "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.24.1", - "@babel/helper-validator-identifier": "^7.24.5", + "@babel/helper-string-parser": "^7.24.8", + "@babel/helper-validator-identifier": "^7.24.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -4014,394 +3937,464 @@ } }, "node_modules/@discoveryjs/json-ext": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", - "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", + "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==", "dev": true, + "license": "MIT", "engines": { - "node": ">=10.0.0" + "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==", + "license": "MIT", + "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==", + "license": "MIT", + "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==", + "license": "MIT", + "dependencies": { + "tslib": "^2.4.0" } }, "node_modules/@es-joy/jsdoccomment": { - "version": "0.42.0", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.42.0.tgz", - "integrity": "sha512-R1w57YlVA6+YE01wch3GPYn6bCsrOV3YW/5oGGE2tmX6JcL9Nr+b5IikrjMPF+v9CV3ay+obImEdsDhovhJrzw==", + "version": "0.48.0", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.48.0.tgz", + "integrity": "sha512-G6QUWIcC+KvSwXNsJyDTHvqUdNoAVJPPgkc3+Uk4WBKqZvoXhlvazOgm9aL0HwihJLQf0l+tOE2UFzXBqCqgDw==", "dev": true, + "license": "MIT", "dependencies": { "comment-parser": "1.4.1", - "esquery": "^1.5.0", - "jsdoc-type-pratt-parser": "~4.0.0" + "esquery": "^1.6.0", + "jsdoc-type-pratt-parser": "~4.1.0" }, "engines": { "node": ">=16" } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz", - "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz", + "integrity": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==", "cpu": [ "ppc64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "aix" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-arm": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz", - "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.0.tgz", + "integrity": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==", "cpu": [ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz", - "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz", + "integrity": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz", - "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.0.tgz", + "integrity": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz", - "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz", + "integrity": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz", - "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz", + "integrity": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz", - "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz", + "integrity": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "freebsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz", - "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==", + "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==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "freebsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-arm": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz", - "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==", + "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==", "cpu": [ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz", - "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==", + "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==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz", - "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz", + "integrity": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==", "cpu": [ "ia32" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz", - "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==", + "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==", "cpu": [ "loong64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz", - "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz", + "integrity": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==", "cpu": [ "mips64el" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz", - "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz", + "integrity": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==", "cpu": [ "ppc64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz", - "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz", + "integrity": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==", "cpu": [ "riscv64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz", - "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==", + "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==", "cpu": [ "s390x" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz", - "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==", + "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==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz", - "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==", + "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==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "netbsd" ], "engines": { - "node": ">=12" + "node": ">=18" + } + }, + "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==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz", - "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz", + "integrity": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "openbsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz", - "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz", + "integrity": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "sunos" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz", - "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz", + "integrity": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz", - "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz", + "integrity": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==", "cpu": [ "ia32" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz", - "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz", + "integrity": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@eslint-community/eslint-utils": { @@ -4420,24 +4413,41 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", + "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", "dev": true, + "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, + "node_modules/@eslint/config-array": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", + "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^2.1.4", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", + "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", "dev": true, + "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", + "espree": "^10.0.1", + "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -4445,7 +4455,7 @@ "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -4456,6 +4466,7 @@ "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", @@ -4467,22 +4478,14 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/@eslint/eslintrc/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==", - "dev": true - }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, + "license": "MIT", "engines": { - "node": ">=8" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -4493,6 +4496,7 @@ "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" }, @@ -4504,51 +4508,37 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/@eslint/eslintrc/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } + "license": "MIT" }, "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "version": "9.9.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz", + "integrity": "sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==", "dev": true, + "license": "MIT", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@fortawesome/fontawesome-free": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz", - "integrity": "sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==", + "node_modules/@eslint/object-schema": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", + "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", "dev": true, - "hasInstallScript": true, + "license": "Apache-2.0", "engines": { - "node": ">=6" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "node_modules/@fortawesome/fontawesome-free": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz", + "integrity": "sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==", "dev": true, - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, + "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)", "engines": { - "node": ">=10.10.0" + "node": ">=6" } }, "node_modules/@humanwhocodes/module-importer": { @@ -4564,17 +4554,299 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "dev": true + "node_modules/@humanwhocodes/retry": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", + "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@inquirer/checkbox": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.5.0.tgz", + "integrity": "sha512-sMgdETOfi2dUHT8r7TT1BTKOwNvdDGFDXYWtQ2J69SvlYNntk9I/gJe7r5yvMwwsuKnYbuRs3pNhx4tgNck5aA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/figures": "^1.0.5", + "@inquirer/type": "^1.5.3", + "ansi-escapes": "^4.3.2", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/confirm": { + "version": "3.1.22", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.22.tgz", + "integrity": "sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.0.10", + "@inquirer/type": "^1.5.2" + }, + "engines": { + "node": ">=18" + } + }, + "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==", + "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", + "ansi-escapes": "^4.3.2", + "cli-spinners": "^2.9.2", + "cli-width": "^4.1.0", + "mute-stream": "^1.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/@types/node": { + "version": "22.5.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.2.tgz", + "integrity": "sha512-acJsPTEqYqulZS/Yp/S3GgeE6GZ0qYODUR8aVr/DkhHQ8l9nd4j5x1/ZJy9/gHrRlFMqkO6i0I3E27Alu4jjPg==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.2" + } + }, + "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" + }, + "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" + } + }, + "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==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3", + "external-editor": "^3.1.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/expand": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.2.0.tgz", + "integrity": "sha512-PD0z1dTRTIlpcnXRMRvdVPfBe10jBf4i7YLBU8tNWDkf3HxqmdymVvqnT8XG+hxQSvqfpJCe13Jv2Iv1eB3bIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "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==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/input": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.3.0.tgz", + "integrity": "sha512-XfnpCStx2xgh1LIRqPXrTNEEByqQWoxsWYzNRSEUxJ5c6EQlhMogJ3vHKu8aXuTacebtaZzMAHwEL0kAflKOBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3" + }, + "engines": { + "node": ">=18" + } + }, + "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==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/password": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.2.0.tgz", + "integrity": "sha512-5otqIpgsPYIshqhgtEwSspBQE40etouR8VIxzpJkv9i0dVHIpyhiivbkH9/dGiMLdyamT54YRdGJLfl8TFnLHg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3", + "ansi-escapes": "^4.3.2" + }, + "engines": { + "node": ">=18" + } + }, + "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==", + "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" + }, + "engines": { + "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==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/search": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.1.0.tgz", + "integrity": "sha512-h+/5LSj51dx7hp5xOn4QFnUaKeARwUCLs6mIhtkJ0JYPBLmEYjdHSYh7I6GrLg9LwpJ3xeX0FZgAG1q0QdCpVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/figures": "^1.0.5", + "@inquirer/type": "^1.5.3", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "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==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/figures": "^1.0.5", + "@inquirer/type": "^1.5.3", + "ansi-escapes": "^4.3.2", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "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==", + "dev": true, + "license": "MIT", + "dependencies": { + "mute-stream": "^1.0.0" + }, + "engines": { + "node": ">=18" + } }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", @@ -4592,6 +4864,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -4603,13 +4876,15 @@ "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, + "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -4627,6 +4902,7 @@ "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" }, @@ -4642,6 +4918,7 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", @@ -4654,27 +4931,12 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, - "dependencies": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4683,7 +4945,7 @@ "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, + "license": "MIT", "dependencies": { "@sinclair/typebox": "^0.27.8" }, @@ -4696,6 +4958,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -4706,10 +4969,11 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -4719,6 +4983,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -4728,800 +4993,292 @@ "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25" } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true, + "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@jsonjoy.com/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "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==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/base64": "^1.1.1", + "@jsonjoy.com/util": "^1.1.2", + "hyperdyperid": "^1.2.0", + "thingies": "^1.20.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "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==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, "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==" }, "node_modules/@leichtgewicht/ip-codec": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", - "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", - "dev": true + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz", + "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==", + "dev": true, + "license": "MIT" }, - "node_modules/@ljharb/through": { - "version": "2.3.12", - "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.12.tgz", - "integrity": "sha512-ajo/heTlG3QgC8EGP6APIejksVAYt4ayz4tqoP3MolFELzcH1x1fzwEYRJTPO0IELutZ5HQ0c26/GqAYy79u3g==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.5" + "@inquirer/type": "^1.5.1" }, "engines": { - "node": ">= 0.4" + "node": ">=18.0.0" + }, + "peerDependencies": { + "@inquirer/prompts": ">= 3 < 6" } }, - "node_modules/@material/animation": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-1GSJaPKef+7HRuV+HusVZHps64cmZuOItDbt40tjJVaikcaZvwmHlcTxRIqzcRoCdt5ZKHh3NoO7GB9Khg4Jnw==", - "dependencies": { - "tslib": "^2.1.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==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] }, - "node_modules/@material/auto-init": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-t7ZGpRJ3ec0QDUO0nJu/SMgLW7qcuG2KqIsEYD1Ej8qhI2xpdR2ydSDQOkVEitXmKoGol1oq4nYSBjTlB65GqA==", - "dependencies": { - "@material/base": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } + "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==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] }, - "node_modules/@material/banner": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-g9wBUZzYBizyBcBQXTIafnRUUPi7efU9gPJfzeGgkynXiccP/vh5XMmH+PBxl5v+4MlP/d4cZ2NUYoAN7UTqSA==", - "dependencies": { - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/button": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } + "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==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@material/base": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-I9KQOKXpLfJkP8MqZyr8wZIzdPHrwPjFvGd9zSK91/vPyE4hzHRJc/0njsh9g8Lm9PRYLbifXX+719uTbHxx+A==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/button": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-BHB7iyHgRVH+JF16+iscR+Qaic+p7LU1FOLgP8KucRlpF9tTwIxQA6mJwGRi5gUtcG+vyCmzVS+hIQ6DqT/7BA==", - "dependencies": { - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/focus-ring": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/touch-target": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/card": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-kt7y9/IWOtJTr3Z/AoWJT3ZLN7CLlzXhx2udCLP9ootZU2bfGK0lzNwmo80bv/pJfrY9ihQKCtuGTtNxUy+vIw==", - "dependencies": { - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/checkbox": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-rURcrL5O1u6hzWR+dNgiQ/n89vk6tdmdP3mZgnxJx61q4I/k1yijKqNJSLrkXH7Rto3bM5NRKMOlgvMvVd7UMQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/focus-ring": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/touch-target": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-AYAivV3GSk/T/nRIpH27sOHFPaSMrE3L0WYbnb5Wa93FgY8a0fbsFYtSH2QmtwnzXveg+B1zGTt7/xIIcynKdQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/checkbox": "15.0.0-canary.7f224ddd4.0", - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/focus-ring": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/touch-target": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "safevalues": "^0.3.4", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/circular-progress": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-DJrqCKb+LuGtjNvKl8XigvyK02y36GRkfhMUYTcJEi3PrOE00bwXtyj7ilhzEVshQiXg6AHGWXtf5UqwNrx3Ow==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/progress-indicator": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/data-table": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-/2WZsuBIq9z9RWYF5Jo6b7P6u0fwit+29/mN7rmAZ6akqUR54nXyNfoSNiyydMkzPlZZsep5KrSHododDhBZbA==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/checkbox": "15.0.0-canary.7f224ddd4.0", - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/icon-button": "15.0.0-canary.7f224ddd4.0", - "@material/linear-progress": "15.0.0-canary.7f224ddd4.0", - "@material/list": "15.0.0-canary.7f224ddd4.0", - "@material/menu": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/select": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/touch-target": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/density": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-o9EXmGKVpiQ6mHhyV3oDDzc78Ow3E7v8dlaOhgaDSXgmqaE8v5sIlLNa/LKSyUga83/fpGk3QViSGXotpQx0jA==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/dialog": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-u0XpTlv1JqWC/bQ3DavJ1JguofTelLT2wloj59l3/1b60jv42JQ6Am7jU3I8/SIUB1MKaW7dYocXjDWtWJakLA==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/button": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/icon-button": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/touch-target": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/dom": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-mQ1HT186GPQSkRg5S18i70typ5ZytfjL09R0gJ2Qg5/G+MLCGi7TAjZZSH65tuD/QGOjel4rDdWOTmYbPYV6HA==", - "dependencies": { - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/drawer": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-qyO0W0KBftfH8dlLR0gVAgv7ZHNvU8ae11Ao6zJif/YxcvK4+gph1z8AO4H410YmC2kZiwpSKyxM1iQCCzbb4g==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/list": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/elevation": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-tV6s4/pUBECedaI36Yj18KmRCk1vfue/JP/5yYRlFNnLMRVISePbZaKkn/BHXVf+26I3W879+XqIGlDVdmOoMA==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/fab": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-4h76QrzfZTcPdd+awDPZ4Q0YdSqsXQnS540TPtyXUJ/5G99V6VwGpjMPIxAsW0y+pmI9UkLL/srrMaJec+7r4Q==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/focus-ring": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/touch-target": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/feature-targeting": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-SAjtxYh6YlKZriU83diDEQ7jNSP2MnxKsER0TvFeyG1vX/DWsUyYDOIJTOEa9K1N+fgJEBkNK8hY55QhQaspew==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/floating-label": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-0KMo5ijjYaEHPiZ2pCVIcbaTS2LycvH9zEhEMKwPPGssBCX7iz5ffYQFk7e5yrQand1r3jnQQgYfHAwtykArnQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/focus-ring": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-Jmg1nltq4J6S6A10EGMZnvufrvU3YTi+8R8ZD9lkSbun0Fm2TVdICQt/Auyi6An9zP66oQN6c31eqO6KfIPsDg==", - "dependencies": { - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0" - } - }, - "node_modules/@material/form-field": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-fEPWgDQEPJ6WF7hNnIStxucHR9LE4DoDSMqCsGWS2Yu+NLZYLuCEecgR0UqQsl1EQdNRaFh8VH93KuxGd2hiPg==", - "dependencies": { - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/icon-button": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-DcK7IL4ICY/DW+48YQZZs9g0U1kRaW0Wb0BxhvppDMYziHo/CTpFdle4gjyuTyRxPOdHQz5a97ru48Z9O4muTw==", - "dependencies": { - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/focus-ring": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/touch-target": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/image-list": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-voMjG2p80XbjL1B2lmF65zO5gEgJOVKClLdqh4wbYzYfwY/SR9c8eLvlYG7DLdFaFBl/7gGxD8TvvZ329HUFPw==", - "dependencies": { - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/layout-grid": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-veDABLxMn2RmvfnUO2RUmC1OFfWr4cU+MrxKPoDD2hl3l3eDYv5fxws6r5T1JoSyXoaN+oEZpheS0+M9Ure8Pg==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/line-ripple": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-f60hVJhIU6I3/17Tqqzch1emUKEcfVVgHVqADbU14JD+oEIz429ZX9ksZ3VChoU3+eejFl+jVdZMLE/LrAuwpg==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/linear-progress": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-pRDEwPQielDiC9Sc5XhCXrGxP8wWOnAO8sQlMebfBYHYqy5hhiIzibezS8CSaW4MFQFyXmCmpmqWlbqGYRmiyg==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/progress-indicator": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/list": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-Is0NV91sJlXF5pOebYAtWLF4wU2MJDbYqztML/zQNENkQxDOvEXu3nWNb3YScMIYJJXvARO0Liur5K4yPagS1Q==", - "dependencies": { - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/menu": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-D11QU1dXqLbh5X1zKlEhS3QWh0b5BPNXlafc5MXfkdJHhOiieb7LC9hMJhbrHtj24FadJ7evaFW/T2ugJbJNnQ==", - "dependencies": { - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/list": "15.0.0-canary.7f224ddd4.0", - "@material/menu-surface": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/menu-surface": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-7RZHvw0gbwppaAJ/Oh5SWmfAKJ62aw1IMB3+3MRwsb5PLoV666wInYa+zJfE4i7qBeOn904xqT2Nko5hY0ssrg==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/notched-outline": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-Yg2usuKB2DKlKIBISbie9BFsOVuffF71xjbxPbybvqemxqUBd+bD5/t6H1fLE+F8/NCu5JMigho4ewUU+0RCiw==", - "dependencies": { - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/floating-label": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/progress-indicator": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-UPbDjE5CqT+SqTs0mNFG6uFEw7wBlgYmh+noSkQ6ty/EURm8lF125dmi4dv4kW0+octonMXqkGtAoZwLIHKf/w==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/radio": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-wR1X0Sr0KmQLu6+YOFKAI84G3L6psqd7Kys5kfb8WKBM36zxO5HQXC5nJm/Y0rdn22ixzsIz2GBo0MNU4V4k1A==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/focus-ring": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/touch-target": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/ripple": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-JqOsWM1f4aGdotP0rh1vZlPZTg6lZgh39FIYHFMfOwfhR+LAikUJ+37ciqZuewgzXB6iiRO6a8aUH6HR5SJYPg==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/rtl": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-UVf14qAtmPiaaZjuJtmN36HETyoKWmsZM/qn1L5ciR2URb8O035dFWnz4ZWFMmAYBno/L7JiZaCkPurv2ZNrGA==", - "dependencies": { - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/segmented-button": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-LCnVRUSAhELTKI/9hSvyvIvQIpPpqF29BV+O9yM4WoNNmNWqTulvuiv7grHZl6Z+kJuxSg4BGbsPxxb9dXozPg==", - "dependencies": { - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/touch-target": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/select": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-WioZtQEXRpglum0cMSzSqocnhsGRr+ZIhvKb3FlaNrTaK8H3Y4QA7rVjv3emRtrLOOjaT6/RiIaUMTo9AGzWQQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/floating-label": "15.0.0-canary.7f224ddd4.0", - "@material/line-ripple": "15.0.0-canary.7f224ddd4.0", - "@material/list": "15.0.0-canary.7f224ddd4.0", - "@material/menu": "15.0.0-canary.7f224ddd4.0", - "@material/menu-surface": "15.0.0-canary.7f224ddd4.0", - "@material/notched-outline": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/shape": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-8z8l1W3+cymObunJoRhwFPKZ+FyECfJ4MJykNiaZq7XJFZkV6xNmqAVrrbQj93FtLsECn9g4PjjIomguVn/OEw==", - "dependencies": { - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/slider": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-QU/WSaSWlLKQRqOhJrPgm29wqvvzRusMqwAcrCh1JTrCl+xwJ43q5WLDfjYhubeKtrEEgGu9tekkAiYfMG7EBw==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/snackbar": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-sm7EbVKddaXpT/aXAYBdPoN0k8yeg9+dprgBUkrdqGzWJAeCkxb4fv2B3He88YiCtvkTz2KLY4CThPQBSEsMFQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/button": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/icon-button": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/switch": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-lEDJfRvkVyyeHWIBfoxYjJVl+WlEAE2kZ/+6OqB1FW0OV8ftTODZGhHRSzjVBA1/p4FPuhAtKtoK9jTpa4AZjA==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/focus-ring": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "safevalues": "^0.3.4", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/tab": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-E1xGACImyCLurhnizyOTCgOiVezce4HlBFAI6YhJo/AyVwjN2Dtas4ZLQMvvWWqpyhITNkeYdOchwCC1mrz3AQ==", - "dependencies": { - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/focus-ring": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/tab-indicator": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/tab-bar": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-p1Asb2NzrcECvAQU3b2SYrpyJGyJLQWR+nXTYzDKE8WOpLIRCXap2audNqD7fvN/A20UJ1J8U01ptrvCkwJ4eA==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/tab": "15.0.0-canary.7f224ddd4.0", - "@material/tab-indicator": "15.0.0-canary.7f224ddd4.0", - "@material/tab-scroller": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } + "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==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@material/tab-indicator": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-h9Td3MPqbs33spcPS7ecByRHraYgU4tNCZpZzZXw31RypjKvISDv/PS5wcA4RmWqNGih78T7xg4QIGsZg4Pk4w==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } + "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==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@material/tab-scroller": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-LFeYNjQpdXecwECd8UaqHYbhscDCwhGln5Yh+3ctvcEgvmDPNjhKn/DL3sWprWvG8NAhP6sHMrsGhQFVdCWtTg==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/tab": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } + "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==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] }, - "node_modules/@material/textfield": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-AExmFvgE5nNF0UA4l2cSzPghtxSUQeeoyRjFLHLy+oAaE4eKZFrSy0zEpqPeWPQpEMDZk+6Y+6T3cOFYBeSvsw==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/floating-label": "15.0.0-canary.7f224ddd4.0", - "@material/line-ripple": "15.0.0-canary.7f224ddd4.0", - "@material/notched-outline": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } + "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", + "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] }, - "node_modules/@material/theme": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-hs45hJoE9yVnoVOcsN1jklyOa51U4lzWsEnQEuJTPOk2+0HqCQ0yv/q0InpSnm2i69fNSyZC60+8HADZGF8ugQ==", - "dependencies": { - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } + "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz", + "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] }, - "node_modules/@material/tokens": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-r9TDoicmcT7FhUXC4eYMFnt9TZsz0G8T3wXvkKncLppYvZ517gPyD/1+yhuGfGOxAzxTrM66S/oEc1fFE2q4hw==", - "dependencies": { - "@material/elevation": "15.0.0-canary.7f224ddd4.0" - } + "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz", + "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@material/tooltip": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-8qNk3pmPLTnam3XYC1sZuplQXW9xLn4Z4MI3D+U17Q7pfNZfoOugGr+d2cLA9yWAEjVJYB0mj8Yu86+udo4N9w==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/button": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tokens": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "safevalues": "^0.3.4", - "tslib": "^2.1.0" - } + "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz", + "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@material/top-app-bar": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-SARR5/ClYT4CLe9qAXakbr0i0cMY0V3V4pe3ElIJPfL2Z2c4wGR1mTR8m2LxU1MfGKK8aRoUdtfKaxWejp+eNA==", - "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } + "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz", + "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@material/touch-target": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-BJo/wFKHPYLGsRaIpd7vsQwKr02LtO2e89Psv0on/p0OephlNIgeB9dD9W+bQmaeZsZ6liKSKRl6wJWDiK71PA==", - "dependencies": { - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" - } + "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz", + "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] }, - "node_modules/@material/typography": { - "version": "15.0.0-canary.7f224ddd4.0", - "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.7f224ddd4.0.tgz", - "integrity": "sha512-kBaZeCGD50iq1DeRRH5OM5Jl7Gdk+/NOfKArkY4ksBZvJiStJ7ACAhpvb8MEGm4s3jvDInQFLsDq3hL+SA79sQ==", + "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==", + "license": "MIT", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.1.0" + "@emnapi/core": "^1.1.0", + "@emnapi/runtime": "^1.1.0", + "@tybys/wasm-util": "^0.9.0" } }, "node_modules/@ngneat/dag": { @@ -5538,53 +5295,69 @@ "rxjs": "~6.5.5" } }, + "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==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.0" + }, + "peerDependencies": { + "@angular/common": "^18.0.0", + "@angular/core": "^18.0.0", + "rxjs": "^6.5.3 || ^7.5.0" + } + }, "node_modules/@ngrx/effects": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-17.2.0.tgz", - "integrity": "sha512-tXDJNsuBtbvI/7+vYnkDKKpUvLbopw1U5G6LoPnKNrbTPsPcUGmCqF5Su/ZoRN3BhXjt2j+eoeVdpBkxdxMRgg==", + "version": "18.1.1", + "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-18.1.1.tgz", + "integrity": "sha512-XXob8kYEvYMaZwgHtrrTW0XZargbu5PloEpNHLnzB8jPk0yWEw6keryxaF09Ylws1779MWvMmF/YP2rPl04nHQ==", + "license": "MIT", "dependencies": { - "@ngrx/operators": "17.0.0-beta.0", "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^17.0.0", - "@ngrx/store": "17.2.0", + "@angular/core": "^18.0.0", + "@ngrx/store": "18.1.1", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngrx/entity": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@ngrx/entity/-/entity-17.2.0.tgz", - "integrity": "sha512-epXgojGXCrVMNrFdv60704iRUU+pYkE1qHBppP/wqKbZZIZHaagsg2jy8/ptDP7U3udvVq0z9suc1s+zpmL2EA==", + "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==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^17.0.0", - "@ngrx/store": "17.2.0", + "@angular/core": "^18.0.0", + "@ngrx/store": "18.1.1", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngrx/eslint-plugin": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@ngrx/eslint-plugin/-/eslint-plugin-17.2.0.tgz", - "integrity": "sha512-fkbv98Pch92R0AYj5pzU9YWicn5JZWVex3BqSdfV1xsuTk53QDhZZ0yIDSqjvjubv4J6GGxm5dnpEjceE4Wx/g==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/experimental-utils": "^5.4.0", - "eslint-etc": "^5.1.0", "semver": "^7.3.5", "strip-json-comments": "3.1.1" }, "peerDependencies": { - "eslint": ">=8.0.0", + "@typescript-eslint/utils": "^7.11.0 || ^8.0.0-alpha.20", + "eslint": "^8.57.0 || ^9.0.0", "typescript": "*" } }, "node_modules/@ngrx/operators": { - "version": "17.0.0-beta.0", - "resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-17.0.0-beta.0.tgz", - "integrity": "sha512-EbO8AONuQ6zo2v/mPyBOi4y0CTAp1x4Z+bx7ZF+Pd8BL5ma53BTCL1TmzaeK5zPUe0yApudLk9/ZbHXPnVox5A==", + "version": "18.1.1", + "resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-18.1.1.tgz", + "integrity": "sha512-RB156PouKI/E79jxvJLaDFYMHz9JVFR8f4ogfAeT7sh2dDGoK4A+B0n1Cl0iYW9fpcJCdfB/mu7TkH6auFv1aQ==", + "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, @@ -5593,64 +5366,70 @@ } }, "node_modules/@ngrx/router-store": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-17.2.0.tgz", - "integrity": "sha512-Vynfg2xsB57Oedf0Bb6mjC4MIeaF2OtAewsSnppGIM2b8pwL5W89r2+q2SGc2D6Mp3/pZF3HRI6NxhnHWJdYmg==", + "version": "18.1.1", + "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-18.1.1.tgz", + "integrity": "sha512-S1/09T8EJHso1keOZ2Q3hb1oAsdJ/FSEWkn24yWJXftbXOKJq1jnrYhNaVm5gPnxGzdQ1mqRtLuMKaDClyxP5A==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/common": "^17.0.0", - "@angular/core": "^17.0.0", - "@angular/router": "^17.0.0", - "@ngrx/store": "17.2.0", + "@angular/common": "^18.0.0", + "@angular/core": "^18.0.0", + "@angular/router": "^18.0.0", + "@ngrx/store": "18.1.1", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngrx/schematics": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@ngrx/schematics/-/schematics-17.2.0.tgz", - "integrity": "sha512-7YQyPWaadxY2+Fe0oFIkClMpEKsC2HaxdjJY8SRTLnFOHj070r3Kp6mxGee46MVdfDNK47bUYnMPQi9A25EcVQ==", - "dev": true + "version": "18.1.1", + "resolved": "https://registry.npmjs.org/@ngrx/schematics/-/schematics-18.1.1.tgz", + "integrity": "sha512-6EexKNoTNzwHf8AIXcioOm11l6rTZ8WUpGYiPTSW2I/Pn5CsjCBDwbBDEHJZ1RqGoCXpunZn6adH63A2V8V4Sg==", + "dev": true, + "license": "MIT" }, "node_modules/@ngrx/store": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-17.2.0.tgz", - "integrity": "sha512-7wKgZ59B/6yQSvvsU0DQXipDqpkAXv7LwcXLD5Ww7nvqN0fQoRPThMh4+Wv55DCJhE0bQc1NEMciLA47uRt7Wg==", + "version": "18.1.1", + "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-18.1.1.tgz", + "integrity": "sha512-K0v1akJ2sEnIeb1AUA064+ksgRgbMgVG9HbSsLBxENbFjK2ZvKRxo1bpOw6WHW9+hyDTlhZGl7+gUtjmo3497g==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^17.0.0", + "@angular/core": "^18.0.0", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngrx/store-devtools": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-17.2.0.tgz", - "integrity": "sha512-ig0qr6hMexZGnrlxfHvZmu5CanRjH7hhx60XUbB5BdBvWJIIRaWKPLcsniiDUhljAD87gvzrrilbCTiML38+CA==", + "version": "18.1.1", + "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-18.1.1.tgz", + "integrity": "sha512-tfn9Ms1q2bl7VDWwHyj7dUbwmGiiVzIpOKZs39rsms8tG8hbvsxoczyQAp2w5erVtoJb8ltIh1/birKkS7HmuQ==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@ngrx/store": "17.2.0", + "@angular/core": "^18.0.0", + "@ngrx/store": "18.1.1", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngtools/webpack": { - "version": "17.3.6", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.6.tgz", - "integrity": "sha512-equxbgh2DKzZtiFMoVf1KD4yJcH1q8lpqQ/GSPPQUvONcmHrr+yqdRUdaJ7oZCyCYmXF/nByBxtMKtJr6nKZVg==", + "version": "18.2.11", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.11.tgz", + "integrity": "sha512-iTdUGJ5O7yMm1DyCzyoMDMxBJ68emUSSXPWbQzEEdcqmtifRebn+VAq4vHN8OmtGM1mtuKeLEsbiZP8ywrw7Ug==", "dev": true, + "license": "MIT", "engines": { - "node": "^18.13.0 || >=20.9.0", + "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": { - "@angular/compiler-cli": "^17.0.0", - "typescript": ">=5.2 <5.5", + "@angular/compiler-cli": "^18.0.0", + "typescript": ">=5.4 <5.6", "webpack": "^5.54.0" } }, @@ -5658,7 +5437,6 @@ "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, "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -5671,7 +5449,6 @@ "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, "engines": { "node": ">= 8" } @@ -5680,7 +5457,6 @@ "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, "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -5694,6 +5470,7 @@ "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", "dev": true, + "license": "ISC", "dependencies": { "agent-base": "^7.1.0", "http-proxy-agent": "^7.0.0", @@ -5705,20 +5482,12 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/@npmcli/agent/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", - "dev": true, - "engines": { - "node": "14 || >=16.14" - } - }, "node_modules/@npmcli/fs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", - "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", "dev": true, + "license": "ISC", "dependencies": { "semver": "^7.3.5" }, @@ -5727,12 +5496,14 @@ } }, "node_modules/@npmcli/git": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.7.tgz", - "integrity": "sha512-WaOVvto604d5IpdCRV2KjQu8PzkfE96d50CQGKgywXh2GxXmDeUO5EWcBC4V57uFyrNqx83+MewuJh3WTR3xPA==", + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz", + "integrity": "sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==", "dev": true, + "license": "ISC", "dependencies": { "@npmcli/promise-spawn": "^7.0.0", + "ini": "^4.1.3", "lru-cache": "^10.0.1", "npm-pick-manifest": "^9.0.0", "proc-log": "^4.0.0", @@ -5750,33 +5521,17 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=16" } }, - "node_modules/@npmcli/git/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", - "dev": true, - "engines": { - "node": "14 || >=16.14" - } - }, - "node_modules/@npmcli/git/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==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "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==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^3.1.1" }, @@ -5792,6 +5547,7 @@ "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz", "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==", "dev": true, + "license": "ISC", "dependencies": { "npm-bundled": "^3.0.0", "npm-normalize-package-bin": "^3.0.0" @@ -5808,15 +5564,17 @@ "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", "dev": true, + "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/@npmcli/package-json": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.1.0.tgz", - "integrity": "sha512-1aL4TuVrLS9sf8quCLerU3H9J4vtCtgu8VauYozrmEyU57i/EdKleCnsQ7vpnABIH6c9mnTxcH5sFkO3BlV8wQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.0.tgz", + "integrity": "sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==", "dev": true, + "license": "ISC", "dependencies": { "@npmcli/git": "^5.0.0", "glob": "^10.2.2", @@ -5830,66 +5588,12 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/@npmcli/package-json/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, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@npmcli/package-json/node_modules/glob": { - "version": "10.3.12", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", - "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", - "dev": true, - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.10.2" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@npmcli/package-json/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@npmcli/package-json/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==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.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==", "dev": true, + "license": "ISC", "dependencies": { "which": "^4.0.0" }, @@ -5902,6 +5606,7 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=16" } @@ -5911,6 +5616,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^3.1.1" }, @@ -5922,24 +5628,27 @@ } }, "node_modules/@npmcli/redact": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-1.1.0.tgz", - "integrity": "sha512-PfnWuOkQgu7gCbnSsAisaX7hKOdZ4wSAhAzH3/ph5dSGau52kCRrMMGbiSQLwyTZpgldkZ49b0brkOr1AzGBHQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz", + "integrity": "sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==", "dev": true, + "license": "ISC", "engines": { "node": "^16.14.0 || >=18.0.0" } }, "node_modules/@npmcli/run-script": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.4.tgz", - "integrity": "sha512-9ApYM/3+rBt9V80aYg6tZfzj3UWdiYyCt7gJUD1VJKvWF5nwKDSICXbYIQbspFTq6TOpbsEtIC0LArB8d9PFmg==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-8.1.0.tgz", + "integrity": "sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==", "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" }, "engines": { @@ -5951,6 +5660,7 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=16" } @@ -5960,6 +5670,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^3.1.1" }, @@ -5970,54 +5681,57 @@ "node": "^16.13.0 || >=18.0.0" } }, - "node_modules/@nrwl/devkit": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-17.2.8.tgz", - "integrity": "sha512-l2dFy5LkWqSA45s6pee6CoqJeluH+sjRdVnAAQfjLHRNSx6mFAKblyzq5h1f4P0EUCVVVqLs+kVqmNx5zxYqvw==", - "dev": true, - "dependencies": { - "@nx/devkit": "17.2.8" - } - }, - "node_modules/@nrwl/tao": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-17.2.8.tgz", - "integrity": "sha512-Qpk5YKeJ+LppPL/wtoDyNGbJs2MsTi6qyX/RdRrEc8lc4bk6Cw3Oul1qTXCI6jT0KzTz+dZtd0zYD/G7okkzvg==", - "dev": true, - "dependencies": { - "nx": "17.2.8", - "tslib": "^2.3.0" - }, - "bin": { - "tao": "index.js" - } - }, "node_modules/@nx/devkit": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-17.2.8.tgz", - "integrity": "sha512-6LtiQihtZwqz4hSrtT5cCG5XMCWppG6/B8c1kNksg97JuomELlWyUyVF+sxmeERkcLYFaKPTZytP0L3dmCFXaw==", - "dev": true, + "version": "20.0.9", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-20.0.9.tgz", + "integrity": "sha512-dAdHJ4e7YNTOozMgjRCl/xxRqOB26+gFH4ByzfGLll9/6FJ2aoaPjA/9rg+qYnso8trljC0YnEYeYw5qgcjZ+A==", + "license": "MIT", "dependencies": { - "@nrwl/devkit": "17.2.8", "ejs": "^3.1.7", "enquirer": "~2.3.6", "ignore": "^5.0.4", - "semver": "7.5.3", + "minimatch": "9.0.3", + "semver": "^7.5.3", "tmp": "~0.2.1", - "tslib": "^2.3.0" + "tslib": "^2.3.0", + "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": ">= 16 <= 18" + "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==", + "license": "MIT", + "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==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-17.2.8.tgz", - "integrity": "sha512-dMb0uxug4hM7tusISAU1TfkDK3ixYmzc1zhHSZwpR7yKJIyKLtUpBTbryt8nyso37AS1yH+dmfh2Fj2WxfBHTg==", + "version": "20.0.9", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.0.9.tgz", + "integrity": "sha512-7vAxUVK8BnyQTMBBkGjSPCDC52VQ6UtO3bs6yCOECA8fbrxPVdnu5/Ep9x9pZsmx6YQAKMaVS/ODZU6ElZdEdw==", "cpu": [ "arm64" ], - "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -6027,13 +5741,13 @@ } }, "node_modules/@nx/nx-darwin-x64": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-17.2.8.tgz", - "integrity": "sha512-0cXzp1tGr7/6lJel102QiLA4NkaLCkQJj6VzwbwuvmuCDxPbpmbz7HC1tUteijKBtOcdXit1/MEoEU007To8Bw==", + "version": "20.0.9", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.0.9.tgz", + "integrity": "sha512-6exHy9q1Mzp8ImT3q6XQCn31MlCCsN/Tu321r0b1FnRoMiMv9iEZupr0/VvjCI0Xis+u9to61az4dA94QKeEOw==", "cpu": [ "x64" ], - "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -6043,13 +5757,13 @@ } }, "node_modules/@nx/nx-freebsd-x64": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-17.2.8.tgz", - "integrity": "sha512-YFMgx5Qpp2btCgvaniDGdu7Ctj56bfFvbbaHQWmOeBPK1krNDp2mqp8HK6ZKOfEuDJGOYAp7HDtCLvdZKvJxzA==", + "version": "20.0.9", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.0.9.tgz", + "integrity": "sha512-LjgSKieOlocwgw6Lr9pr/c15/yMLZC/9ay8aDArmp7JbNUCj4T1sdMKwTC9TQZoagAAIgflbKe9Bvt+Flw3z4w==", "cpu": [ "x64" ], - "dev": true, + "license": "MIT", "optional": true, "os": [ "freebsd" @@ -6059,13 +5773,13 @@ } }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-17.2.8.tgz", - "integrity": "sha512-iN2my6MrhLRkVDtdivQHugK8YmR7URo1wU9UDuHQ55z3tEcny7LV3W9NSsY9UYPK/FrxdDfevj0r2hgSSdhnzA==", + "version": "20.0.9", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.0.9.tgz", + "integrity": "sha512-IMssDZQNdpqrQHuIliI4Pfj2MkESnOqDMZPS2TX5w9InQvcMBUJA9WQNbBv/TCKQIw9CXwqpRxYIEH52MhdhbQ==", "cpu": [ "arm" ], - "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6075,13 +5789,13 @@ } }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-17.2.8.tgz", - "integrity": "sha512-Iy8BjoW6mOKrSMiTGujUcNdv+xSM1DALTH6y3iLvNDkGbjGK1Re6QNnJAzqcXyDpv32Q4Fc57PmuexyysZxIGg==", + "version": "20.0.9", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.0.9.tgz", + "integrity": "sha512-OzUsgmdptU2ooUrDj817rABXDmdbgSp3LCs6AE3Aq5v9goZS/6Qn1R96NEoj5c8RQL0pi+G8U+BCcnUSgTF1Zw==", "cpu": [ "arm64" ], - "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6091,13 +5805,13 @@ } }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-17.2.8.tgz", - "integrity": "sha512-9wkAxWzknjpzdofL1xjtU6qPFF1PHlvKCZI3hgEYJDo4mQiatGI+7Ttko+lx/ZMP6v4+Umjtgq7+qWrApeKamQ==", + "version": "20.0.9", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.0.9.tgz", + "integrity": "sha512-yqtftEa9wCk2OK2ZYKkotdzpMrA8EUqjCHLsFH3KDMpHMaDw3NtUGGMinsjXj4IEuL6Xx/r+T9NVjSK78z6IzQ==", "cpu": [ "arm64" ], - "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6107,13 +5821,13 @@ } }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-17.2.8.tgz", - "integrity": "sha512-sjG1bwGsjLxToasZ3lShildFsF0eyeGu+pOQZIp9+gjFbeIkd19cTlCnHrOV9hoF364GuKSXQyUlwtFYFR4VTQ==", + "version": "20.0.9", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.0.9.tgz", + "integrity": "sha512-oTB3yMzHyDMErl00WVZ+mf4o0f8bwBdd6VyQs+oHQPE05JysgzvbQZkAY5VlSmCyIWO4OdJMfMd9ojAe7Q6FzQ==", "cpu": [ "x64" ], - "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6123,13 +5837,13 @@ } }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-17.2.8.tgz", - "integrity": "sha512-QiakXZ1xBCIptmkGEouLHQbcM4klQkcr+kEaz2PlNwy/sW3gH1b/1c0Ed5J1AN9xgQxWspriAONpScYBRgxdhA==", + "version": "20.0.9", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.0.9.tgz", + "integrity": "sha512-1bEyKyCr0N6gcEK9fMjsNgmaSGJ+CC0ieAW6t+wGt0uzRyyJ6Oe+uxTUEEXTxmW0U1wVxBVPI0iWc3bFUUSHLw==", "cpu": [ "x64" ], - "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6139,13 +5853,13 @@ } }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-17.2.8.tgz", - "integrity": "sha512-XBWUY/F/GU3vKN9CAxeI15gM4kr3GOBqnzFZzoZC4qJt2hKSSUEWsMgeZtsMgeqEClbi4ZyCCkY7YJgU32WUGA==", + "version": "20.0.9", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.0.9.tgz", + "integrity": "sha512-VnEPwusMRta09bmxKIlnLgqzNLaJ3zoXcTYIajxVgsLzcam73iNQ32vMarMXNEC+t+HIHvCjMjLDaYSJBVcMHA==", "cpu": [ "arm64" ], - "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -6155,13 +5869,13 @@ } }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-17.2.8.tgz", - "integrity": "sha512-HTqDv+JThlLzbcEm/3f+LbS5/wYQWzb5YDXbP1wi7nlCTihNZOLNqGOkEmwlrR5tAdNHPRpHSmkYg4305W0CtA==", + "version": "20.0.9", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.0.9.tgz", + "integrity": "sha512-cmkXpXT54cKFlXDDREoeHLxN6ml2G0VmMn+anVbMCmuDF0+MNZw6VoZHYMsWuNTknENj94P+dVnF6X/AQeHlEA==", "cpu": [ "x64" ], - "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -6175,11 +5889,25 @@ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", "dev": true, + "license": "MIT", "optional": true, "engines": { "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, + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "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", @@ -6188,6 +5916,7 @@ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" @@ -6201,6 +5930,7 @@ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" @@ -6214,6 +5944,7 @@ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -6227,6 +5958,7 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -6240,6 +5972,7 @@ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6253,6 +5986,7 @@ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6266,6 +6000,7 @@ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6279,6 +6014,7 @@ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6292,6 +6028,7 @@ "ppc64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6305,6 +6042,7 @@ "riscv64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6318,6 +6056,7 @@ "s390x" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6331,6 +6070,7 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6344,6 +6084,7 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -6357,6 +6098,7 @@ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -6370,6 +6112,7 @@ "ia32" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -6383,40 +6126,37 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" ] }, "node_modules/@schematics/angular": { - "version": "17.3.6", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.6.tgz", - "integrity": "sha512-jCNZdjHSVrI8TrrCnCoXC8GYvQRj7zh+SDdmm91Ve8dbikYNmBOKYLuPaCTsmojWx7ytv962yLlgKzpaa2bbfw==", + "version": "18.2.11", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.11.tgz", + "integrity": "sha512-jT54mc9+hPOwie9bji/g2krVuK1kkNh2PNFGwfgCg3Ofmt3hcyOBai1DKuot5uLTX4VCCbvfwiVR/hJniQl2SA==", "dev": true, + "license": "MIT", "dependencies": { - "@angular-devkit/core": "17.3.6", - "@angular-devkit/schematics": "17.3.6", - "jsonc-parser": "3.2.1" + "@angular-devkit/core": "18.2.11", + "@angular-devkit/schematics": "18.2.11", + "jsonc-parser": "3.3.1" }, "engines": { - "node": "^18.13.0 || >=20.9.0", + "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/@schematics/angular/node_modules/jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", - "dev": true - }, "node_modules/@sigstore/bundle": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.1.tgz", - "integrity": "sha512-eqV17lO3EIFqCWK3969Rz+J8MYrRZKw9IBHpSo6DEcEX2c+uzDFOgHE9f2MnyDpfs48LFO4hXmk9KhQ74JzU1g==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz", + "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@sigstore/protobuf-specs": "^0.3.1" + "@sigstore/protobuf-specs": "^0.3.2" }, "engines": { "node": "^16.14.0 || >=18.0.0" @@ -6427,56 +6167,63 @@ "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz", "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^16.14.0 || >=18.0.0" } }, "node_modules/@sigstore/protobuf-specs": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.1.tgz", - "integrity": "sha512-aIL8Z9NsMr3C64jyQzE0XlkEyBLpgEJJFDHLVVStkFV5Q3Il/r/YtY6NJWKQ4cy4AE7spP1IX5Jq7VCAxHHMfQ==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.2.tgz", + "integrity": "sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^16.14.0 || >=18.0.0" } }, "node_modules/@sigstore/sign": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.0.tgz", - "integrity": "sha512-tsAyV6FC3R3pHmKS880IXcDJuiFJiKITO1jxR1qbplcsBkZLBmjrEw5GbC7ikD6f5RU1hr7WnmxB/2kKc1qUWQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz", + "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@sigstore/bundle": "^2.3.0", + "@sigstore/bundle": "^2.3.2", "@sigstore/core": "^1.0.0", - "@sigstore/protobuf-specs": "^0.3.1", - "make-fetch-happen": "^13.0.0" + "@sigstore/protobuf-specs": "^0.3.2", + "make-fetch-happen": "^13.0.1", + "proc-log": "^4.2.0", + "promise-retry": "^2.0.1" }, "engines": { "node": "^16.14.0 || >=18.0.0" } }, "node_modules/@sigstore/tuf": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.2.tgz", - "integrity": "sha512-mwbY1VrEGU4CO55t+Kl6I7WZzIl+ysSzEYdA1Nv/FTrl2bkeaPXo5PnWZAVfcY2zSdhOpsUTJW67/M2zHXGn5w==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz", + "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@sigstore/protobuf-specs": "^0.3.0", - "tuf-js": "^2.2.0" + "@sigstore/protobuf-specs": "^0.3.2", + "tuf-js": "^2.2.1" }, "engines": { "node": "^16.14.0 || >=18.0.0" } }, "node_modules/@sigstore/verify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.0.tgz", - "integrity": "sha512-hQF60nc9yab+Csi4AyoAmilGNfpXT+EXdBgFkP9OgPwIBPwyqVf7JAWPtmqrrrneTmAT6ojv7OlH1f6Ix5BG4Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz", + "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@sigstore/bundle": "^2.3.1", + "@sigstore/bundle": "^2.3.2", "@sigstore/core": "^1.1.0", - "@sigstore/protobuf-specs": "^0.3.1" + "@sigstore/protobuf-specs": "^0.3.2" }, "engines": { "node": "^16.14.0 || >=18.0.0" @@ -6486,518 +6233,588 @@ "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true + "license": "MIT" + }, + "node_modules/@sindresorhus/merge-streams": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", + "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/@smithy/abort-controller": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.2.0.tgz", - "integrity": "sha512-wRlta7GuLWpTqtFfGo+nZyOO1vEvewdNR1R4rTxpC8XU6vG/NDyrFBhwLZsqg1NUoR1noVaXJPC/7ZK47QCySw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.1.tgz", + "integrity": "sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/chunked-blob-reader": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-2.2.0.tgz", - "integrity": "sha512-3GJNvRwXBGdkDZZOGiziVYzDpn4j6zfyULHMDKAGIUo72yHALpE9CbhfQp/XcLNVoc1byfMpn6uW5H2BqPjgaQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-3.0.0.tgz", + "integrity": "sha512-sbnURCwjF0gSToGlsBiAmd1lRCmSn72nu9axfJu5lIx6RUEgHu6GwTMbqCdhQSi0Pumcm5vFxsi9XWXb2mTaoA==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" } }, "node_modules/@smithy/chunked-blob-reader-native": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-2.2.0.tgz", - "integrity": "sha512-VNB5+1oCgX3Fzs072yuRsUoC2N4Zg/LJ11DTxX3+Qu+Paa6AmbIF0E9sc2wthz9Psrk/zcOlTCyuposlIhPjZQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-3.0.0.tgz", + "integrity": "sha512-VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg==", + "license": "Apache-2.0", "dependencies": { - "@smithy/util-base64": "^2.3.0", + "@smithy/util-base64": "^3.0.0", "tslib": "^2.6.2" } }, "node_modules/@smithy/config-resolver": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.2.0.tgz", - "integrity": "sha512-fsiMgd8toyUba6n1WRmr+qACzXltpdDkPTAaDqc8QqPBUzO+/JKwL6bUBseHVi8tu9l+3JOK+tSf7cay+4B3LA==", - "dependencies": { - "@smithy/node-config-provider": "^2.3.0", - "@smithy/types": "^2.12.0", - "@smithy/util-config-provider": "^2.3.0", - "@smithy/util-middleware": "^2.2.0", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.5.tgz", + "integrity": "sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/node-config-provider": "^3.1.4", + "@smithy/types": "^3.3.0", + "@smithy/util-config-provider": "^3.0.0", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/core": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/@smithy/core/-/core-1.4.2.tgz", - "integrity": "sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA==", - "dependencies": { - "@smithy/middleware-endpoint": "^2.5.1", - "@smithy/middleware-retry": "^2.3.1", - "@smithy/middleware-serde": "^2.3.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", - "@smithy/util-middleware": "^2.2.0", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.0.tgz", + "integrity": "sha512-cHXq+FneIF/KJbt4q4pjN186+Jf4ZB0ZOqEaZMBhT79srEyGDDBV31NqBRBjazz8ppQ1bJbDJMY9ba5wKFV36w==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/middleware-endpoint": "^3.1.0", + "@smithy/middleware-retry": "^3.0.15", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/protocol-http": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/credential-provider-imds": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.3.0.tgz", - "integrity": "sha512-BWB9mIukO1wjEOo1Ojgl6LrG4avcaC7T/ZP6ptmAaW4xluhSIPZhY+/PI5YKzlk+jsm+4sQZB45Bt1OfMeQa3w==", - "dependencies": { - "@smithy/node-config-provider": "^2.3.0", - "@smithy/property-provider": "^2.2.0", - "@smithy/types": "^2.12.0", - "@smithy/url-parser": "^2.2.0", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.0.tgz", + "integrity": "sha512-0SCIzgd8LYZ9EJxUjLXBmEKSZR/P/w6l7Rz/pab9culE/RWuqelAKGJvn5qUOl8BgX8Yj5HWM50A5hiB/RzsgA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/node-config-provider": "^3.1.4", + "@smithy/property-provider": "^3.1.3", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/eventstream-codec": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.2.0.tgz", - "integrity": "sha512-8janZoJw85nJmQZc4L8TuePp2pk1nxLgkxIR0TUjKJ5Dkj5oelB9WtiSSGXCQvNsJl0VSTvK/2ueMXxvpa9GVw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.2.tgz", + "integrity": "sha512-0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw==", + "license": "Apache-2.0", "dependencies": { - "@aws-crypto/crc32": "3.0.0", - "@smithy/types": "^2.12.0", - "@smithy/util-hex-encoding": "^2.2.0", + "@aws-crypto/crc32": "5.2.0", + "@smithy/types": "^3.3.0", + "@smithy/util-hex-encoding": "^3.0.0", "tslib": "^2.6.2" } }, "node_modules/@smithy/eventstream-serde-browser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.2.0.tgz", - "integrity": "sha512-UaPf8jKbcP71BGiO0CdeLmlg+RhWnlN8ipsMSdwvqBFigl5nil3rHOI/5GE3tfiuX8LvY5Z9N0meuU7Rab7jWw==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.6.tgz", + "integrity": "sha512-2hM54UWQUOrki4BtsUI1WzmD13/SeaqT/AB3EUJKbcver/WgKNaiJ5y5F5XXuVe6UekffVzuUDrBZVAA3AWRpQ==", + "license": "Apache-2.0", "dependencies": { - "@smithy/eventstream-serde-universal": "^2.2.0", - "@smithy/types": "^2.12.0", + "@smithy/eventstream-serde-universal": "^3.0.5", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/eventstream-serde-config-resolver": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.2.0.tgz", - "integrity": "sha512-RHhbTw/JW3+r8QQH7PrganjNCiuiEZmpi6fYUAetFfPLfZ6EkiA08uN3EFfcyKubXQxOwTeJRZSQmDDCdUshaA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.3.tgz", + "integrity": "sha512-NVTYjOuYpGfrN/VbRQgn31x73KDLfCXCsFdad8DiIc3IcdxL+dYA9zEQPyOP7Fy2QL8CPy2WE4WCUD+ZsLNfaQ==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/eventstream-serde-node": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.2.0.tgz", - "integrity": "sha512-zpQMtJVqCUMn+pCSFcl9K/RPNtQE0NuMh8sKpCdEHafhwRsjP50Oq/4kMmvxSRy6d8Jslqd8BLvDngrUtmN9iA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.5.tgz", + "integrity": "sha512-+upXvnHNyZP095s11jF5dhGw/Ihzqwl5G+/KtMnoQOpdfC3B5HYCcDVG9EmgkhJMXJlM64PyN5gjJl0uXFQehQ==", + "license": "Apache-2.0", "dependencies": { - "@smithy/eventstream-serde-universal": "^2.2.0", - "@smithy/types": "^2.12.0", + "@smithy/eventstream-serde-universal": "^3.0.5", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/eventstream-serde-universal": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.2.0.tgz", - "integrity": "sha512-pvoe/vvJY0mOpuF84BEtyZoYfbehiFj8KKWk1ds2AT0mTLYFVs+7sBJZmioOFdBXKd48lfrx1vumdPdmGlCLxA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.5.tgz", + "integrity": "sha512-5u/nXbyoh1s4QxrvNre9V6vfyoLWuiVvvd5TlZjGThIikc3G+uNiG9uOTCWweSRjv1asdDIWK7nOmN7le4RYHQ==", + "license": "Apache-2.0", "dependencies": { - "@smithy/eventstream-codec": "^2.2.0", - "@smithy/types": "^2.12.0", + "@smithy/eventstream-codec": "^3.1.2", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/fetch-http-handler": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.5.0.tgz", - "integrity": "sha512-BOWEBeppWhLn/no/JxUL/ghTfANTjT7kg3Ww2rPqTUY9R4yHPXxJ9JhMe3Z03LN3aPwiwlpDIUcVw1xDyHqEhw==", - "dependencies": { - "@smithy/protocol-http": "^3.3.0", - "@smithy/querystring-builder": "^2.2.0", - "@smithy/types": "^2.12.0", - "@smithy/util-base64": "^2.3.0", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.4.tgz", + "integrity": "sha512-kBprh5Gs5h7ug4nBWZi1FZthdqSM+T7zMmsZxx0IBvWUn7dK3diz2SHn7Bs4dQGFDk8plDv375gzenDoNwrXjg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/protocol-http": "^4.1.0", + "@smithy/querystring-builder": "^3.0.3", + "@smithy/types": "^3.3.0", + "@smithy/util-base64": "^3.0.0", "tslib": "^2.6.2" } }, "node_modules/@smithy/hash-blob-browser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.2.0.tgz", - "integrity": "sha512-SGPoVH8mdXBqrkVCJ1Hd1X7vh1zDXojNN1yZyZTZsCno99hVue9+IYzWDjq/EQDDXxmITB0gBmuyPh8oAZSTcg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.2.tgz", + "integrity": "sha512-hAbfqN2UbISltakCC2TP0kx4LqXBttEv2MqSPE98gVuDFMf05lU+TpC41QtqGP3Ff5A3GwZMPfKnEy0VmEUpmg==", + "license": "Apache-2.0", "dependencies": { - "@smithy/chunked-blob-reader": "^2.2.0", - "@smithy/chunked-blob-reader-native": "^2.2.0", - "@smithy/types": "^2.12.0", + "@smithy/chunked-blob-reader": "^3.0.0", + "@smithy/chunked-blob-reader-native": "^3.0.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" } }, "node_modules/@smithy/hash-node": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.2.0.tgz", - "integrity": "sha512-zLWaC/5aWpMrHKpoDF6nqpNtBhlAYKF/7+9yMN7GpdR8CzohnWfGtMznPybnwSS8saaXBMxIGwJqR4HmRp6b3g==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.3.tgz", + "integrity": "sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", - "@smithy/util-buffer-from": "^2.2.0", - "@smithy/util-utf8": "^2.3.0", + "@smithy/types": "^3.3.0", + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/hash-stream-node": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.2.0.tgz", - "integrity": "sha512-aT+HCATOSRMGpPI7bi7NSsTNVZE/La9IaxLXWoVAYMxHT5hGO3ZOGEMZQg8A6nNL+pdFGtZQtND1eoY084HgHQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.1.2.tgz", + "integrity": "sha512-PBgDMeEdDzi6JxKwbfBtwQG9eT9cVwsf0dZzLXoJF4sHKHs5HEo/3lJWpn6jibfJwT34I1EBXpBnZE8AxAft6g==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", - "@smithy/util-utf8": "^2.3.0", + "@smithy/types": "^3.3.0", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/invalid-dependency": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.2.0.tgz", - "integrity": "sha512-nEDASdbKFKPXN2O6lOlTgrEEOO9NHIeO+HVvZnkqc8h5U9g3BIhWsvzFo+UcUbliMHvKNPD/zVxDrkP1Sbgp8Q==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz", + "integrity": "sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" } }, "node_modules/@smithy/is-array-buffer": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", - "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "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==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/md5-js": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.2.0.tgz", - "integrity": "sha512-M26XTtt9IIusVMOWEAhIvFIr9jYj4ISPPGJROqw6vXngO3IYJCnVVSMFn4Tx1rUTG5BiKJNg9u2nxmBiZC5IlQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.3.tgz", + "integrity": "sha512-O/SAkGVwpWmelpj/8yDtsaVe6sINHLB1q8YE/+ZQbDxIw3SRLbTZuRaI10K12sVoENdnHqzPp5i3/H+BcZ3m3Q==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", - "@smithy/util-utf8": "^2.3.0", + "@smithy/types": "^3.3.0", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" } }, "node_modules/@smithy/middleware-content-length": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.2.0.tgz", - "integrity": "sha512-5bl2LG1Ah/7E5cMSC+q+h3IpVHMeOkG0yLRyQT1p2aMJkSrZG7RlXHPuAgb7EyaFeidKEnnd/fNaLLaKlHGzDQ==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.5.tgz", + "integrity": "sha512-ILEzC2eyxx6ncej3zZSwMpB5RJ0zuqH7eMptxC4KN3f+v9bqT8ohssKbhNR78k/2tWW+KS5Spw+tbPF4Ejyqvw==", + "license": "Apache-2.0", "dependencies": { - "@smithy/protocol-http": "^3.3.0", - "@smithy/types": "^2.12.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/middleware-endpoint": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.1.tgz", - "integrity": "sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ==", - "dependencies": { - "@smithy/middleware-serde": "^2.3.0", - "@smithy/node-config-provider": "^2.3.0", - "@smithy/shared-ini-file-loader": "^2.4.0", - "@smithy/types": "^2.12.0", - "@smithy/url-parser": "^2.2.0", - "@smithy/util-middleware": "^2.2.0", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.0.tgz", + "integrity": "sha512-5y5aiKCEwg9TDPB4yFE7H6tYvGFf1OJHNczeY10/EFF8Ir8jZbNntQJxMWNfeQjC1mxPsaQ6mR9cvQbf+0YeMw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/middleware-serde": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/middleware-retry": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.3.1.tgz", - "integrity": "sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA==", - "dependencies": { - "@smithy/node-config-provider": "^2.3.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/service-error-classification": "^2.1.5", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", - "@smithy/util-middleware": "^2.2.0", - "@smithy/util-retry": "^2.2.0", + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.15.tgz", + "integrity": "sha512-iTMedvNt1ApdvkaoE8aSDuwaoc+BhvHqttbA/FO4Ty+y/S5hW6Ci/CTScG7vam4RYJWZxdTElc3MEfHRVH6cgQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/node-config-provider": "^3.1.4", + "@smithy/protocol-http": "^4.1.0", + "@smithy/service-error-classification": "^3.0.3", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", "tslib": "^2.6.2", "uuid": "^9.0.1" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/middleware-retry/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" } }, "node_modules/@smithy/middleware-serde": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.3.0.tgz", - "integrity": "sha512-sIADe7ojwqTyvEQBe1nc/GXB9wdHhi9UwyX0lTyttmUWDJLP655ZYE1WngnNyXREme8I27KCaUhyhZWRXL0q7Q==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz", + "integrity": "sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/middleware-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.2.0.tgz", - "integrity": "sha512-Qntc3jrtwwrsAC+X8wms8zhrTr0sFXnyEGhZd9sLtsJ/6gGQKFzNB+wWbOcpJd7BR8ThNCoKt76BuQahfMvpeA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz", + "integrity": "sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/node-config-provider": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.3.0.tgz", - "integrity": "sha512-0elK5/03a1JPWMDPaS726Iw6LpQg80gFut1tNpPfxFuChEEklo2yL823V94SpTZTxmKlXFtFgsP55uh3dErnIg==", - "dependencies": { - "@smithy/property-provider": "^2.2.0", - "@smithy/shared-ini-file-loader": "^2.4.0", - "@smithy/types": "^2.12.0", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.4.tgz", + "integrity": "sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/node-http-handler": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.5.0.tgz", - "integrity": "sha512-mVGyPBzkkGQsPoxQUbxlEfRjrj6FPyA3u3u2VXGr9hT8wilsoQdZdvKpMBFMB8Crfhv5dNkKHIW0Yyuc7eABqA==", - "dependencies": { - "@smithy/abort-controller": "^2.2.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/querystring-builder": "^2.2.0", - "@smithy/types": "^2.12.0", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.1.4.tgz", + "integrity": "sha512-+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/abort-controller": "^3.1.1", + "@smithy/protocol-http": "^4.1.0", + "@smithy/querystring-builder": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/property-provider": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.2.0.tgz", - "integrity": "sha512-+xiil2lFhtTRzXkx8F053AV46QnIw6e7MV8od5Mi68E1ICOjCeCHw2XfLnDEUHnT9WGUIkwcqavXjfwuJbGlpg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.3.tgz", + "integrity": "sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/protocol-http": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.3.0.tgz", - "integrity": "sha512-Xy5XK1AFWW2nlY/biWZXu6/krgbaf2dg0q492D8M5qthsnU2H+UgFeZLbM76FnH7s6RO/xhQRkj+T6KBO3JzgQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.0.tgz", + "integrity": "sha512-dPVoHYQ2wcHooGXg3LQisa1hH0e4y0pAddPMeeUPipI1tEOqL6A4N0/G7abeq+K8wrwSgjk4C0wnD1XZpJm5aA==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/querystring-builder": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.2.0.tgz", - "integrity": "sha512-L1kSeviUWL+emq3CUVSgdogoM/D9QMFaqxL/dd0X7PCNWmPXqt+ExtrBjqT0V7HLN03Vs9SuiLrG3zy3JGnE5A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz", + "integrity": "sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", - "@smithy/util-uri-escape": "^2.2.0", + "@smithy/types": "^3.3.0", + "@smithy/util-uri-escape": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/querystring-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.2.0.tgz", - "integrity": "sha512-BvHCDrKfbG5Yhbpj4vsbuPV2GgcpHiAkLeIlcA1LtfpMz3jrqizP1+OguSNSj1MwBHEiN+jwNisXLGdajGDQJA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz", + "integrity": "sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/service-error-classification": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.1.5.tgz", - "integrity": "sha512-uBDTIBBEdAQryvHdc5W8sS5YX7RQzF683XrHePVdFmAgKiMofU15FLSM0/HU03hKTnazdNRFa0YHS7+ArwoUSQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz", + "integrity": "sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0" + "@smithy/types": "^3.3.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.4.0.tgz", - "integrity": "sha512-WyujUJL8e1B6Z4PBfAqC/aGY1+C7T0w20Gih3yrvJSk97gpiVfB+y7c46T4Nunk+ZngLq0rOIdeVeIklk0R3OA==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.4.tgz", + "integrity": "sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/signature-v4": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.3.0.tgz", - "integrity": "sha512-ui/NlpILU+6HAQBfJX8BBsDXuKSNrjTSuOYArRblcrErwKFutjrCNb/OExfVRyj9+26F9J+ZmfWT+fKWuDrH3Q==", - "dependencies": { - "@smithy/is-array-buffer": "^2.2.0", - "@smithy/types": "^2.12.0", - "@smithy/util-hex-encoding": "^2.2.0", - "@smithy/util-middleware": "^2.2.0", - "@smithy/util-uri-escape": "^2.2.0", - "@smithy/util-utf8": "^2.3.0", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.1.0.tgz", + "integrity": "sha512-aRryp2XNZeRcOtuJoxjydO6QTaVhxx/vjaR+gx7ZjaFgrgPRyZ3HCTbfwqYj6ZWEBHkCSUfcaymKPURaByukag==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/is-array-buffer": "^3.0.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", + "@smithy/util-hex-encoding": "^3.0.0", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-uri-escape": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/smithy-client": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.5.1.tgz", - "integrity": "sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ==", - "dependencies": { - "@smithy/middleware-endpoint": "^2.5.1", - "@smithy/middleware-stack": "^2.2.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/types": "^2.12.0", - "@smithy/util-stream": "^2.2.0", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.2.0.tgz", + "integrity": "sha512-pDbtxs8WOhJLJSeaF/eAbPgXg4VVYFlRcL/zoNYA5WbG3wBL06CHtBSg53ppkttDpAJ/hdiede+xApip1CwSLw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/middleware-endpoint": "^3.1.0", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", + "@smithy/util-stream": "^3.1.3", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/types": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.12.0.tgz", - "integrity": "sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.3.0.tgz", + "integrity": "sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/url-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.2.0.tgz", - "integrity": "sha512-hoA4zm61q1mNTpksiSWp2nEl1dt3j726HdRhiNgVJQMj7mLp7dprtF57mOB6JvEk/x9d2bsuL5hlqZbBuHQylQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.3.tgz", + "integrity": "sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==", + "license": "Apache-2.0", "dependencies": { - "@smithy/querystring-parser": "^2.2.0", - "@smithy/types": "^2.12.0", + "@smithy/querystring-parser": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" } }, "node_modules/@smithy/util-base64": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.3.0.tgz", - "integrity": "sha512-s3+eVwNeJuXUwuMbusncZNViuhv2LjVJ1nMwTqSA0XAC7gjKhqqxRdJPhR8+YrkoZ9IiIbFk/yK6ACe/xlF+hw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz", + "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==", + "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "@smithy/util-utf8": "^2.3.0", + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-body-length-browser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-2.2.0.tgz", - "integrity": "sha512-dtpw9uQP7W+n3vOtx0CfBD5EWd7EPdIdsQnWTDoFf77e3VUf05uA7R7TGipIo8e4WL2kuPdnsr3hMQn9ziYj5w==", + "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==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" } }, "node_modules/@smithy/util-body-length-node": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.3.0.tgz", - "integrity": "sha512-ITWT1Wqjubf2CJthb0BuT9+bpzBfXeMokH/AAa5EJQgbv9aPMVfnM76iFIZVFf50hYXGbtiV71BHAthNWd6+dw==", + "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==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-buffer-from": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", - "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "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==", + "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^2.2.0", + "@smithy/is-array-buffer": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-config-provider": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-2.3.0.tgz", - "integrity": "sha512-HZkzrRcuFN1k70RLqlNK4FnPXKOpkik1+4JaBoHNJn+RnJGYqaa3c5/+XtLOXhlKzlRgNvyaLieHTW2VwGN0VQ==", + "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==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.1.tgz", - "integrity": "sha512-RtKW+8j8skk17SYowucwRUjeh4mCtnm5odCL0Lm2NtHQBsYKrNW0od9Rhopu9wF1gHMfHeWF7i90NwBz/U22Kw==", - "dependencies": { - "@smithy/property-provider": "^2.2.0", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.15.tgz", + "integrity": "sha512-FZ4Psa3vjp8kOXcd3HJOiDPBCWtiilLl57r0cnNtq/Ga9RSDrM5ERL6xt+tO43+2af6Pn5Yp92x2n5vPuduNfg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/property-provider": "^3.1.3", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", "bowser": "^2.11.0", "tslib": "^2.6.2" }, @@ -7006,16 +6823,17 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.1.tgz", - "integrity": "sha512-vkMXHQ0BcLFysBMWgSBLSk3+leMpFSyyFj8zQtv5ZyUBx8/owVh1/pPEkzmW/DR/Gy/5c8vjLDD9gZjXNKbrpA==", - "dependencies": { - "@smithy/config-resolver": "^2.2.0", - "@smithy/credential-provider-imds": "^2.3.0", - "@smithy/node-config-provider": "^2.3.0", - "@smithy/property-provider": "^2.2.0", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.15.tgz", + "integrity": "sha512-KSyAAx2q6d0t6f/S4XB2+3+6aQacm3aLMhs9aLMqn18uYGUepbdssfogW5JQZpc6lXNBnp0tEnR5e9CEKmEd7A==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/config-resolver": "^3.0.5", + "@smithy/credential-provider-imds": "^3.2.0", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/property-provider": "^3.1.3", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -7023,106 +6841,165 @@ } }, "node_modules/@smithy/util-endpoints": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-1.2.0.tgz", - "integrity": "sha512-BuDHv8zRjsE5zXd3PxFXFknzBG3owCpjq8G3FcsXW3CykYXuEqM3nTSsmLzw5q+T12ZYuDlVUZKBdpNbhVtlrQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.0.5.tgz", + "integrity": "sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==", + "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^2.3.0", - "@smithy/types": "^2.12.0", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">= 14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-hex-encoding": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.2.0.tgz", - "integrity": "sha512-7iKXR+/4TpLK194pVjKiasIyqMtTYJsgKgM242Y9uzt5dhHnUDvMNb+3xIhRJ9QhvqGii/5cRUt4fJn3dtXNHQ==", + "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==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-middleware": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.2.0.tgz", - "integrity": "sha512-L1qpleXf9QD6LwLCJ5jddGkgWyuSvWBkJwWAZ6kFkdifdso+sk3L3O1HdmPvCdnCK3IS4qWyPxev01QMnfHSBw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.3.tgz", + "integrity": "sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-retry": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.2.0.tgz", - "integrity": "sha512-q9+pAFPTfftHXRytmZ7GzLFFrEGavqapFc06XxzZFcSIGERXMerXxCitjOG1prVDR9QdjqotF40SWvbqcCpf8g==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.3.tgz", + "integrity": "sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==", + "license": "Apache-2.0", "dependencies": { - "@smithy/service-error-classification": "^2.1.5", - "@smithy/types": "^2.12.0", + "@smithy/service-error-classification": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">= 14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.2.0.tgz", - "integrity": "sha512-17faEXbYWIRst1aU9SvPZyMdWmqIrduZjVOqCPMIsWFNxs5yQQgFrJL6b2SdiCzyW9mJoDjFtgi53xx7EH+BXA==", - "dependencies": { - "@smithy/fetch-http-handler": "^2.5.0", - "@smithy/node-http-handler": "^2.5.0", - "@smithy/types": "^2.12.0", - "@smithy/util-base64": "^2.3.0", - "@smithy/util-buffer-from": "^2.2.0", - "@smithy/util-hex-encoding": "^2.2.0", - "@smithy/util-utf8": "^2.3.0", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.3.tgz", + "integrity": "sha512-FIv/bRhIlAxC0U7xM1BCnF2aDRPq0UaelqBHkM2lsCp26mcBbgI0tCVTv+jGdsQLUmAMybua/bjDsSu8RQHbmw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/node-http-handler": "^3.1.4", + "@smithy/types": "^3.3.0", + "@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", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-uri-escape": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.2.0.tgz", - "integrity": "sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz", + "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", - "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "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==", + "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", + "@smithy/util-buffer-from": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-waiter": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.2.0.tgz", - "integrity": "sha512-IHk53BVw6MPMi2Gsn+hCng8rFA3ZmR3Rk7GllxDUW9qFJl/hiSvskn7XldkECapQVkIg/1dHpMAxI9xSTaLLSA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.1.2.tgz", + "integrity": "sha512-4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw==", + "license": "Apache-2.0", "dependencies": { - "@smithy/abort-controller": "^2.2.0", - "@smithy/types": "^2.12.0", + "@smithy/abort-controller": "^3.1.1", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "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_modules/@tufjs/canonical-json": { @@ -7130,6 +7007,7 @@ "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz", "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==", "dev": true, + "license": "MIT", "engines": { "node": "^16.14.0 || >=18.0.0" } @@ -7139,6 +7017,7 @@ "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz", "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==", "dev": true, + "license": "MIT", "dependencies": { "@tufjs/canonical-json": "2.0.0", "minimatch": "^9.0.4" @@ -7152,15 +7031,17 @@ "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.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "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" }, @@ -7171,39 +7052,52 @@ "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==", + "license": "MIT", + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@types/body-parser": { - "version": "1.19.4", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz", - "integrity": "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==", + "version": "1.19.5", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", + "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", "dev": true, + "license": "MIT", "dependencies": { "@types/connect": "*", "@types/node": "*" } }, "node_modules/@types/bonjour": { - "version": "3.5.12", - "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz", - "integrity": "sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg==", + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz", + "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/connect": { - "version": "3.4.37", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz", - "integrity": "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==", + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/connect-history-api-fallback": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz", - "integrity": "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz", + "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==", "dev": true, + "license": "MIT", "dependencies": { "@types/express-serve-static-core": "*", "@types/node": "*" @@ -7221,37 +7115,29 @@ "integrity": "sha512-me5VbCv+fcXozblWwG13krNBvuEOm6kA5xoa4RrjDJCNFOZSWR3/QLtOXimBHk1Fisq69Gx3JtOoXtg1N1tijg==", "dev": true }, - "node_modules/@types/eslint": { - "version": "8.56.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz", - "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==", - "dev": true, - "dependencies": { - "@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==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" + "@types/trusted-types": "*" } }, "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==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/express": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz", - "integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^4.17.33", @@ -7260,10 +7146,11 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.38", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.38.tgz", - "integrity": "sha512-hXOtc0tuDHZPFwwhuBJXPbjemWtXnJjbvuuyNH2Y5Z6in+iXc63c4eXYDc7GGGqHy+iwYqAJMdaItqdnbcBKmg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", "@types/qs": "*", @@ -7278,16 +7165,18 @@ "dev": true }, "node_modules/@types/http-errors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz", - "integrity": "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA==", - "dev": true + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", + "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", + "dev": true, + "license": "MIT" }, "node_modules/@types/http-proxy": { - "version": "1.17.13", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz", - "integrity": "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==", + "version": "1.17.15", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz", + "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } @@ -7302,7 +7191,8 @@ "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/json5": { "version": "0.0.29", @@ -7326,85 +7216,109 @@ } }, "node_modules/@types/mime": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz", - "integrity": "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw==", - "dev": true + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", + "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==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } }, "node_modules/@types/node": { - "version": "20.12.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.10.tgz", - "integrity": "sha512-Eem5pH9pmWBHoGAT8Dr5fdc5rYA+4NAovdM4EktRPVAAiJhmWWfQrA0cFhAbOsQdSfIHjAud6YdkbL69+zSKjw==", + "version": "20.16.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.3.tgz", + "integrity": "sha512-/wdGiWRkMOm53gAsSyFMXFZHbVg7C6CbkrzHNpaHoYfsUWPg7m6ZRKtvQjgvQ9i8WT540a3ydRlRQbxjY30XxQ==", "dev": true, + "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.19.2" + } + }, + "node_modules/@types/node-forge": { + "version": "1.3.11", + "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz", + "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" } }, "node_modules/@types/plotly.js": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/@types/plotly.js/-/plotly.js-2.29.3.tgz", - "integrity": "sha512-TAwVyX4vUWpcEoNfrZV9b9V5jRfeWZP3Tkv0lJvN6xkf0s0qzMdSdXkRavy5+017ZgSWOGbHyQgyOZJozeDEbA==", - "dev": true + "version": "2.33.3", + "resolved": "https://registry.npmjs.org/@types/plotly.js/-/plotly.js-2.33.3.tgz", + "integrity": "sha512-Uu9aC8Z5oMj+oq1QHKtZAug9uAdPV66KPZrIa+r26bhktfuAbSCIq2HDN1kFPrcci0QKNCh8Gqj1GtMYvfoEUQ==", + "dev": true, + "license": "MIT" }, "node_modules/@types/qs": { - "version": "6.9.9", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz", - "integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==", - "dev": true + "version": "6.9.15", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz", + "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==", + "dev": true, + "license": "MIT" }, "node_modules/@types/range-parser": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz", - "integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==", - "dev": true + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", + "dev": true, + "license": "MIT" }, "node_modules/@types/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", - "dev": true - }, - "node_modules/@types/semver": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", - "dev": true + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz", + "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==", + "dev": true, + "license": "MIT" }, "node_modules/@types/send": { - "version": "0.17.3", - "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz", - "integrity": "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==", + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", + "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", "dev": true, + "license": "MIT", "dependencies": { "@types/mime": "^1", "@types/node": "*" } }, "node_modules/@types/serve-index": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz", - "integrity": "sha512-4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz", + "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==", "dev": true, + "license": "MIT", "dependencies": { "@types/express": "*" } }, "node_modules/@types/serve-static": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz", - "integrity": "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw==", + "version": "1.15.7", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", + "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", "dev": true, + "license": "MIT", "dependencies": { "@types/http-errors": "*", - "@types/mime": "*", - "@types/node": "*" + "@types/node": "*", + "@types/send": "*" } }, "node_modules/@types/sockjs": { - "version": "0.3.35", - "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz", - "integrity": "sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw==", + "version": "0.3.36", + "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz", + "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } @@ -7415,525 +7329,181 @@ "integrity": "sha512-iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw==", "dev": true }, - "node_modules/@types/uuid": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz", - "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==", - "dev": true - }, - "node_modules/@types/ws": { - "version": "8.5.8", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz", - "integrity": "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/yargs": { - "version": "17.0.29", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", - "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/@types/yargs-parser": { - "version": "21.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.2.tgz", - "integrity": "sha512-5qcvofLPbfjmBfKaLfj/+f+Sbd6pN4zl7w7VSVI5uz7m9QZTuB2aZAa2uo1wHFBNN2x6g/SoTkXmd8mQnQF2Cw==", - "dev": true - }, - "node_modules/@types/youtube": { - "version": "0.0.42", - "resolved": "https://registry.npmjs.org/@types/youtube/-/youtube-0.0.42.tgz", - "integrity": "sha512-Nqo3HMPFPcNyZ7HNFZJjpH+N4yXqpxBItG+41e7nL9zednovMRZMXWj36CctSznbBcbj6ucvkJDo5iZ8SKqLIw==" - }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.8.0.tgz", - "integrity": "sha512-gFTT+ezJmkwutUPmB0skOj3GZJtlEGnlssems4AjkVweUPGj7jRwwqg0Hhg7++kPGJqKtTYx+R05Ftww372aIg==", - "dev": true, - "dependencies": { - "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.8.0", - "@typescript-eslint/type-utils": "7.8.0", - "@typescript-eslint/utils": "7.8.0", - "@typescript-eslint/visitor-keys": "7.8.0", - "debug": "^4.3.4", - "graphemer": "^1.4.0", - "ignore": "^5.3.1", - "natural-compare": "^1.4.0", - "semver": "^7.6.0", - "ts-api-utils": "^1.3.0" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^7.0.0", - "eslint": "^8.56.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.8.0.tgz", - "integrity": "sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A==", - "dev": true, - "dependencies": { - "@typescript-eslint/typescript-estree": "7.8.0", - "@typescript-eslint/utils": "7.8.0", - "debug": "^4.3.4", - "ts-api-utils": "^1.3.0" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.56.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.8.0.tgz", - "integrity": "sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.15", - "@types/semver": "^7.5.8", - "@typescript-eslint/scope-manager": "7.8.0", - "@typescript-eslint/types": "7.8.0", - "@typescript-eslint/typescript-estree": "7.8.0", - "semver": "^7.6.0" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.56.0" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/experimental-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz", - "integrity": "sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==", - "dev": true, - "dependencies": { - "@typescript-eslint/utils": "5.62.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/@typescript-eslint/parser": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.8.0.tgz", - "integrity": "sha512-KgKQly1pv0l4ltcftP59uQZCi4HUYswCLbTqVZEJu7uLX8CTLyswqMLqLN+2QFz4jCptqWVV4SB7vdxcH2+0kQ==", - "dev": true, - "dependencies": { - "@typescript-eslint/scope-manager": "7.8.0", - "@typescript-eslint/types": "7.8.0", - "@typescript-eslint/typescript-estree": "7.8.0", - "@typescript-eslint/visitor-keys": "7.8.0", - "debug": "^4.3.4" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.56.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.8.0.tgz", - "integrity": "sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "7.8.0", - "@typescript-eslint/visitor-keys": "7.8.0" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.2.0.tgz", - "integrity": "sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA==", - "dev": true, - "dependencies": { - "@typescript-eslint/typescript-estree": "7.2.0", - "@typescript-eslint/utils": "7.2.0", - "debug": "^4.3.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.56.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz", - "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/visitor-keys": "7.2.0" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz", - "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==", - "dev": true, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz", - "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/visitor-keys": "7.2.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "minimatch": "9.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz", - "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "7.2.0", - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/typescript-estree": "7.2.0", - "semver": "^7.5.4" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.56.0" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz", - "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==", + "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==", "dev": true, - "dependencies": { - "@typescript-eslint/types": "7.2.0", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } + "license": "MIT" }, - "node_modules/@typescript-eslint/type-utils/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==", + "node_modules/@types/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==", "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } + "license": "MIT" }, - "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "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, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } + "license": "MIT" }, - "node_modules/@typescript-eslint/type-utils/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "node_modules/@types/ws": { + "version": "8.5.12", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", + "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", "dev": true, + "license": "MIT", "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" + "@types/node": "*" } }, - "node_modules/@typescript-eslint/types": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.8.0.tgz", - "integrity": "sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==", - "dev": true, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } + "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==", + "license": "MIT" }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.8.0.tgz", - "integrity": "sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg==", + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.4.0.tgz", + "integrity": "sha512-rg8LGdv7ri3oAlenMACk9e+AR4wUV0yrrG+XKsGKOK0EVgeEDqurkXMPILG2836fW4ibokTB5v4b6Z9+GYQDEw==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.8.0", - "@typescript-eslint/visitor-keys": "7.8.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "8.4.0", + "@typescript-eslint/type-utils": "8.4.0", + "@typescript-eslint/utils": "8.4.0", + "@typescript-eslint/visitor-keys": "8.4.0", + "graphemer": "^1.4.0", + "ignore": "^5.3.1", + "natural-compare": "^1.4.0", "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, + "peerDependencies": { + "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", + "eslint": "^8.57.0 || ^9.0.0" + }, "peerDependenciesMeta": { "typescript": { "optional": true } } }, - "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, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "node_modules/@typescript-eslint/parser": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.4.0.tgz", + "integrity": "sha512-NHgWmKSgJk5K9N16GIhQ4jSobBoJwrmURaLErad0qlLjrpP5bECYg+wxVTGlGZmJbU03jj/dfnb6V9bw+5icsA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "brace-expansion": "^2.0.1" + "@typescript-eslint/scope-manager": "8.4.0", + "@typescript-eslint/types": "8.4.0", + "@typescript-eslint/typescript-estree": "8.4.0", + "@typescript-eslint/visitor-keys": "8.4.0", + "debug": "^4.3.4" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" }, - "bin": { - "semver": "bin/semver.js" + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" }, - "engines": { - "node": ">=10" + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "node_modules/@typescript-eslint/scope-manager": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.4.0.tgz", + "integrity": "sha512-n2jFxLeY0JmKfUqy3P70rs6vdoPjHK8P/w+zJcV3fk0b0BwRXC/zxRTEnAsgYT7MwdQDt/ZEbtdzdVC+hcpF0A==", "dev": true, + "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" + "@typescript-eslint/types": "8.4.0", + "@typescript-eslint/visitor-keys": "8.4.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "node_modules/@typescript-eslint/type-utils": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.4.0.tgz", + "integrity": "sha512-pu2PAmNrl9KX6TtirVOrbLPLwDmASpZhK/XU7WvoKoCUkdtq9zF7qQ7gna0GBZFN0hci0vHaSusiL2WpsQk37A==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/typescript-estree": "8.4.0", + "@typescript-eslint/utils": "8.4.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "node_modules/@typescript-eslint/types": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.4.0.tgz", + "integrity": "sha512-T1RB3KQdskh9t3v/qv7niK6P8yvn7ja1mS7QK7XfRVL6wtZ8/mFs/FHf4fKvTA0rKnqnYxl/uHFNbnEt0phgbw==", "dev": true, + "license": "MIT", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "node_modules/@typescript-eslint/typescript-estree": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.4.0.tgz", + "integrity": "sha512-kJ2OIP4dQw5gdI4uXsaxUZHRwWAGpREJ9Zq6D5L0BweyOrWsL6Sz0YcAZGWhvKnH7fm1J5YFE1JrQL0c9dd53A==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "8.4.0", + "@typescript-eslint/visitor-keys": "8.4.0", "debug": "^4.3.4", - "globby": "^11.1.0", + "fast-glob": "^3.3.2", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -7945,51 +7515,79 @@ } } }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "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": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" + "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": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.4.0.tgz", + "integrity": "sha512-swULW8n1IKLjRAgciCkTCafyTHHfwVQFt8DovmaF69sKbOxTSFMmIZaSHjqO9i/RV0wIblaawhzvtva8Nmm7lQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.4.0", + "@typescript-eslint/types": "8.4.0", + "@typescript-eslint/typescript-estree": "8.4.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.8.0.tgz", - "integrity": "sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.4.0.tgz", + "integrity": "sha512-zTQD6WLNTre1hj5wp09nBIDiOc2U5r/qmzo7wxPn4ZgAjHql09EofqhF9WF+fZHzL5aCyaIpPcT2hyxl73kr9A==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.8.0", + "@typescript-eslint/types": "8.4.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true - }, "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==", "dev": true, + "license": "MIT", "engines": { "node": ">=14.6.0" }, @@ -8002,6 +7600,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/helper-numbers": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6" @@ -8011,25 +7610,29 @@ "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==", - "dev": true + "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==", - "dev": true + "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==", - "dev": true + "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==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/floating-point-hex-parser": "1.11.6", "@webassemblyjs/helper-api-error": "1.11.6", @@ -8040,13 +7643,15 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true + "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==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-buffer": "1.12.1", @@ -8059,6 +7664,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, + "license": "MIT", "dependencies": { "@xtuc/ieee754": "^1.2.0" } @@ -8068,6 +7674,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@xtuc/long": "4.2.2" } @@ -8076,13 +7683,15 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true + "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==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-buffer": "1.12.1", @@ -8099,6 +7708,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", @@ -8112,6 +7722,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-buffer": "1.12.1", @@ -8124,6 +7735,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-api-error": "1.11.6", @@ -8138,6 +7750,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", "@xtuc/long": "4.2.2" @@ -8147,38 +7760,39 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "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==", - "dev": true + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==" }, "node_modules/@yarnpkg/parsers": { - "version": "3.0.0-rc.46", - "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz", - "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==", - "dev": true, + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.2.tgz", + "integrity": "sha512-/HcYgtUSiJiot/XWGLOlGxPYUG65+/31V8oqk17vZLW1xlCoR4PampyePljOxY2n8/3jz9+tIFzICsyGujJZoA==", + "license": "BSD-2-Clause", "dependencies": { "js-yaml": "^3.10.0", "tslib": "^2.4.0" }, "engines": { - "node": ">=14.15.0" + "node": ">=18.12.0" } }, "node_modules/@zkochan/js-yaml": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz", - "integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==", - "dev": true, + "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==", + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -8186,17 +7800,12 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/@zkochan/js-yaml/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==", - "dev": true - }, "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==", "dev": true, + "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -8206,6 +7815,7 @@ "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" @@ -8215,15 +7825,17 @@ } }, "node_modules/ace-builds": { - "version": "1.33.1", - "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.33.1.tgz", - "integrity": "sha512-pj5mcXV1n3s86UI4SWUt8X0ltN8cTaYcvF76cSmvy5i2ZDtXX9KkjVcYTGkCV7ox6VUrzqHByeqH0xRsMjXi4g==" + "version": "1.36.2", + "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.36.2.tgz", + "integrity": "sha512-eqqfbGwx/GKjM/EnFu4QtQ+d2NNBu84MGgxoG8R5iyFpcVeQ4p9YlTL+ZzdEJqhdkASqoqOxCSNNGyB6lvMm+A==", + "license": "BSD-3-Clause" }, "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -8231,11 +7843,12 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "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" } @@ -8245,6 +7858,7 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, + "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -8254,6 +7868,7 @@ "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz", "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==", "dev": true, + "license": "MIT", "dependencies": { "loader-utils": "^2.0.0", "regex-parser": "^2.2.11" @@ -8267,6 +7882,7 @@ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, + "license": "MIT", "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -8281,6 +7897,7 @@ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.3.4" }, @@ -8293,6 +7910,7 @@ "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" @@ -8302,15 +7920,16 @@ } }, "node_modules/ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, + "license": "MIT", "dependencies": { - "fast-deep-equal": "^3.1.1", + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" + "require-from-string": "^2.0.2" }, "funding": { "type": "github", @@ -8318,10 +7937,11 @@ } }, "node_modules/ajv-formats": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", - "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", + "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", "dev": true, + "license": "MIT", "dependencies": { "ajv": "^8.0.0" }, @@ -8339,6 +7959,7 @@ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3" }, @@ -8346,6 +7967,25 @@ "ajv": "^8.8.2" } }, + "node_modules/angular-eslint": { + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/angular-eslint/-/angular-eslint-18.3.0.tgz", + "integrity": "sha512-neBE3BUtxj1EPPNVww3i/e8DKh/gb+fT/WpDEsRZM//8vS+qb0pMC04dn4bqeUriM05Nq/oUESdwkLuyadJE9A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/builder": "18.3.0", + "@angular-eslint/eslint-plugin": "18.3.0", + "@angular-eslint/eslint-plugin-template": "18.3.0", + "@angular-eslint/schematics": "18.3.0", + "@angular-eslint/template-parser": "18.3.0" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": "*", + "typescript-eslint": "^8.0.0" + } + }, "node_modules/angular-resizable-element": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-7.0.2.tgz", @@ -8374,7 +8014,6 @@ "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, "engines": { "node": ">=6" } @@ -8384,6 +8023,7 @@ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "dev": true, + "license": "MIT", "dependencies": { "type-fest": "^0.21.3" }, @@ -8402,6 +8042,7 @@ "engines": [ "node >= 0.8.0" ], + "license": "Apache-2.0", "bin": { "ansi-html": "bin/ansi-html" } @@ -8418,15 +8059,18 @@ } }, "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, + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", "dependencies": { - "color-convert": "^1.9.0" + "color-convert": "^2.0.1" }, "engines": { - "node": ">=4" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/ansi-to-html": { @@ -8444,10 +8088,11 @@ } }, "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -8466,25 +8111,17 @@ } }, "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/argparse/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "license": "Python-2.0" }, "node_modules/aria-query": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", "dev": true, + "license": "Apache-2.0", "dependencies": { "dequal": "^2.0.3" } @@ -8503,10 +8140,11 @@ } }, "node_modules/array-flatten": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", - "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", - "dev": true + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "dev": true, + "license": "MIT" }, "node_modules/array-includes": { "version": "3.1.7", @@ -8527,15 +8165,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/array.prototype.findlastindex": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", @@ -8613,21 +8242,21 @@ } }, "node_modules/async": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", - "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", - "dev": true + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "license": "MIT" }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "license": "MIT" }, "node_modules/autoprefixer": { - "version": "10.4.18", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz", - "integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==", + "version": "10.4.20", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz", + "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==", "dev": true, "funding": [ { @@ -8643,12 +8272,13 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "browserslist": "^4.23.0", - "caniuse-lite": "^1.0.30001591", + "browserslist": "^4.23.3", + "caniuse-lite": "^1.0.30001646", "fraction.js": "^4.3.7", "normalize-range": "^0.1.2", - "picocolors": "^1.0.0", + "picocolors": "^1.0.1", "postcss-value-parser": "^4.2.0" }, "bin": { @@ -8674,23 +8304,24 @@ } }, "node_modules/axios": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.6.tgz", - "integrity": "sha512-XZLZDFfXKM9U/Y/B4nNynfCRUqNyVZ4sBC/n9GDRCkq9vd2mIvKjKKsbIh1WPmHmNbg6ND7cTBY3Y2+u1G3/2Q==", - "dev": true, + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", + "license": "MIT", "dependencies": { - "follow-redirects": "^1.15.4", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } }, "node_modules/axobject-query": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.0.0.tgz", - "integrity": "sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz", + "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==", "dev": true, - "dependencies": { - "dequal": "^2.0.3" + "license": "Apache-2.0", + "engines": { + "node": ">= 0.4" } }, "node_modules/babel-loader": { @@ -8698,6 +8329,7 @@ "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz", "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==", "dev": true, + "license": "MIT", "dependencies": { "find-cache-dir": "^4.0.0", "schema-utils": "^4.0.0" @@ -8710,27 +8342,12 @@ "webpack": ">=5" } }, - "node_modules/babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, "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==", "dev": true, + "license": "MIT", "dependencies": { "@babel/compat-data": "^7.22.6", "@babel/helper-define-polyfill-provider": "^0.6.2", @@ -8745,62 +8362,33 @@ "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/babel-plugin-polyfill-corejs3": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz", - "integrity": "sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==", - "dev": true, - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.5.0", - "core-js-compat": "^3.34.0" - }, - "peerDependencies": { - "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" - } - }, - "node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz", - "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.22.6", - "@babel/helper-plugin-utils": "^7.22.5", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2" + "@babel/helper-define-polyfill-provider": "^0.6.1", + "core-js-compat": "^3.36.1" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz", - "integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==", - "dev": true, - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.5.0" - }, - "peerDependencies": { - "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" - } - }, - "node_modules/babel-plugin-polyfill-regenerator/node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz", - "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.22.6", - "@babel/helper-plugin-utils": "^7.22.5", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2" + "@babel/helper-define-polyfill-provider": "^0.6.2" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -8809,14 +8397,12 @@ "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==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "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", @@ -8836,31 +8422,36 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/big.js": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true, + "license": "MIT", "engines": { "node": "*" } }, "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/bl": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -8872,6 +8463,7 @@ "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", @@ -8896,6 +8488,7 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -8905,6 +8498,7 @@ "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" } @@ -8913,16 +8507,16 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/bonjour-service": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz", - "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz", + "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==", "dev": true, + "license": "MIT", "dependencies": { - "array-flatten": "^2.1.2", - "dns-equal": "^1.0.0", "fast-deep-equal": "^3.1.3", "multicast-dns": "^7.2.5" } @@ -8931,7 +8525,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/bootstrap": { "version": "5.3.3", @@ -8954,13 +8549,13 @@ "node_modules/bowser": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz", - "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==" + "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==", + "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==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -8970,7 +8565,7 @@ "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" }, @@ -8979,9 +8574,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", - "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", + "version": "4.23.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", + "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", "dev": true, "funding": [ { @@ -8997,11 +8592,12 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001587", - "electron-to-chromium": "^1.4.668", - "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.13" + "caniuse-lite": "^1.0.30001646", + "electron-to-chromium": "^1.5.4", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" }, "bin": { "browserslist": "cli.js" @@ -9014,7 +8610,6 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, "funding": [ { "type": "github", @@ -9038,15 +8633,20 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true + "dev": true, + "license": "MIT" }, - "node_modules/builtin-modules": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", - "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", + "node_modules/bundle-name": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz", + "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==", "dev": true, + "license": "MIT", + "dependencies": { + "run-applescript": "^7.0.0" + }, "engines": { - "node": ">=6" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -9057,15 +8657,17 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/cacache": { - "version": "18.0.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz", - "integrity": "sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==", + "version": "18.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", + "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", "dev": true, + "license": "ISC", "dependencies": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", @@ -9084,65 +8686,11 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/cacache/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, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/cacache/node_modules/glob": { - "version": "10.3.12", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", - "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", - "dev": true, - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.10.2" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/cacache/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", - "dev": true, - "engines": { - "node": "14 || >=16.14" - } - }, - "node_modules/cacache/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "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==", + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -9166,19 +8714,10 @@ "node": ">=6" } }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/caniuse-lite": { - "version": "1.0.30001616", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz", - "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==", + "version": "1.0.30001646", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001646.tgz", + "integrity": "sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw==", "dev": true, "funding": [ { @@ -9193,32 +8732,37 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "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, + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": ">=4" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, "node_modules/chardet": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/chart.js": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.2.tgz", - "integrity": "sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.4.tgz", + "integrity": "sha512-emICKGBABnxhMjUjlYRR12PmOXhJ2eJjEHL2/dZlWjxRAZT1D8xplLFq5M0tMQK8ja+wBS/tuVEJB5C6r7VxJA==", + "license": "MIT", "dependencies": { "@kurkle/color": "^0.3.0" }, @@ -9255,16 +8799,11 @@ } }, "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], + "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -9277,6 +8816,9 @@ "engines": { "node": ">= 8.10.0" }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, "optionalDependencies": { "fsevents": "~2.3.2" } @@ -9286,15 +8828,17 @@ "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } }, "node_modules/chrome-trace-event": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz", + "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0" } @@ -9304,6 +8848,7 @@ "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -9312,7 +8857,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, "dependencies": { "restore-cursor": "^3.1.0" }, @@ -9324,7 +8868,6 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", - "dev": true, "engines": { "node": ">=6" }, @@ -9332,11 +8875,70 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/cli-truncate": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", + "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", + "dev": true, + "license": "MIT", + "dependencies": { + "slice-ansi": "^5.0.0", + "string-width": "^7.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "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", "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==", "dev": true, + "license": "ISC", "engines": { "node": ">= 12" } @@ -9345,7 +8947,6 @@ "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, "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -9359,7 +8960,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "dev": true, "engines": { "node": ">=0.8" } @@ -9369,6 +8969,7 @@ "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, + "license": "MIT", "dependencies": { "is-plain-object": "^2.0.4", "kind-of": "^6.0.2", @@ -9378,26 +8979,36 @@ "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/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, + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", "dependencies": { - "color-name": "1.1.3" + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" } }, "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 + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" }, "node_modules/colorette": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/colornames": { "version": "1.1.1", @@ -9408,7 +9019,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, + "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" }, @@ -9420,13 +9031,15 @@ "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/comment-parser": { "version": "1.4.1", "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" } @@ -9435,13 +9048,15 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, + "license": "MIT", "dependencies": { "mime-db": ">= 1.43.0 < 2" }, @@ -9454,6 +9069,7 @@ "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, + "license": "MIT", "dependencies": { "accepts": "~1.3.5", "bytes": "3.0.0", @@ -9472,6 +9088,7 @@ "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" } @@ -9480,25 +9097,27 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "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==", - "dev": true + "dev": true, + "license": "MIT" }, "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=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "node_modules/connect-history-api-fallback": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8" } @@ -9508,6 +9127,7 @@ "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" }, @@ -9520,30 +9140,24 @@ "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": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", + "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, - "dependencies": { - "safe-buffer": "~5.1.1" - } - }, - "node_modules/convert-source-map/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==", - "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==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -9552,13 +9166,15 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/copy-anything": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz", "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", "dev": true, + "license": "MIT", "dependencies": { "is-what": "^3.14.1" }, @@ -9567,20 +9183,21 @@ } }, "node_modules/copy-webpack-plugin": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz", - "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz", + "integrity": "sha512-SNwdBeHyII+rWvee/bTnAYyO8vfVdcSTud4EIb6jcZ8inLeWucJE0DnxXQBjlQ5zlteuuvooGQy3LIyGxhvlOA==", "dev": true, + "license": "MIT", "dependencies": { - "fast-glob": "^3.2.11", + "fast-glob": "^3.3.2", "glob-parent": "^6.0.1", - "globby": "^13.1.1", + "globby": "^14.0.0", "normalize-path": "^3.0.0", - "schema-utils": "^4.0.0", - "serialize-javascript": "^6.0.0" + "schema-utils": "^4.2.0", + "serialize-javascript": "^6.0.2" }, "engines": { - "node": ">= 14.15.0" + "node": ">= 18.12.0" }, "funding": { "type": "opencollective", @@ -9595,6 +9212,7 @@ "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" }, @@ -9603,29 +9221,32 @@ } }, "node_modules/copy-webpack-plugin/node_modules/globby": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz", - "integrity": "sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==", + "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": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.11", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^4.0.0" + "@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": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/copy-webpack-plugin/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "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" }, @@ -9633,11 +9254,25 @@ "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.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.0.tgz", - "integrity": "sha512-vYq4L+T8aS5UuFg4UwDhc7YNRWVeVZwltad9C/jV3R2LgVOpS9BDr7l/WL6BN0dbV3k1XejPTHqqEzJgsa0frA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { "browserslist": "^4.23.0" }, @@ -9650,13 +9285,15 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cosmiconfig": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", "dev": true, + "license": "MIT", "dependencies": { "env-paths": "^2.2.1", "import-fresh": "^3.3.0", @@ -9678,17 +9315,12 @@ } } }, - "node_modules/cosmiconfig/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==", - "dev": true - }, "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" }, @@ -9697,10 +9329,12 @@ } }, "node_modules/critters": { - "version": "0.0.22", - "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.22.tgz", - "integrity": "sha512-NU7DEcQZM2Dy8XTKFHxtdnIM/drE312j2T4PCVaSUcS0oBeyT/NImpRw/Ap0zOr/1SE7SgPK9tGPg1WK/sVakw==", + "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", @@ -9711,81 +9345,12 @@ "postcss-media-query-parser": "^0.2.3" } }, - "node_modules/critters/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/critters/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/critters/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/critters/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/critters/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/critters/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -9796,22 +9361,23 @@ } }, "node_modules/css-loader": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.10.0.tgz", - "integrity": "sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz", + "integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==", "dev": true, + "license": "MIT", "dependencies": { "icss-utils": "^5.1.0", "postcss": "^8.4.33", - "postcss-modules-extract-imports": "^3.0.0", - "postcss-modules-local-by-default": "^4.0.4", - "postcss-modules-scope": "^3.1.1", + "postcss-modules-extract-imports": "^3.1.0", + "postcss-modules-local-by-default": "^4.0.5", + "postcss-modules-scope": "^3.2.0", "postcss-modules-values": "^4.0.0", "postcss-value-parser": "^4.2.0", "semver": "^7.5.4" }, "engines": { - "node": ">= 12.13.0" + "node": ">= 18.12.0" }, "funding": { "type": "opencollective", @@ -9819,7 +9385,7 @@ }, "peerDependencies": { "@rspack/core": "0.x || 1.x", - "webpack": "^5.0.0" + "webpack": "^5.27.0" }, "peerDependenciesMeta": { "@rspack/core": { @@ -9830,26 +9396,12 @@ } } }, - "node_modules/css-loader/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/css-select": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0", "css-what": "^6.1.0", @@ -9866,6 +9418,7 @@ "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">= 6" }, @@ -9878,6 +9431,7 @@ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true, + "license": "MIT", "bin": { "cssesc": "bin/cssesc" }, @@ -9886,9 +9440,10 @@ } }, "node_modules/curved-arrows": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/curved-arrows/-/curved-arrows-0.2.0.tgz", - "integrity": "sha512-iyJsrrhKtS5mEmA1DgKM+T4Su9dAM9Ze78kMkY15QrYNgZD+JQwOIXnNxpKmeAUKXNnGtiihMexQ/xH2OhyPpw==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/curved-arrows/-/curved-arrows-0.3.0.tgz", + "integrity": "sha512-leAnMANCEkbi8Wvb9yFhVfJf0ditmF9ppKZIOsSam65CP7y8d2/ri3oAp8Jd1V+GO889+WR+86XSo+bPbecM3A==", + "license": "MIT", "engines": { "node": ">=10" } @@ -9911,10 +9466,11 @@ } }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -9933,11 +9489,42 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, + "node_modules/default-browser": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz", + "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==", + "dev": true, + "license": "MIT", + "dependencies": { + "bundle-name": "^4.1.0", + "default-browser-id": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser-id": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz", + "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "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" }, @@ -9949,7 +9536,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "dev": true, "dependencies": { "clone": "^1.0.2" } @@ -9958,6 +9544,7 @@ "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==", + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -9974,7 +9561,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", - "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -10000,7 +9587,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, + "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -10010,6 +9597,7 @@ "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" } @@ -10019,6 +9607,7 @@ "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -10028,16 +9617,28 @@ "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==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, "node_modules/detect-node": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/diff": { "version": "5.2.0", @@ -10051,34 +9652,17 @@ "version": "29.6.3", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", - "dev": true, + "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dns-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==", - "dev": true - }, "node_modules/dns-packet": { "version": "5.6.1", "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==", "dev": true, + "license": "MIT", "dependencies": { "@leichtgewicht/ip-codec": "^2.0.1" }, @@ -10086,23 +9670,12 @@ "node": ">=6" } }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/dom-serializer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", "dev": true, + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", @@ -10117,6 +9690,7 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -10139,13 +9713,15 @@ "type": "github", "url": "https://github.com/sponsors/fb55" } - ] + ], + "license": "BSD-2-Clause" }, "node_modules/domhandler": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.3.0" }, @@ -10157,15 +9733,17 @@ } }, "node_modules/dompurify": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.3.tgz", - "integrity": "sha512-5sOWYSNPaxz6o2MUPvtyxTTqR4D3L77pr5rUQoWgD5ROQtVIZQgJkXbo1DLlK3vj11YGw5+LnF4SYti4gZmwng==" + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz", + "integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==", + "license": "(MPL-2.0 OR Apache-2.0)" }, "node_modules/domutils": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", @@ -10176,49 +9754,51 @@ } }, "node_modules/dotenv": { - "version": "16.3.2", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz", - "integrity": "sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==", - "dev": true, + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "license": "BSD-2-Clause", "engines": { "node": ">=12" }, "funding": { - "url": "https://github.com/motdotla/dotenv?sponsor=1" + "url": "https://dotenvx.com" } }, "node_modules/dotenv-expand": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz", - "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==", - "dev": true, + "version": "11.0.6", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.6.tgz", + "integrity": "sha512-8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g==", + "license": "BSD-2-Clause", + "dependencies": { + "dotenv": "^16.4.4" + }, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" } }, - "node_modules/duplexer": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", - "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", - "dev": true - }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true + "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==", - "dev": true, + "license": "Apache-2.0", "dependencies": { "jake": "^10.8.5" }, @@ -10230,22 +9810,23 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.757", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.757.tgz", - "integrity": "sha512-jftDaCknYSSt/+KKeXzH3LX5E2CvRLm75P3Hj+J/dv3CL0qUYcOt13d5FN1NiL5IJbbhzHrb3BomeG2tkSlZmw==", - "dev": true + "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==", + "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==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/emojis-list": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } @@ -10255,6 +9836,7 @@ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -10264,6 +9846,7 @@ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "iconv-lite": "^0.6.2" @@ -10274,6 +9857,7 @@ "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" @@ -10286,16 +9870,17 @@ "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==", - "dev": true, + "license": "MIT", "dependencies": { "once": "^1.4.0" } }, "node_modules/enhanced-resolve": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz", - "integrity": "sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==", + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -10308,7 +9893,7 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, + "license": "MIT", "dependencies": { "ansi-colors": "^4.1.1" }, @@ -10329,21 +9914,37 @@ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, + "node_modules/environment": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz", + "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/err-code": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/errno": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "prr": "~1.0.1" @@ -10357,6 +9958,7 @@ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, + "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" } @@ -10418,6 +10020,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "license": "MIT", "dependencies": { "get-intrinsic": "^1.2.4" }, @@ -10429,15 +10032,17 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", "engines": { "node": ">= 0.4" } }, "node_modules/es-module-lexer": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.2.tgz", - "integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==", - "dev": true + "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==", + "dev": true, + "license": "MIT" }, "node_modules/es-set-tostringtag": { "version": "2.0.1", @@ -10480,61 +10085,63 @@ } }, "node_modules/esbuild": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz", - "integrity": "sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz", + "integrity": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==", "dev": true, "hasInstallScript": true, - "optional": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, "engines": { - "node": ">=12" + "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.20.1", - "@esbuild/android-arm": "0.20.1", - "@esbuild/android-arm64": "0.20.1", - "@esbuild/android-x64": "0.20.1", - "@esbuild/darwin-arm64": "0.20.1", - "@esbuild/darwin-x64": "0.20.1", - "@esbuild/freebsd-arm64": "0.20.1", - "@esbuild/freebsd-x64": "0.20.1", - "@esbuild/linux-arm": "0.20.1", - "@esbuild/linux-arm64": "0.20.1", - "@esbuild/linux-ia32": "0.20.1", - "@esbuild/linux-loong64": "0.20.1", - "@esbuild/linux-mips64el": "0.20.1", - "@esbuild/linux-ppc64": "0.20.1", - "@esbuild/linux-riscv64": "0.20.1", - "@esbuild/linux-s390x": "0.20.1", - "@esbuild/linux-x64": "0.20.1", - "@esbuild/netbsd-x64": "0.20.1", - "@esbuild/openbsd-x64": "0.20.1", - "@esbuild/sunos-x64": "0.20.1", - "@esbuild/win32-arm64": "0.20.1", - "@esbuild/win32-ia32": "0.20.1", - "@esbuild/win32-x64": "0.20.1" + "@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" } }, "node_modules/esbuild-wasm": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.20.1.tgz", - "integrity": "sha512-6v/WJubRsjxBbQdz6izgvx7LsVFvVaGmSdwrFHmEzoVgfXL89hkKPoQHsnVI2ngOkcBUQT9kmAM1hVL1k/Av4A==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.23.0.tgz", + "integrity": "sha512-6jP8UmWy6R6TUUV8bMuC3ZyZ6lZKI56x0tkxyCIqWwRRJ/DgeQKneh/Oid5EoGoPFLrGNkz47ZEtWAYuiY/u9g==", "dev": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "license": "MIT", "engines": { "node": ">=6" } @@ -10543,53 +10150,50 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true + "dev": true, + "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=", - "dev": true, "engines": { "node": ">=0.8.0" } }, "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "version": "9.9.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.1.tgz", + "integrity": "sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", + "@eslint-community/regexpp": "^4.11.0", + "@eslint/config-array": "^0.18.0", + "@eslint/eslintrc": "^3.1.0", + "@eslint/js": "9.9.1", "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.3.0", "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", - "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", + "eslint-scope": "^8.0.2", + "eslint-visitor-keys": "^4.0.0", + "espree": "^10.1.0", + "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", @@ -10603,25 +10207,18 @@ "eslint": "bin/eslint.js" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-etc": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/eslint-etc/-/eslint-etc-5.2.1.tgz", - "integrity": "sha512-lFJBSiIURdqQKq9xJhvSJFyPA+VeTh5xvk24e8pxVL7bwLBtGF60C/KRkLTMrvCZ6DA3kbPuYhLWY0TZMlqTsg==", - "dev": true, - "dependencies": { - "@typescript-eslint/experimental-utils": "^5.0.0", - "tsutils": "^3.17.1", - "tsutils-etc": "^1.4.1" + "url": "https://eslint.org/donate" }, "peerDependencies": { - "eslint": "^8.0.0", - "typescript": ">=4.0.0" + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } } }, "node_modules/eslint-import-resolver-node": { @@ -10732,20 +10329,23 @@ } }, "node_modules/eslint-plugin-jsdoc": { - "version": "48.2.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.3.tgz", - "integrity": "sha512-r9DMAmFs66VNvNqRLLjHejdnJtILrt3xGi+Qx0op0oRfFGVpOR1Hb3BC++MacseHx93d8SKYPhyrC9BS7Os2QA==", + "version": "50.2.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.2.2.tgz", + "integrity": "sha512-i0ZMWA199DG7sjxlzXn5AeYZxpRfMJjDPUl7lL9eJJX8TPRoIaxJU4ys/joP5faM5AXE1eqW/dslCj3uj4Nqpg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { - "@es-joy/jsdoccomment": "~0.42.0", + "@es-joy/jsdoccomment": "~0.48.0", "are-docs-informative": "^0.0.2", "comment-parser": "1.4.1", - "debug": "^4.3.4", + "debug": "^4.3.6", "escape-string-regexp": "^4.0.0", - "esquery": "^1.5.0", - "is-builtin-module": "^3.2.1", - "semver": "^7.6.0", - "spdx-expression-parse": "^4.0.0" + "espree": "^10.1.0", + "esquery": "^1.6.0", + "parse-imports": "^2.1.1", + "semver": "^7.6.3", + "spdx-expression-parse": "^4.0.0", + "synckit": "^0.9.1" }, "engines": { "node": ">=18" @@ -10766,21 +10366,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint-plugin-jsdoc/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "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", @@ -10801,16 +10386,20 @@ } }, "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", + "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" + "estraverse": "^5.2.0" }, "engines": { - "node": ">=8.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint-visitor-keys": { @@ -10841,61 +10430,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/eslint/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/eslint/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/eslint/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/eslint/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/eslint/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "node_modules/eslint/node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -10908,31 +10442,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", + "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, + "license": "Apache-2.0", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/eslint/node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -10961,42 +10483,6 @@ "node": ">=10.13.0" } }, - "node_modules/eslint/node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/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, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "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", @@ -11048,42 +10534,32 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/espree": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", + "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "has-flag": "^4.0.0" + "acorn": "^8.12.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^4.0.0" }, "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://opencollective.com/eslint" } }, - "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", + "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", "dev": true, - "dependencies": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - }, + "license": "Apache-2.0", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -11093,7 +10569,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, + "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -11103,10 +10579,11 @@ } }, "node_modules/esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -11114,15 +10591,6 @@ "node": ">=0.10" } }, - "node_modules/esquery/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/esrecurse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", @@ -11135,20 +10603,12 @@ "node": ">=4.0" } }, - "node_modules/esrecurse/node_modules/estraverse": { + "node_modules/estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } @@ -11167,21 +10627,24 @@ "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": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "dev": true + "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/events": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.x" } @@ -11191,6 +10654,7 @@ "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, + "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", @@ -11213,7 +10677,8 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/export-to-csv": { "version": "1.3.0", @@ -11228,6 +10693,7 @@ "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dev": true, + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -11265,17 +10731,12 @@ "node": ">= 0.10.0" } }, - "node_modules/express/node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "dev": true - }, "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==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -11284,13 +10745,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "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", "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, + "license": "MIT", "dependencies": { "chardet": "^0.7.0", "iconv-lite": "^0.4.24", @@ -11305,6 +10768,7 @@ "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" }, @@ -11322,7 +10786,6 @@ "version": "3.3.2", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -11346,20 +10809,28 @@ "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-xml-parser": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz", - "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz", + "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==", "funding": [ - { - "type": "paypal", - "url": "https://paypal.me/naturalintelligence" - }, { "type": "github", "url": "https://github.com/sponsors/NaturalIntelligence" + }, + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" } ], + "license": "MIT", "dependencies": { "strnum": "^1.0.5" }, @@ -11371,7 +10842,6 @@ "version": "1.13.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", - "dev": true, "dependencies": { "reusify": "^1.0.4" } @@ -11381,6 +10851,7 @@ "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", "dev": true, + "license": "Apache-2.0", "dependencies": { "websocket-driver": ">=0.5.1" }, @@ -11392,7 +10863,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dev": true, + "license": "MIT", "dependencies": { "escape-string-regexp": "^1.0.5" }, @@ -11404,22 +10875,23 @@ } }, "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dev": true, + "license": "MIT", "dependencies": { - "flat-cache": "^3.0.4" + "flat-cache": "^4.0.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "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==", - "dev": true, + "license": "Apache-2.0", "dependencies": { "minimatch": "^5.0.1" } @@ -11428,7 +10900,7 @@ "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" } @@ -11437,7 +10909,7 @@ "version": "5.1.6", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -11446,9 +10918,10 @@ } }, "node_modules/filesize": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-10.1.1.tgz", - "integrity": "sha512-L0cdwZrKlwZQkMSFnCflJ6J2Y+5egO/p3vgRSDQGxQt++QbUZe5gMbRO6kg6gzwQDPvq2Fk9AmoxUNfZ5gdqaQ==", + "version": "10.1.4", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-10.1.4.tgz", + "integrity": "sha512-ryBwPIIeErmxgPnm6cbESAzXjuEFubs+yKYLBZvg3CaiNcmkJChoOGcBSrZ6IwkMwPABwPpVXE6IlNdGJJrvEg==", + "license": "BSD-3-Clause", "engines": { "node": ">= 10.4.0" } @@ -11457,7 +10930,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" }, @@ -11470,6 +10943,7 @@ "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", @@ -11488,6 +10962,7 @@ "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" } @@ -11496,13 +10971,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/find-cache-dir": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz", "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==", "dev": true, + "license": "MIT", "dependencies": { "common-path-prefix": "^3.0.0", "pkg-dir": "^7.0.0" @@ -11515,52 +10992,65 @@ } }, "node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "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": "^5.0.0", - "path-exists": "^4.0.0" + "locate-path": "^7.1.0", + "path-exists": "^5.0.0" }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "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, "bin": { "flat": "cli.js" } }, "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dev": true, + "license": "MIT", "dependencies": { "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" + "keyv": "^4.5.4" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16" } }, "node_modules/flatted": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", - "dev": true + "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==", - "dev": true, "funding": [ { "type": "individual", @@ -11586,10 +11076,11 @@ } }, "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", "dev": true, + "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -11606,6 +11097,7 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, + "license": "ISC", "engines": { "node": ">=14" }, @@ -11614,10 +11106,10 @@ } }, "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -11632,6 +11124,7 @@ "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -11641,6 +11134,7 @@ "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==", "dev": true, + "license": "MIT", "engines": { "node": "*" }, @@ -11654,35 +11148,32 @@ "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/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==", + "license": "MIT", + "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==", - "dev": true - }, - "node_modules/fs-extra": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", - "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } + "license": "MIT" }, "node_modules/fs-minipass": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^7.0.3" }, @@ -11690,24 +11181,13 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/fs-monkey": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz", - "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==", - "dev": true - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -11756,6 +11236,7 @@ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -11764,15 +11245,28 @@ "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, "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==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "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==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -11787,20 +11281,12 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true, - "engines": { - "node": ">=8.0.0" - } - }, "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, + "license": "MIT", "engines": { "node": ">=10" }, @@ -11825,20 +11311,21 @@ } }, "node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "dev": true, + "license": "ISC", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" }, - "engines": { - "node": "*" + "bin": { + "glob": "dist/esm/bin.mjs" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -11848,7 +11335,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -11860,13 +11346,41 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true + "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", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -11886,26 +11400,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/gopd": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", @@ -11918,16 +11412,18 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.9", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", - "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", - "dev": true + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" }, "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/hammerjs": { "version": "2.0.8", @@ -11941,7 +11437,8 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/has": { "version": "1.0.3", @@ -11956,14 +11453,15 @@ } }, "node_modules/has-ansi": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-5.0.1.tgz", - "integrity": "sha512-Fp2IsZDnnyoJkKg22ZyQFvD7QRCcMTsLAtloKXyXWJ1joGLtItRU9Bv/k1o0tELL2NF3ZZBcycSKryZUM+Yl3g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-6.0.0.tgz", + "integrity": "sha512-1AYj+gqAskFf9Skb7xuEYMfJqkW3TJ8lukw4Fczw+Y6jRkgxvcE4JiFWuTO4DsoleMvvHudryolA9ObJHJKHWQ==", + "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/chalk/has-ansi?sponsor=1" @@ -11979,18 +11477,19 @@ } }, "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, + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/has-property-descriptors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0" }, @@ -12067,6 +11566,7 @@ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz", "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^10.0.1" }, @@ -12074,20 +11574,12 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/hosted-git-info/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", - "dev": true, - "engines": { - "node": "14 || >=16.14" - } - }, "node_modules/hpack.js": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==", "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.1", "obuf": "^1.0.0", @@ -12099,13 +11591,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/hpack.js/node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, + "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -12120,12 +11614,13 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/html-entities": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", - "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz", + "integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==", "dev": true, "funding": [ { @@ -12136,7 +11631,8 @@ "type": "patreon", "url": "https://patreon.com/mdevils" } - ] + ], + "license": "MIT" }, "node_modules/htmlparser2": { "version": "8.0.2", @@ -12150,6 +11646,7 @@ "url": "https://github.com/sponsors/fb55" } ], + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", @@ -12162,6 +11659,7 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -12173,19 +11671,22 @@ "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==", - "dev": true + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/http-deceiver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/http-errors": { "version": "2.0.0", "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", @@ -12201,13 +11702,15 @@ "version": "0.5.8", "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/http-proxy": { "version": "1.18.1", "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, + "license": "MIT", "dependencies": { "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", @@ -12222,6 +11725,7 @@ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" @@ -12231,34 +11735,46 @@ } }, "node_modules/http-proxy-middleware": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", - "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.3.tgz", + "integrity": "sha512-usY0HG5nyDUwtqpiZdETNbmKtw3QQ1jwYFZ9wi5iHzX2BcILwQKtYDJPo7XHTsu5Z0B2Hj3W9NNnbd+AjFWjqg==", "dev": true, + "license": "MIT", "dependencies": { - "@types/http-proxy": "^1.17.8", + "@types/http-proxy": "^1.17.15", + "debug": "^4.3.6", "http-proxy": "^1.18.1", - "is-glob": "^4.0.1", - "is-plain-obj": "^3.0.0", - "micromatch": "^4.0.2" + "is-glob": "^4.0.3", + "is-plain-object": "^5.0.0", + "micromatch": "^4.0.8" }, "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "@types/express": "^4.17.13" - }, - "peerDependenciesMeta": { - "@types/express": { - "optional": true - } + "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, + "license": "MIT", + "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.4", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz", - "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -12272,15 +11788,27 @@ "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", + "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.18" + } + }, "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": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -12293,6 +11821,7 @@ "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", "dev": true, + "license": "ISC", "engines": { "node": "^10 || ^12 || >= 14" }, @@ -12304,7 +11833,6 @@ "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", @@ -12321,10 +11849,10 @@ ] }, "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", - "dev": true, + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", "engines": { "node": ">= 4" } @@ -12334,6 +11862,7 @@ "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz", "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==", "dev": true, + "license": "ISC", "dependencies": { "minimatch": "^9.0.0" }, @@ -12346,15 +11875,17 @@ "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.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "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" }, @@ -12370,24 +11901,21 @@ "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", "dev": true, + "license": "MIT", "optional": true, "bin": { "image-size": "bin/image-size.js" }, "engines": { "node": ">=0.10.0" - } - }, - "node_modules/immediate": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", - "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" + } }, "node_modules/immutable": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", - "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==", - "dev": true + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", + "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", + "dev": true, + "license": "MIT" }, "node_modules/import-fresh": { "version": "3.3.0", @@ -12428,120 +11956,26 @@ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ini": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz", - "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz", + "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==", "dev": true, + "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/inquirer": { - "version": "9.2.15", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.15.tgz", - "integrity": "sha512-vI2w4zl/mDluHt9YEQ/543VTCwPKWiHzKtm9dM2V0NdFcqEexDAjUHzO1oA60HRNaVifGXXM1tRRNluLVHa0Kg==", - "dev": true, - "dependencies": { - "@ljharb/through": "^2.3.12", - "ansi-escapes": "^4.3.2", - "chalk": "^5.3.0", - "cli-cursor": "^3.1.0", - "cli-width": "^4.1.0", - "external-editor": "^3.1.0", - "figures": "^3.2.0", - "lodash": "^4.17.21", - "mute-stream": "1.0.0", - "ora": "^5.4.1", - "run-async": "^3.0.0", - "rxjs": "^7.8.1", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^6.2.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/inquirer/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/inquirer/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/inquirer/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/inquirer/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/inquirer/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, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/internal-slot": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", @@ -12561,6 +11995,7 @@ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", "dev": true, + "license": "MIT", "dependencies": { "jsbn": "1.1.0", "sprintf-js": "^1.1.3" @@ -12570,10 +12005,11 @@ } }, "node_modules/ipaddr.js": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz", - "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==", + "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" } @@ -12596,7 +12032,8 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-bigint": { "version": "1.0.4", @@ -12615,6 +12052,7 @@ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -12638,21 +12076,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-builtin-module": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", - "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", - "dev": true, - "dependencies": { - "builtin-modules": "^3.3.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -12696,7 +12119,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true, + "license": "MIT", "bin": { "is-docker": "cli.js" }, @@ -12711,7 +12134,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -12720,7 +12142,6 @@ "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, "engines": { "node": ">=8" } @@ -12729,7 +12150,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, "dependencies": { "is-extglob": "^2.1.1" }, @@ -12737,11 +12157,45 @@ "node": ">=0.10.0" } }, + "node_modules/is-inside-container": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", + "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-docker": "^3.0.0" + }, + "bin": { + "is-inside-container": "cli.js" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "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, "engines": { "node": ">=8" } @@ -12750,7 +12204,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-negative-zero": { "version": "2.0.2", @@ -12764,11 +12219,24 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-network-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz", + "integrity": "sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-number": { "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" } @@ -12802,6 +12270,7 @@ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -12814,6 +12283,7 @@ "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" }, @@ -12854,6 +12324,7 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -12910,7 +12381,6 @@ "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, "engines": { "node": ">=10" }, @@ -12921,284 +12391,137 @@ "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==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-what": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", - "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", - "dev": true - }, - "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==", - "dev": true, - "dependencies": { - "is-docker": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "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 - }, - "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 - }, - "node_modules/isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/istanbul-lib-coverage": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument/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, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", - "dev": true, - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/jake": { - "version": "10.8.7", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz", - "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==", - "dev": true, - "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/jake/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jake/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", "dev": true, "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" + "call-bind": "^1.0.2" }, "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/jake/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==", + "node_modules/is-what": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", + "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", "dev": true, + "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==", + "license": "MIT", "dependencies": { - "color-name": "~1.1.4" + "is-docker": "^2.0.0" }, "engines": { - "node": ">=7.0.0" + "node": ">=8" } }, - "node_modules/jake/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "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 }, - "node_modules/jake/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "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 + }, + "node_modules/isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", "dev": true, + "license": "MIT", "engines": { - "node": ">=8" + "node": ">=0.10.0" } }, - "node_modules/jake/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==", + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, + "license": "BSD-3-Clause", "engines": { "node": ">=8" } }, - "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==", + "node_modules/istanbul-lib-instrument": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^29.6.3", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": ">=10" } }, - "node_modules/jest-diff/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", "dev": true, + "license": "BlueOak-1.0.0", "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" + "@isaacs/cliui": "^8.0.2" }, "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-diff/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" + "url": "https://github.com/sponsors/isaacs" }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" } }, - "node_modules/jest-diff/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, + "node_modules/jake": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", + "license": "Apache-2.0", "dependencies": { - "color-name": "~1.1.4" + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" }, "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/jest-diff/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/jest-diff/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" + "node": ">=10" } }, - "node_modules/jest-diff/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, + "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==", + "license": "MIT", "dependencies": { - "has-flag": "^4.0.0" + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": ">=8" + "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==", - "dev": true, + "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } @@ -13208,6 +12531,7 @@ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", @@ -13217,20 +12541,12 @@ "node": ">= 10.13.0" } }, - "node_modules/jest-worker/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/jest-worker/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -13242,10 +12558,11 @@ } }, "node_modules/jiti": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", - "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", + "version": "1.21.6", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz", + "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==", "dev": true, + "license": "MIT", "bin": { "jiti": "bin/jiti.js" } @@ -13254,13 +12571,14 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "dev": true, + "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==", - "dev": true, + "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -13269,17 +12587,34 @@ "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==", + "license": "MIT", + "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==", + "license": "BSD-3-Clause" + }, "node_modules/jsbn": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/jsdoc-type-pratt-parser": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz", - "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==", + "version": "4.1.0", + "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" } @@ -13289,6 +12624,7 @@ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true, + "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, @@ -13300,13 +12636,15 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "dev": true, + "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==", "dev": true, + "license": "MIT", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -13315,7 +12653,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", @@ -13327,7 +12666,6 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, "bin": { "json5": "lib/cli.js" }, @@ -13336,22 +12674,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==", - "dev": true - }, - "node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "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, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } + "license": "MIT" }, "node_modules/jsonparse": { "version": "1.3.1", @@ -13360,13 +12687,15 @@ "dev": true, "engines": [ "node >= 0.2.0" - ] + ], + "license": "MIT" }, "node_modules/karma-source-map-support": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz", "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==", "dev": true, + "license": "MIT", "dependencies": { "source-map-support": "^0.5.5" } @@ -13376,6 +12705,7 @@ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, + "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } @@ -13385,24 +12715,17 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, - "node_modules/klona": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, "node_modules/launch-editor": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz", - "integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { "picocolors": "^1.0.0", "shell-quote": "^1.8.1" @@ -13413,6 +12736,7 @@ "resolved": "https://registry.npmjs.org/less/-/less-4.2.0.tgz", "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "copy-anything": "^2.0.1", "parse-node-version": "^1.0.1", @@ -13435,23 +12759,30 @@ } }, "node_modules/less-loader": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz", - "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==", + "version": "12.2.0", + "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-12.2.0.tgz", + "integrity": "sha512-MYUxjSQSBUQmowc0l5nPieOYwMzGPUaTzB6inNW/bdPEG9zOL3eAAD1Qw5ZxSPk7we5dMojHwNODYMV1hq4EVg==", "dev": true, - "dependencies": { - "klona": "^2.0.4" - }, + "license": "MIT", "engines": { - "node": ">= 14.15.0" + "node": ">= 18.12.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, "peerDependencies": { + "@rspack/core": "0.x || 1.x", "less": "^3.5.0 || ^4.0.0", "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "@rspack/core": { + "optional": true + }, + "webpack": { + "optional": true + } } }, "node_modules/less/node_modules/source-map": { @@ -13459,6 +12790,7 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "license": "BSD-3-Clause", "optional": true, "engines": { "node": ">=0.10.0" @@ -13482,33 +12814,142 @@ "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz", "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==", "dev": true, + "license": "ISC", + "dependencies": { + "webpack-sources": "^3.0.0" + }, + "peerDependenciesMeta": { + "webpack": { + "optional": true + }, + "webpack-sources": { + "optional": true + } + } + }, + "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==", + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/listr2": { + "version": "8.2.4", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz", + "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "cli-truncate": "^4.0.0", + "colorette": "^2.0.20", + "eventemitter3": "^5.0.1", + "log-update": "^6.1.0", + "rfdc": "^1.4.1", + "wrap-ansi": "^9.0.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/listr2/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "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==", + "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": { - "webpack-sources": "^3.0.0" + "ansi-regex": "^6.0.1" }, - "peerDependenciesMeta": { - "webpack": { - "optional": true - }, - "webpack-sources": { - "optional": true - } + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/lie": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", - "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==", + "node_modules/listr2/node_modules/wrap-ansi": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", + "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", + "dev": true, + "license": "MIT", "dependencies": { - "immediate": "~3.0.5" + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/lines-and-columns": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz", - "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==", + "node_modules/lmdb": { + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.0.13.tgz", + "integrity": "sha512-UGe+BbaSUQtAMZobTb4nHvFMrmvuAQKSeaqAX2meTEQjfsbpl5sxdHD8T72OnwD4GU9uwNhYXIVe4QGs8N9Zyw==", "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "msgpackr": "^1.10.2", + "node-addon-api": "^6.1.0", + "node-gyp-build-optional-packages": "5.2.2", + "ordered-binary": "^1.4.1", + "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" } }, "node_modules/loader-runner": { @@ -13516,45 +12957,37 @@ "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.11.5" } }, "node_modules/loader-utils": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", - "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz", + "integrity": "sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 12.13.0" } }, - "node_modules/localforage": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz", - "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==", - "dependencies": { - "lie": "3.1.1" - } - }, "node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "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": "^4.1.0" + "p-locate": "^6.0.0" }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, "node_modules/lodash-es": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", @@ -13564,7 +12997,8 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.merge": { "version": "4.6.2", @@ -13591,7 +13025,6 @@ "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, "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -13603,103 +13036,229 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/log-symbols/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/log-update": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz", + "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==", "dev": true, + "license": "MIT", "dependencies": { - "color-convert": "^2.0.1" + "ansi-escapes": "^7.0.0", + "cli-cursor": "^5.0.0", + "slice-ansi": "^7.1.0", + "strip-ansi": "^7.1.0", + "wrap-ansi": "^9.0.0" }, "engines": { - "node": ">=8" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/ansi-escapes": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz", + "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==", + "dev": true, + "license": "MIT", + "dependencies": { + "environment": "^1.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" }, "funding": { "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/log-symbols/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "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": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "restore-cursor": "^5.0.0" }, "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/log-symbols/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==", + "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", + "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==", "dev": true, + "license": "MIT", "dependencies": { - "color-name": "~1.1.4" + "get-east-asian-width": "^1.0.0" }, "engines": { - "node": ">=7.0.0" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/log-symbols/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "node_modules/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-symbols/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "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": ">=8" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/log-symbols/node_modules/supports-color": { + "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", + "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.2.1", + "is-fullwidth-code-point": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "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/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "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": { - "has-flag": "^4.0.0" + "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/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "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": { - "yallist": "^4.0.0" + "ansi-regex": "^6.0.1" }, "engines": { - "node": ">=10" + "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", + "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "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/lucene": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/lucene/-/lucene-2.1.1.tgz", "integrity": "sha512-l0qCX+pgXEZh/7sYQNG+vzhOIFRPjlJJkQ/irk9n7Ak3d+1MrU6F7IV31KILwFkUn153oLK8a2AIt48DzLdVPg==" }, "node_modules/magic-string": { - "version": "0.30.8", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", - "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", + "version": "0.30.11", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", + "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", "dev": true, + "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15" - }, - "engines": { - "node": ">=12" + "@jridgewell/sourcemap-codec": "^1.5.0" } }, "node_modules/make-dir": { @@ -13707,6 +13266,7 @@ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "pify": "^4.0.1", @@ -13721,6 +13281,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, + "license": "ISC", "optional": true, "bin": { "semver": "bin/semver" @@ -13731,6 +13292,7 @@ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", "dev": true, + "license": "ISC", "dependencies": { "@npmcli/agent": "^2.0.0", "cacache": "^18.0.0", @@ -13749,15 +13311,6 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/make-fetch-happen/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==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/marked": { "version": "12.0.2", "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.2.tgz", @@ -13774,20 +13327,29 @@ "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/memfs": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", - "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", + "version": "4.11.1", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.11.1.tgz", + "integrity": "sha512-LZcMTBAgqUUKNXZagcZxvXXfgF1bHX7Y7nQ0QyEiNbRJgE29GhgPd8Yna1VQcLlPiHt/5RFJMWYN9Uv/VPNvjQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "fs-monkey": "^1.0.4" + "@jsonjoy.com/json-pack": "^1.0.3", + "@jsonjoy.com/util": "^1.3.0", + "tree-dump": "^1.0.1", + "tslib": "^2.0.0" }, "engines": { "node": ">= 4.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" } }, "node_modules/merge-descriptors": { @@ -13795,6 +13357,7 @@ "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" } @@ -13803,13 +13366,13 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, "engines": { "node": ">= 8" } @@ -13819,18 +13382,19 @@ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", - "dev": true, + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "license": "MIT", "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" + "braces": "^3.0.3", + "picomatch": "^2.3.1" }, "engines": { "node": ">=8.6" @@ -13841,6 +13405,7 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true, + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -13852,7 +13417,6 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -13861,7 +13425,6 @@ "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, "dependencies": { "mime-db": "1.52.0" }, @@ -13873,16 +13436,29 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, "engines": { "node": ">=6" } }, + "node_modules/mimic-function": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", + "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/mini-css-extract-plugin": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz", - "integrity": "sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { "schema-utils": "^4.0.0", "tapable": "^2.2.1" @@ -13902,13 +13478,13 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", - "dev": true + "dev": true, + "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==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -13920,16 +13496,16 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/minipass": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.0.tgz", - "integrity": "sha512-oGZRv2OT1lO2UF1zUcwdTb3wqUwI0kBGTgt/T7OdSj6M6N5m3o5uPf0AIW6lVxGGoiWUR7e2AwTE+xiwK8WQig==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "dev": true, + "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } @@ -13939,6 +13515,7 @@ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^7.0.3" }, @@ -13951,6 +13528,7 @@ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", "dev": true, + "license": "MIT", "dependencies": { "minipass": "^7.0.3", "minipass-sized": "^1.0.3", @@ -13968,6 +13546,7 @@ "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -13980,28 +13559,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-json-stream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz", - "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==", - "dev": true, - "dependencies": { - "jsonparse": "^1.3.1", - "minipass": "^3.0.0" - } - }, - "node_modules/minipass-json-stream/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" }, @@ -14014,6 +13572,7 @@ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -14026,6 +13585,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -14038,6 +13598,7 @@ "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -14050,6 +13611,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -14062,6 +13624,7 @@ "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" @@ -14075,6 +13638,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -14087,6 +13651,7 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true, + "license": "MIT", "bin": { "mkdirp": "bin/cmd.js" }, @@ -14099,6 +13664,7 @@ "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz", "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" } @@ -14109,11 +13675,45 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/msgpackr": { + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.2.tgz", + "integrity": "sha512-F9UngXRlPyWCDEASDpTf6c9uNhGPTqnTeLVt7bN+bU1eajoR/8V9ys2BRaV5C/e5ihE6sJ9uPIKaYt6bFuO32g==", + "dev": true, + "license": "MIT", + "optionalDependencies": { + "msgpackr-extract": "^3.0.2" + } + }, + "node_modules/msgpackr-extract": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz", + "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "dependencies": { + "node-gyp-build-optional-packages": "5.2.2" + }, + "bin": { + "download-msgpackr-prebuilds": "bin/download-prebuilds.js" + }, + "optionalDependencies": { + "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3", + "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3", + "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3", + "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3", + "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3", + "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3" + } + }, "node_modules/multicast-dns": { "version": "7.2.5", "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", "dev": true, + "license": "MIT", "dependencies": { "dns-packet": "^5.2.2", "thunky": "^1.0.2" @@ -14127,6 +13727,7 @@ "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" } @@ -14142,6 +13743,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -14160,6 +13762,7 @@ "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz", "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "iconv-lite": "^0.6.3", @@ -14177,6 +13780,7 @@ "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" @@ -14190,6 +13794,7 @@ "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" } @@ -14198,7 +13803,8 @@ "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/ng2-charts": { "version": "6.0.1", @@ -14231,9 +13837,10 @@ } }, "node_modules/ngx-color-picker": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-16.0.0.tgz", - "integrity": "sha512-Dk2FvcbebD6STZSVzkI5oFHOlTrrNC5bOHh+YVaFgaWuWrVUdVIJm68ocUvTgr/qxTEJjrfcnRnS4wi7BJ2hKg==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-17.0.0.tgz", + "integrity": "sha512-kHuhW4vErpb0LlBlgTnf1+cYWdaq0gOvDwiX9LeaFKNvhV5li+YEyk7tC3o1Sbhqd4lsFKb8zHyqi1teLWN4Zg==", + "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, @@ -14244,15 +13851,16 @@ } }, "node_modules/ngx-device-detector": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/ngx-device-detector/-/ngx-device-detector-7.0.0.tgz", - "integrity": "sha512-6IQZLlB31wQecbFr/5YyBfoj9zXgLz/2UHHrslgBnWIzbgdnjfEYSiwqXiJlBC9wIxMvM/BLEIQlxnl3MseQ5g==", + "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==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/common": "^17.0.0", - "@angular/core": "^17.0.0" + "@angular/common": "^18.0.0", + "@angular/core": "^18.0.0" } }, "node_modules/ngx-markdown-editor": { @@ -14291,12 +13899,40 @@ "@angular/core": ">=13.0.0" } }, + "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==", + "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": { + "node": ">=18" + }, + "peerDependencies": { + "@angular/common": ">=16.0.0", + "@angular/core": ">=16.0.0", + "@use-gesture/vanilla": "^10.0.0", + "rxjs": "^6.0.0 || ^7.0.0" + }, + "peerDependenciesMeta": { + "@use-gesture/vanilla": { + "optional": true + } + } + }, "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" @@ -14306,27 +13942,37 @@ "node-gyp-build": "^4.2.2" } }, - "node_modules/node-addon-api": { + "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" + }, "node_modules/node-forge": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", "dev": true, + "license": "(BSD-3-Clause OR GPL-2.0)", "engines": { "node": ">= 6.13.0" } }, "node_modules/node-gyp": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz", - "integrity": "sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", + "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", "dev": true, + "license": "MIT", "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", @@ -14334,9 +13980,9 @@ "graceful-fs": "^4.2.6", "make-fetch-happen": "^13.0.0", "nopt": "^7.0.0", - "proc-log": "^3.0.0", + "proc-log": "^4.1.0", "semver": "^7.3.5", - "tar": "^6.1.2", + "tar": "^6.2.1", "which": "^4.0.0" }, "bin": { @@ -14347,10 +13993,11 @@ } }, "node_modules/node-gyp-build": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz", - "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz", + "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==", "dev": true, + "license": "MIT", "optional": true, "bin": { "node-gyp-build": "bin.js", @@ -14358,35 +14005,19 @@ "node-gyp-build-test": "build-test.js" } }, - "node_modules/node-gyp/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, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/node-gyp/node_modules/glob": { - "version": "10.3.12", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", - "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", + "node_modules/node-gyp-build-optional-packages": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz", + "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==", "dev": true, + "license": "MIT", "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.10.2" + "detect-libc": "^2.0.1" }, "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node-gyp-build-optional-packages": "bin.js", + "node-gyp-build-optional-packages-optional": "optional.js", + "node-gyp-build-optional-packages-test": "build-test.js" } }, "node_modules/node-gyp/node_modules/isexe": { @@ -14394,30 +14025,17 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=16" } }, - "node_modules/node-gyp/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "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==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^3.1.1" }, @@ -14432,19 +14050,21 @@ "version": "1.1.12", "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz", "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==", - "dev": true + "license": "MIT" }, "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", - "dev": true + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "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==", "dev": true, + "license": "ISC", "dependencies": { "abbrev": "^2.0.0" }, @@ -14456,13 +14076,13 @@ } }, "node_modules/normalize-package-data": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.1.tgz", - "integrity": "sha512-6rvCfeRW+OEZagAB4lMLSNuTNYZWLVtKccK79VSTf//yTY5VOCgcpH80O+bZK8Neps7pUnd5G+QlMg1yV/2iZQ==", + "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", - "is-core-module": "^2.8.1", "semver": "^7.3.5", "validate-npm-package-license": "^3.0.4" }, @@ -14475,6 +14095,7 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -14484,6 +14105,7 @@ "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -14493,6 +14115,7 @@ "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==", "dev": true, + "license": "ISC", "dependencies": { "npm-normalize-package-bin": "^3.0.0" }, @@ -14505,6 +14128,7 @@ "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "semver": "^7.1.1" }, @@ -14517,18 +14141,20 @@ "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", "dev": true, + "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/npm-package-arg": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz", - "integrity": "sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==", + "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==", "dev": true, + "license": "ISC", "dependencies": { "hosted-git-info": "^7.0.0", - "proc-log": "^3.0.0", + "proc-log": "^4.0.0", "semver": "^7.3.5", "validate-npm-package-name": "^5.0.0" }, @@ -14541,6 +14167,7 @@ "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz", "integrity": "sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==", "dev": true, + "license": "ISC", "dependencies": { "ignore-walk": "^6.0.4" }, @@ -14549,10 +14176,11 @@ } }, "node_modules/npm-pick-manifest": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz", - "integrity": "sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==", + "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==", "dev": true, + "license": "ISC", "dependencies": { "npm-install-checks": "^6.0.0", "npm-normalize-package-bin": "^3.0.0", @@ -14564,16 +14192,17 @@ } }, "node_modules/npm-registry-fetch": { - "version": "16.2.1", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.2.1.tgz", - "integrity": "sha512-8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz", + "integrity": "sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==", "dev": true, + "license": "ISC", "dependencies": { - "@npmcli/redact": "^1.1.0", + "@npmcli/redact": "^2.0.0", + "jsonparse": "^1.3.1", "make-fetch-happen": "^13.0.0", "minipass": "^7.0.2", "minipass-fetch": "^3.0.0", - "minipass-json-stream": "^1.0.1", "minizlib": "^2.1.2", "npm-package-arg": "^11.0.0", "proc-log": "^4.0.0" @@ -14582,20 +14211,10 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/npm-registry-fetch/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==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.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==", - "dev": true, "dependencies": { "path-key": "^3.0.0" }, @@ -14608,6 +14227,7 @@ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0" }, @@ -14616,40 +14236,38 @@ } }, "node_modules/nx": { - "version": "17.2.8", - "resolved": "https://registry.npmjs.org/nx/-/nx-17.2.8.tgz", - "integrity": "sha512-rM5zXbuXLEuqQqcjVjClyvHwRJwt+NVImR2A6KFNG40Z60HP6X12wAxxeLHF5kXXTDRU0PFhf/yACibrpbPrAw==", - "dev": true, + "version": "20.0.9", + "resolved": "https://registry.npmjs.org/nx/-/nx-20.0.9.tgz", + "integrity": "sha512-Asl7bg/Jp61FDqFrjXQpkIG/6lo3hpE+RfIldKV6dPxU3XjC4GyMHqRybEtzuIDiiUsvRvwovD4nSUUlBR6C/A==", "hasInstallScript": true, + "license": "MIT", "dependencies": { - "@nrwl/tao": "17.2.8", + "@napi-rs/wasm-runtime": "0.2.4", "@yarnpkg/lockfile": "^1.1.0", - "@yarnpkg/parsers": "3.0.0-rc.46", - "@zkochan/js-yaml": "0.0.6", - "axios": "^1.5.1", + "@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.3.1", - "dotenv-expand": "~10.0.0", + "dotenv": "~16.4.5", + "dotenv-expand": "~11.0.6", "enquirer": "~2.3.6", "figures": "3.2.0", "flat": "^5.0.2", - "fs-extra": "^11.1.0", - "glob": "7.1.4", + "front-matter": "^4.0.2", "ignore": "^5.0.4", "jest-diff": "^29.4.1", - "js-yaml": "4.1.0", "jsonc-parser": "3.2.0", - "lines-and-columns": "~2.0.3", - "minimatch": "3.0.5", + "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", - "semver": "7.5.3", + "ora": "5.3.0", + "semver": "^7.5.3", "string-width": "^4.2.3", - "strong-log-transformer": "^2.1.0", "tar-stream": "~2.2.0", "tmp": "~0.2.1", "tsconfig-paths": "^4.1.2", @@ -14662,19 +14280,19 @@ "nx-cloud": "bin/nx-cloud.js" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "17.2.8", - "@nx/nx-darwin-x64": "17.2.8", - "@nx/nx-freebsd-x64": "17.2.8", - "@nx/nx-linux-arm-gnueabihf": "17.2.8", - "@nx/nx-linux-arm64-gnu": "17.2.8", - "@nx/nx-linux-arm64-musl": "17.2.8", - "@nx/nx-linux-x64-gnu": "17.2.8", - "@nx/nx-linux-x64-musl": "17.2.8", - "@nx/nx-win32-arm64-msvc": "17.2.8", - "@nx/nx-win32-x64-msvc": "17.2.8" + "@nx/nx-darwin-arm64": "20.0.9", + "@nx/nx-darwin-x64": "20.0.9", + "@nx/nx-freebsd-x64": "20.0.9", + "@nx/nx-linux-arm-gnueabihf": "20.0.9", + "@nx/nx-linux-arm64-gnu": "20.0.9", + "@nx/nx-linux-arm64-musl": "20.0.9", + "@nx/nx-linux-x64-gnu": "20.0.9", + "@nx/nx-linux-x64-musl": "20.0.9", + "@nx/nx-win32-arm64-msvc": "20.0.9", + "@nx/nx-win32-x64-msvc": "20.0.9" }, "peerDependencies": { - "@swc-node/register": "^1.6.7", + "@swc-node/register": "^1.8.0", "@swc/core": "^1.3.85" }, "peerDependenciesMeta": { @@ -14686,128 +14304,63 @@ } } }, - "node_modules/nx/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/nx/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==", - "dev": true - }, - "node_modules/nx/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/nx/node_modules/color-convert": { + "node_modules/nx/node_modules/brace-expansion": { "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, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" + "balanced-match": "^1.0.0" } }, - "node_modules/nx/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "node_modules/nx/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==", + "license": "MIT" }, - "node_modules/nx/node_modules/glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", - "dev": true, + "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==", + "license": "ISC", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "brace-expansion": "^2.0.1" }, "engines": { - "node": "*" - } - }, - "node_modules/nx/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/nx/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, - "dependencies": { - "argparse": "^2.0.1" + "node": ">=16 || 14 >=14.17" }, - "bin": { - "js-yaml": "bin/js-yaml.js" + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/nx/node_modules/minimatch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", - "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", - "dev": true, + "node_modules/nx/node_modules/ora": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz", + "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==", + "license": "MIT", "dependencies": { - "brace-expansion": "^1.1.7" + "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": "*" - } - }, - "node_modules/nx/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" + "node": ">=10" }, - "engines": { - "node": ">=8" + "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==", - "dev": true, + "license": "MIT", "dependencies": { "json5": "^2.2.2", "minimist": "^1.2.6", @@ -14829,6 +14382,7 @@ "version": "1.13.2", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -14913,13 +14467,15 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/on-finished": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dev": true, + "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -14932,6 +14488,7 @@ "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -14939,8 +14496,8 @@ "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", "dependencies": { "wrappy": "1" } @@ -14949,7 +14506,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, "dependencies": { "mimic-fn": "^2.1.0" }, @@ -14964,7 +14520,7 @@ "version": "8.4.2", "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", - "dev": true, + "license": "MIT", "dependencies": { "define-lazy-prop": "^2.0.0", "is-docker": "^2.1.1", @@ -14999,6 +14555,7 @@ "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", "dev": true, + "license": "MIT", "dependencies": { "bl": "^4.1.0", "chalk": "^4.1.0", @@ -15008,119 +14565,75 @@ "is-unicode-supported": "^0.1.0", "log-symbols": "^4.1.0", "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ora/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/ora/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/ora/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/ora/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/ora/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/ora/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" + "wcwidth": "^1.0.1" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, + "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" + }, "node_modules/os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "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": { - "p-try": "^2.0.0" + "yocto-queue": "^1.0.0" }, "engines": { - "node": ">=6" + "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": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "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": "^2.2.0" + "p-limit": "^4.0.0" }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-map": { @@ -15128,6 +14641,7 @@ "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" }, @@ -15139,16 +14653,21 @@ } }, "node_modules/p-retry": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", - "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.0.tgz", + "integrity": "sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==", "dev": true, + "license": "MIT", "dependencies": { - "@types/retry": "0.12.0", + "@types/retry": "0.12.2", + "is-network-error": "^1.0.0", "retry": "^0.13.1" }, "engines": { - "node": ">=8" + "node": ">=16.17" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-retry/node_modules/retry": { @@ -15156,46 +14675,45 @@ "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "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==", "dev": true, - "engines": { - "node": ">=6" - } + "license": "BlueOak-1.0.0" }, "node_modules/pacote": { - "version": "17.0.6", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-17.0.6.tgz", - "integrity": "sha512-cJKrW21VRE8vVTRskJo78c/RCvwJCn1f4qgfxL4w77SOWrTCRcmfkYHlHtS0gqpgjv3zhXflRtgsrUCX5xwNnQ==", + "version": "18.0.6", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-18.0.6.tgz", + "integrity": "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==", "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": "^7.0.0", + "@npmcli/run-script": "^8.0.0", "cacache": "^18.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": "^16.0.0", - "proc-log": "^3.0.0", + "npm-registry-fetch": "^17.0.0", + "proc-log": "^4.0.0", "promise-retry": "^2.0.1", - "read-package-json": "^7.0.0", - "read-package-json-fast": "^3.0.0", "sigstore": "^2.2.0", "ssri": "^10.0.0", "tar": "^6.1.11" }, "bin": { - "pacote": "lib/bin.js" + "pacote": "bin/index.js" }, "engines": { "node": "^16.14.0 || >=18.0.0" @@ -15213,11 +14731,26 @@ "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==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "es-module-lexer": "^1.5.3", + "slashes": "^3.0.12" + }, + "engines": { + "node": ">= 18" + } + }, "node_modules/parse-json": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -15235,19 +14768,22 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true + "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 + "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", "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.10" } @@ -15269,6 +14805,7 @@ "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz", "integrity": "sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg==", "dev": true, + "license": "MIT", "dependencies": { "entities": "^4.3.0", "parse5": "^7.0.0", @@ -15279,10 +14816,11 @@ } }, "node_modules/parse5-html-rewriting-stream/node_modules/entities": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz", - "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -15295,6 +14833,7 @@ "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz", "integrity": "sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==", "dev": true, + "license": "MIT", "dependencies": { "parse5": "^7.0.0" }, @@ -15319,10 +14858,17 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true, + "license": "MIT", "engines": { "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", @@ -15332,20 +14878,10 @@ "node": ">=8" } }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, "engines": { "node": ">=8" } @@ -15357,56 +14893,40 @@ "dev": true }, "node_modules/path-scurry": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz", - "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "dev": true, + "license": "BlueOak-1.0.0", "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": ">=16 || 14 >=14.18" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", - "dev": true, - "engines": { - "node": "14 || >=16.14" - } - }, "node_modules/path-to-regexp": { "version": "0.1.10", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", - "dev": true - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true, - "engines": { - "node": ">=8" - } + "license": "MIT" }, "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "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==", - "dev": true, "engines": { "node": ">=8.6" }, @@ -15419,16 +14939,18 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=6" } }, "node_modules/piscina": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.4.0.tgz", - "integrity": "sha512-+AQduEJefrOApE4bV7KRmp3N2JnnyErlVqq4P/jmko4FPz9Z877BCccl/iB3FdrWSUkvbGV9Kan/KllJgat3Vg==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.6.1.tgz", + "integrity": "sha512-z30AwWGtQE+Apr+2WBZensP2lIvwoaMcOPkQlIEmSGMJNUvaYACylPYrQM6wSdUNJlnDVMSpLv7xTMJqlVshOA==", "dev": true, + "license": "MIT", "optionalDependencies": { "nice-napi": "^1.0.2" } @@ -15438,6 +14960,7 @@ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz", "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==", "dev": true, + "license": "MIT", "dependencies": { "find-up": "^6.3.0" }, @@ -15448,92 +14971,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "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, - "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, - "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, - "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, - "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, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, - "node_modules/pkg-dir/node_modules/yocto-queue": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", - "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", - "dev": true, - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/postcss": { - "version": "8.4.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", - "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==", + "version": "8.4.41", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz", + "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==", "dev": true, "funding": [ { @@ -15549,10 +14990,11 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "nanoid": "^3.3.7", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "picocolors": "^1.0.1", + "source-map-js": "^1.2.0" }, "engines": { "node": "^10 || ^12 || >=14" @@ -15563,6 +15005,7 @@ "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz", "integrity": "sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==", "dev": true, + "license": "MIT", "dependencies": { "cosmiconfig": "^9.0.0", "jiti": "^1.20.0", @@ -15589,32 +15032,19 @@ } } }, - "node_modules/postcss-loader/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/postcss-media-query-parser": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/postcss-modules-extract-imports": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz", "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==", "dev": true, + "license": "ISC", "engines": { "node": "^10 || ^12 || >= 14" }, @@ -15627,6 +15057,7 @@ "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", "dev": true, + "license": "MIT", "dependencies": { "icss-utils": "^5.0.0", "postcss-selector-parser": "^6.0.2", @@ -15644,6 +15075,7 @@ "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", "dev": true, + "license": "ISC", "dependencies": { "postcss-selector-parser": "^6.0.4" }, @@ -15659,6 +15091,7 @@ "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", "dev": true, + "license": "ISC", "dependencies": { "icss-utils": "^5.0.0" }, @@ -15670,10 +15103,11 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.16", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz", - "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==", + "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==", "dev": true, + "license": "MIT", "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -15686,7 +15120,8 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/prelude-ls": { "version": "1.2.1", @@ -15701,7 +15136,7 @@ "version": "29.7.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", - "dev": true, + "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", @@ -15715,7 +15150,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -15729,25 +15164,27 @@ "integrity": "sha512-jK3Et9UzwzTsd6tzl2RmwrVY/b8raJ3QZLzoDACj+oTJ0oX7L9Hy+XnVwgo4QVKlKpnP/Ur13SXV/pVh4LzaDw==" }, "node_modules/primeng": { - "version": "17.16.0", - "resolved": "https://registry.npmjs.org/primeng/-/primeng-17.16.0.tgz", - "integrity": "sha512-9DJYBMvI+BI/EdOxFCrbqTjpt2pV2XqCD8o5fVKLRCSFeLRCbxJMuU/VbWyeccWBSHd6zxmaWJ8MdPvO2+5QtQ==", + "version": "17.18.9", + "resolved": "https://registry.npmjs.org/primeng/-/primeng-17.18.9.tgz", + "integrity": "sha512-1FT0B8wtgvs/joduB1DDOLe2IsP1pegOiEfSPAHSbc6otgNx/6iLR0k2M/xr2c9Ur1aC7tAikkVfH3FGpWof3w==", + "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^17.0.0", - "@angular/core": "^17.0.0", - "@angular/forms": "^17.0.0", + "@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" } }, "node_modules/proc-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", - "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", + "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==", "dev": true, + "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -15756,19 +15193,22 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true + "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 + "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", "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", "dev": true, + "license": "MIT", "dependencies": { "err-code": "^2.0.2", "retry": "^0.12.0" @@ -15782,6 +15222,7 @@ "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "dev": true, + "license": "MIT", "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -15795,6 +15236,7 @@ "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" } @@ -15803,13 +15245,14 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true + "license": "MIT" }, "node_modules/prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/punycode": { @@ -15825,6 +15268,7 @@ "version": "6.13.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.6" }, @@ -15839,7 +15283,6 @@ "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", @@ -15860,6 +15303,7 @@ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" } @@ -15868,120 +15312,48 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "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, - "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/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.2.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", - "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", - "dev": true - }, - "node_modules/read-package-json": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.1.tgz", - "integrity": "sha512-8PcDiZ8DXUjLf687Ol4BR8Bpm2umR7vhoZOzNRt+uxD9GpBh/K+CAAALVIiYFknmvlmyg7hM7BSNUXPaCCqd0Q==", - "dev": true, - "dependencies": { - "glob": "^10.2.2", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/read-package-json-fast": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", - "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", - "dev": true, - "dependencies": { - "json-parse-even-better-errors": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json/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, - "dependencies": { - "balanced-match": "^1.0.0" + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" } }, - "node_modules/read-package-json/node_modules/glob": { - "version": "10.3.12", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", - "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", + "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": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.10.2" - }, - "bin": { - "glob": "dist/esm/bin.mjs" + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" }, "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">= 0.8" } }, - "node_modules/read-package-json/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "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, - "dependencies": { - "brace-expansion": "^2.0.1" - }, + "license": "MIT", "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "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==", + "license": "MIT" + }, "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==", - "dev": true, "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -15996,6 +15368,7 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -16007,19 +15380,22 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/regenerate": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", - "dev": true + "dev": true, + "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==", "dev": true, + "license": "MIT", "dependencies": { "regenerate": "^1.4.2" }, @@ -16031,22 +15407,25 @@ "version": "0.14.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", - "dev": true + "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.2.11", - "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz", - "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==", - "dev": true + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz", + "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==", + "dev": true, + "license": "MIT" }, "node_modules/regexp.prototype.flags": { "version": "1.5.1", @@ -16070,6 +15449,7 @@ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/regjsgen": "^0.8.0", "regenerate": "^1.4.2", @@ -16087,6 +15467,7 @@ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "jsesc": "~0.5.0" }, @@ -16107,7 +15488,6 @@ "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, "engines": { "node": ">=0.10.0" } @@ -16117,6 +15497,7 @@ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -16125,7 +15506,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/resolve": { "version": "1.22.8", @@ -16144,20 +15526,12 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/resolve-url-loader": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz", "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==", "dev": true, + "license": "MIT", "dependencies": { "adjust-sourcemap-loader": "^4.0.0", "convert-source-map": "^1.7.0", @@ -16169,11 +15543,19 @@ "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", "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, + "license": "MIT", "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -16188,6 +15570,7 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -16196,7 +15579,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -16210,6 +15592,7 @@ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } @@ -16218,12 +15601,18 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" } }, + "node_modules/rfdc": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", + "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", + "dev": true, + "license": "MIT" + }, "node_modules/rgb-hex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-3.0.0.tgz", @@ -16233,15 +15622,16 @@ } }, "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "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": "^7.1.3" + "glob": "^10.3.7" }, "bin": { - "rimraf": "bin.js" + "rimraf": "dist/esm/bin.mjs" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -16252,6 +15642,7 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz", "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==", "dev": true, + "license": "MIT", "dependencies": { "@types/estree": "1.0.5" }, @@ -16282,20 +15673,23 @@ "fsevents": "~2.3.2" } }, - "node_modules/run-async": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz", - "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==", + "node_modules/run-applescript": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz", + "integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==", "dev": true, + "license": "MIT", "engines": { - "node": ">=0.12.0" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/run-parallel": { "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", @@ -16358,7 +15752,8 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/safe-regex-test": { "version": "1.0.0", @@ -16378,18 +15773,15 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "node_modules/safevalues": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/safevalues/-/safevalues-0.3.4.tgz", - "integrity": "sha512-LRneZZRXNgjzwG4bDQdOTSbze3fHm1EAKN/8bePxnlEZiBmkYEDggaHbuvHI9/hoqHbGfsEA7tWS9GhYHZBBsw==" + "dev": true, + "license": "MIT" }, "node_modules/sass": { - "version": "1.71.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz", - "integrity": "sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==", + "version": "1.77.6", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz", + "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==", "dev": true, + "license": "MIT", "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -16403,10 +15795,11 @@ } }, "node_modules/sass-loader": { - "version": "14.1.1", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.1.1.tgz", - "integrity": "sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw==", + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.0.tgz", + "integrity": "sha512-n13Z+3rU9A177dk4888czcVFiC8CL9dii4qpXWUg3YIIgZEvi9TCFKjOQcbK0kJM7DJu9VucrZFddvNfYCPwtw==", "dev": true, + "license": "MIT", "dependencies": { "neo-async": "^2.6.2" }, @@ -16443,22 +15836,24 @@ } }, "node_modules/sax": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz", - "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", + "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==", "dev": true, + "license": "ISC", "optional": true }, "node_modules/schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", + "ajv": "^8.9.0", "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" + "ajv-keywords": "^5.1.0" }, "engines": { "node": ">= 12.13.0" @@ -16468,18 +15863,39 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/schema-utils/node_modules/ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, "node_modules/select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/selfsigned": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz", - "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz", + "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==", "dev": true, + "license": "MIT", "dependencies": { + "@types/node-forge": "^1.3.0", "node-forge": "^1" }, "engines": { @@ -16487,13 +15903,10 @@ } }, "node_modules/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -16506,6 +15919,7 @@ "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", @@ -16530,6 +15944,7 @@ "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" } @@ -16538,13 +15953,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "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" } @@ -16553,13 +15970,15 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/serialize-javascript": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", - "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -16569,6 +15988,7 @@ "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==", "dev": true, + "license": "MIT", "dependencies": { "accepts": "~1.3.4", "batch": "0.6.1", @@ -16587,6 +16007,7 @@ "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" } @@ -16596,6 +16017,7 @@ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -16605,6 +16027,7 @@ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", "dev": true, + "license": "MIT", "dependencies": { "depd": "~1.1.2", "inherits": "2.0.3", @@ -16619,25 +16042,29 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/serve-index/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/serve-index/node_modules/setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/serve-index/node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -16647,6 +16074,7 @@ "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", @@ -16661,6 +16089,7 @@ "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==", + "license": "MIT", "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -16691,13 +16120,15 @@ "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", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, + "license": "MIT", "dependencies": { "kind-of": "^6.0.2" }, @@ -16731,6 +16162,7 @@ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -16739,6 +16171,7 @@ "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==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "es-errors": "^1.3.0", @@ -16755,33 +16188,74 @@ "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 + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "node_modules/sigstore": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.0.tgz", - "integrity": "sha512-q+o8L2ebiWD1AxD17eglf1pFrl9jtW7FHa0ygqY6EKvibK8JHyq9Z26v9MZXeDiw+RbfOJ9j2v70M10Hd6E06A==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz", + "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@sigstore/bundle": "^2.3.1", + "@sigstore/bundle": "^2.3.2", "@sigstore/core": "^1.0.0", - "@sigstore/protobuf-specs": "^0.3.1", - "@sigstore/sign": "^2.3.0", - "@sigstore/tuf": "^2.3.1", - "@sigstore/verify": "^1.2.0" + "@sigstore/protobuf-specs": "^0.3.2", + "@sigstore/sign": "^2.3.2", + "@sigstore/tuf": "^2.3.4", + "@sigstore/verify": "^1.2.1" }, "engines": { "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "node_modules/slashes": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz", + "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==", + "dev": true, + "license": "ISC" + }, + "node_modules/slice-ansi": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", + "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.0.0", + "is-fullwidth-code-point": "^4.0.0" + }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/slice-ansi/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "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": { @@ -16789,6 +16263,7 @@ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6.0.0", "npm": ">= 3.0.0" @@ -16799,6 +16274,7 @@ "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", "dev": true, + "license": "MIT", "dependencies": { "faye-websocket": "^0.11.3", "uuid": "^8.3.2", @@ -16810,6 +16286,7 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "dev": true, + "license": "MIT", "bin": { "uuid": "dist/bin/uuid" } @@ -16819,6 +16296,7 @@ "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", "dev": true, + "license": "MIT", "dependencies": { "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" @@ -16829,14 +16307,15 @@ } }, "node_modules/socks-proxy-agent": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz", - "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==", + "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==", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "^7.1.1", "debug": "^4.3.4", - "socks": "^2.7.1" + "socks": "^2.8.3" }, "engines": { "node": ">= 14" @@ -16847,15 +16326,17 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">= 8" } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.1", + "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" } @@ -16865,6 +16346,7 @@ "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-5.0.0.tgz", "integrity": "sha512-k2Dur7CbSLcAH73sBcIkV5xjPV4SzqO1NJ7+XaQl8if3VODDUj3FNchNGpqgJSKbvUfJuhVdv8K2Eu8/TNl2eA==", "dev": true, + "license": "MIT", "dependencies": { "iconv-lite": "^0.6.3", "source-map-js": "^1.0.2" @@ -16885,6 +16367,7 @@ "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" }, @@ -16897,6 +16380,7 @@ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dev": true, + "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -16907,6 +16391,7 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -16916,6 +16401,7 @@ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -16932,6 +16418,7 @@ "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" @@ -16948,6 +16435,7 @@ "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.1.0", "handle-thing": "^2.0.0", @@ -16964,6 +16452,7 @@ "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.1.0", "detect-node": "^2.0.4", @@ -16977,13 +16466,15 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "dev": true + "dev": true, + "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==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^7.0.3" }, @@ -16996,6 +16487,7 @@ "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" } @@ -17004,7 +16496,6 @@ "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, "dependencies": { "safe-buffer": "~5.1.0" } @@ -17012,8 +16503,7 @@ "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==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/string-to-color": { "version": "2.2.2", @@ -17032,7 +16522,6 @@ "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, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -17048,6 +16537,7 @@ "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", @@ -17106,7 +16596,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -17120,6 +16609,7 @@ "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" }, @@ -17132,6 +16622,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -17140,7 +16631,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -17149,7 +16639,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true, "engines": { "node": ">=4" } @@ -17159,6 +16648,7 @@ "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" } @@ -17178,35 +16668,19 @@ "node_modules/strnum": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" - }, - "node_modules/strong-log-transformer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", - "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==", - "dev": true, - "dependencies": { - "duplexer": "^0.1.1", - "minimist": "^1.2.0", - "through": "^2.3.4" - }, - "bin": { - "sl-log-transformer": "bin/sl-log-transformer.js" - }, - "engines": { - "node": ">=4" - } + "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==", + "license": "MIT" }, "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, + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", "dependencies": { - "has-flag": "^3.0.0" + "has-flag": "^4.0.0" }, "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/supports-preserve-symlinks-flag": { @@ -17226,10 +16700,28 @@ "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==", "dev": true, + "license": "MIT", "engines": { "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", @@ -17243,6 +16735,7 @@ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -17252,6 +16745,7 @@ "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dev": true, + "license": "ISC", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -17268,7 +16762,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, + "license": "MIT", "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", @@ -17285,6 +16779,7 @@ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -17297,6 +16792,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -17309,15 +16805,17 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=8" } }, "node_modules/terser": { - "version": "5.29.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.1.tgz", - "integrity": "sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==", + "version": "5.31.6", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz", + "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", @@ -17336,6 +16834,7 @@ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.20", "jest-worker": "^27.4.5", @@ -17370,6 +16869,7 @@ "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", @@ -17386,6 +16886,7 @@ "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" } @@ -17394,13 +16895,15 @@ "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 + "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", @@ -17414,43 +16917,37 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "dependencies": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true + "node_modules/thingies": { + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz", + "integrity": "sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==", + "dev": true, + "license": "Unlicense", + "engines": { + "node": ">=10.18" + }, + "peerDependencies": { + "tslib": "^2" + } }, "node_modules/thunky": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", - "dev": true + "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==", - "dev": true, + "license": "MIT", "engines": { "node": ">=14.14" } @@ -17458,8 +16955,9 @@ "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": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -17468,7 +16966,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -17481,15 +16979,34 @@ "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" } }, + "node_modules/tree-dump": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.2.tgz", + "integrity": "sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, "node_modules/tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", "dev": true, + "license": "MIT", "bin": { "tree-kill": "cli.js" } @@ -17499,6 +17016,7 @@ "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=16" }, @@ -17506,6 +17024,16 @@ "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" + } + }, "node_modules/tsconfig-paths": { "version": "3.15.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", @@ -17531,54 +17059,17 @@ } }, "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, - "node_modules/tsutils-etc": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/tsutils-etc/-/tsutils-etc-1.4.2.tgz", - "integrity": "sha512-2Dn5SxTDOu6YWDNKcx1xu2YUy6PUeKrWZB/x2cQ8vY2+iz3JRembKn/iZ0JLT1ZudGNwQQvtFX9AwvRHbXuPUg==", - "dev": true, - "dependencies": { - "@types/yargs": "^17.0.0", - "yargs": "^17.0.0" - }, - "bin": { - "ts-flags": "bin/ts-flags", - "ts-kind": "bin/ts-kind" - }, - "peerDependencies": { - "tsutils": "^3.0.0", - "typescript": ">=4.0.0" - } - }, - "node_modules/tsutils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "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==", "dev": true, + "license": "MIT", "dependencies": { "@tufjs/models": "2.0.1", "debug": "^4.3.4", @@ -17605,6 +17096,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -17617,6 +17109,7 @@ "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" @@ -17691,22 +17184,48 @@ } }, "node_modules/typed-assert": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.8.tgz", - "integrity": "sha512-5NkbXZUlmCE73Fs7gvkp1XXJWHYetPkg60QnQ2NXQmBYNFxbBr2zA8GCtaH4K2s2WhOmSlgiSTmrjrcm5tnM5g==", - "dev": true + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz", + "integrity": "sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==", + "dev": true, + "license": "MIT" }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=14.17" + "node": ">=14.17" + } + }, + "node_modules/typescript-eslint": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.4.0.tgz", + "integrity": "sha512-67qoc3zQZe3CAkO0ua17+7aCLI0dU+sSQd1eKPGq06QE4rfQjstVXR6woHO5qQvGUa550NfGckT4tzh3b3c8Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/eslint-plugin": "8.4.0", + "@typescript-eslint/parser": "8.4.0", + "@typescript-eslint/utils": "8.4.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/unbox-primitive": { @@ -17724,26 +17243,19 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/undici": { - "version": "6.11.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.11.1.tgz", - "integrity": "sha512-KyhzaLJnV1qa3BSHdj4AZ2ndqI0QWPxYzaIOio0WzcEJB9gvuysprJSLtpvc2D9mhR9jPDUk7xlJlZbH2KR5iw==", - "dev": true, - "engines": { - "node": ">=18.0" - } - }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "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==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -17753,6 +17265,7 @@ "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", "dev": true, + "license": "MIT", "dependencies": { "unicode-canonical-property-names-ecmascript": "^2.0.0", "unicode-property-aliases-ecmascript": "^2.0.0" @@ -17766,6 +17279,7 @@ "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==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -17775,15 +17289,30 @@ "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, + "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==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "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==", "dev": true, + "license": "ISC", "dependencies": { "unique-slug": "^4.0.0" }, @@ -17796,6 +17325,7 @@ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", "dev": true, + "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4" }, @@ -17803,28 +17333,20 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/unpipe": { "version": "1.0.0", "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.0.13", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", + "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", "dev": true, "funding": [ { @@ -17840,9 +17362,10 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" + "escalade": "^3.1.2", + "picocolors": "^1.0.1" }, "bin": { "update-browserslist-db": "cli.js" @@ -17861,12 +17384,16 @@ } }, "node_modules/url": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz", - "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==", + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz", + "integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==", + "license": "MIT", "dependencies": { "punycode": "^1.4.1", - "qs": "^6.11.2" + "qs": "^6.12.3" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/url/node_modules/punycode": { @@ -17877,26 +17404,27 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4.0" } }, "node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], + "license": "MIT", "bin": { "uuid": "dist/bin/uuid" } @@ -17906,6 +17434,7 @@ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, + "license": "Apache-2.0", "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -17916,6 +17445,7 @@ "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", "dev": true, + "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -17925,19 +17455,21 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/vite": { - "version": "5.1.7", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.7.tgz", - "integrity": "sha512-sgnEEFTZYMui/sTlH1/XEnVNHMujOahPLGMxn1+5sIT45Xjng1Ec1K78jRP15dSmVgg5WBin9yO81j3o9OxofA==", + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz", + "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==", "dev": true, + "license": "MIT", "dependencies": { - "esbuild": "^0.19.3", - "postcss": "^8.4.35", - "rollup": "^4.2.0" + "esbuild": "^0.21.3", + "postcss": "^8.4.43", + "rollup": "^4.20.0" }, "bin": { "vite": "bin/vite.js" @@ -17956,6 +17488,7 @@ "less": "*", "lightningcss": "^1.21.0", "sass": "*", + "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.4.0" @@ -17973,6 +17506,9 @@ "sass": { "optional": true }, + "sass-embedded": { + "optional": true + }, "stylus": { "optional": true }, @@ -17985,13 +17521,14 @@ } }, "node_modules/vite/node_modules/@esbuild/aix-ppc64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz", - "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==", + "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" @@ -18001,13 +17538,14 @@ } }, "node_modules/vite/node_modules/@esbuild/android-arm": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz", - "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==", + "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" @@ -18017,13 +17555,14 @@ } }, "node_modules/vite/node_modules/@esbuild/android-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz", - "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==", + "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" @@ -18033,13 +17572,14 @@ } }, "node_modules/vite/node_modules/@esbuild/android-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz", - "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==", + "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" @@ -18049,13 +17589,14 @@ } }, "node_modules/vite/node_modules/@esbuild/darwin-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz", - "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==", + "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" @@ -18065,13 +17606,14 @@ } }, "node_modules/vite/node_modules/@esbuild/darwin-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz", - "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==", + "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" @@ -18081,13 +17623,14 @@ } }, "node_modules/vite/node_modules/@esbuild/freebsd-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz", - "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==", + "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" @@ -18097,13 +17640,14 @@ } }, "node_modules/vite/node_modules/@esbuild/freebsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz", - "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==", + "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" @@ -18113,13 +17657,14 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-arm": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz", - "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==", + "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" @@ -18129,13 +17674,14 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz", - "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==", + "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" @@ -18145,13 +17691,14 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-ia32": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz", - "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==", + "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" @@ -18161,13 +17708,14 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-loong64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz", - "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==", + "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" @@ -18177,13 +17725,14 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-mips64el": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz", - "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==", + "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" @@ -18193,13 +17742,14 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-ppc64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz", - "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==", + "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" @@ -18209,13 +17759,14 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-riscv64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz", - "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==", + "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" @@ -18225,13 +17776,14 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-s390x": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz", - "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==", + "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" @@ -18241,13 +17793,14 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz", - "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==", + "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" @@ -18257,13 +17810,14 @@ } }, "node_modules/vite/node_modules/@esbuild/netbsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz", - "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==", + "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" @@ -18273,13 +17827,14 @@ } }, "node_modules/vite/node_modules/@esbuild/openbsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz", - "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==", + "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" @@ -18289,13 +17844,14 @@ } }, "node_modules/vite/node_modules/@esbuild/sunos-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz", - "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==", + "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" @@ -18305,13 +17861,14 @@ } }, "node_modules/vite/node_modules/@esbuild/win32-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz", - "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==", + "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" @@ -18321,13 +17878,14 @@ } }, "node_modules/vite/node_modules/@esbuild/win32-ia32": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz", - "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==", + "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" @@ -18337,13 +17895,14 @@ } }, "node_modules/vite/node_modules/@esbuild/win32-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz", - "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==", + "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" @@ -18353,11 +17912,12 @@ } }, "node_modules/vite/node_modules/esbuild": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", - "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==", + "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" }, @@ -18365,36 +17925,66 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.19.12", - "@esbuild/android-arm": "0.19.12", - "@esbuild/android-arm64": "0.19.12", - "@esbuild/android-x64": "0.19.12", - "@esbuild/darwin-arm64": "0.19.12", - "@esbuild/darwin-x64": "0.19.12", - "@esbuild/freebsd-arm64": "0.19.12", - "@esbuild/freebsd-x64": "0.19.12", - "@esbuild/linux-arm": "0.19.12", - "@esbuild/linux-arm64": "0.19.12", - "@esbuild/linux-ia32": "0.19.12", - "@esbuild/linux-loong64": "0.19.12", - "@esbuild/linux-mips64el": "0.19.12", - "@esbuild/linux-ppc64": "0.19.12", - "@esbuild/linux-riscv64": "0.19.12", - "@esbuild/linux-s390x": "0.19.12", - "@esbuild/linux-x64": "0.19.12", - "@esbuild/netbsd-x64": "0.19.12", - "@esbuild/openbsd-x64": "0.19.12", - "@esbuild/sunos-x64": "0.19.12", - "@esbuild/win32-arm64": "0.19.12", - "@esbuild/win32-ia32": "0.19.12", - "@esbuild/win32-x64": "0.19.12" + "@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.47", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", + "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.7", + "picocolors": "^1.1.0", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" } }, "node_modules/watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz", + "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==", "dev": true, + "license": "MIT", "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -18408,6 +17998,7 @@ "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, + "license": "MIT", "dependencies": { "minimalistic-assert": "^1.0.0" } @@ -18416,32 +18007,38 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "dev": true, "dependencies": { "defaults": "^1.0.3" } }, + "node_modules/weak-lru-cache": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz", + "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==", + "dev": true, + "license": "MIT" + }, "node_modules/webpack": { - "version": "5.90.3", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz", - "integrity": "sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==", + "version": "5.94.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", + "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", "dev": true, + "license": "MIT", "dependencies": { - "@types/eslint-scope": "^3.7.3", "@types/estree": "^1.0.5", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", + "acorn-import-attributes": "^1.9.5", "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", + "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", @@ -18449,7 +18046,7 @@ "schema-utils": "^3.2.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.3.10", - "watchpack": "^2.4.0", + "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, "bin": { @@ -18469,19 +18066,21 @@ } }, "node_modules/webpack-dev-middleware": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.2.tgz", - "integrity": "sha512-Wu+EHmX326YPYUpQLKmKbTyZZJIB8/n6R09pTmB03kJmnMsVPTo9COzHZFr01txwaCAuZvfBJE4ZCHRcKs5JaQ==", + "version": "7.4.2", + "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": "^3.4.12", + "memfs": "^4.6.0", "mime-types": "^2.1.31", + "on-finished": "^2.4.1", "range-parser": "^1.2.1", "schema-utils": "^4.0.0" }, "engines": { - "node": ">= 14.15.0" + "node": ">= 18.12.0" }, "funding": { "type": "opencollective", @@ -18497,54 +18096,55 @@ } }, "node_modules/webpack-dev-server": { - "version": "4.15.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", - "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", - "dev": true, - "dependencies": { - "@types/bonjour": "^3.5.9", - "@types/connect-history-api-fallback": "^1.3.5", - "@types/express": "^4.17.13", - "@types/serve-index": "^1.9.1", - "@types/serve-static": "^1.13.10", - "@types/sockjs": "^0.3.33", - "@types/ws": "^8.5.5", + "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==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/bonjour": "^3.5.13", + "@types/connect-history-api-fallback": "^1.5.4", + "@types/express": "^4.17.21", + "@types/serve-index": "^1.9.4", + "@types/serve-static": "^1.15.5", + "@types/sockjs": "^0.3.36", + "@types/ws": "^8.5.10", "ansi-html-community": "^0.0.8", - "bonjour-service": "^1.0.11", - "chokidar": "^3.5.3", + "bonjour-service": "^1.2.1", + "chokidar": "^3.6.0", "colorette": "^2.0.10", "compression": "^1.7.4", "connect-history-api-fallback": "^2.0.0", "default-gateway": "^6.0.3", "express": "^4.17.3", "graceful-fs": "^4.2.6", - "html-entities": "^2.3.2", + "html-entities": "^2.4.0", "http-proxy-middleware": "^2.0.3", - "ipaddr.js": "^2.0.1", - "launch-editor": "^2.6.0", - "open": "^8.0.9", - "p-retry": "^4.5.0", - "rimraf": "^3.0.2", - "schema-utils": "^4.0.0", - "selfsigned": "^2.1.1", + "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": "^5.3.1", - "ws": "^8.13.0" + "webpack-dev-middleware": "^7.1.0", + "ws": "^8.16.0" }, "bin": { "webpack-dev-server": "bin/webpack-dev-server.js" }, "engines": { - "node": ">= 12.13.0" + "node": ">= 18.12.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^4.37.0 || ^5.0.0" + "webpack": "^5.0.0" }, "peerDependenciesMeta": { "webpack": { @@ -18555,62 +18155,92 @@ } } }, - "node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": { - "version": "5.3.4", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", - "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", + "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==", "dev": true, - "dependencies": { - "colorette": "^2.0.10", - "memfs": "^3.4.3", - "mime-types": "^2.1.31", - "range-parser": "^1.2.1", - "schema-utils": "^4.0.0" - }, + "license": "MIT", "engines": { - "node": ">= 12.13.0" + "node": ">=12" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^4.0.0 || ^5.0.0" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/webpack-dev-server/node_modules/ws": { - "version": "8.14.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", - "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "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==", "dev": true, + "license": "MIT", + "dependencies": { + "@types/http-proxy": "^1.17.8", + "http-proxy": "^1.18.1", + "is-glob": "^4.0.1", + "is-plain-obj": "^3.0.0", + "micromatch": "^4.0.2" + }, "engines": { - "node": ">=10.0.0" + "node": ">=12.0.0" }, "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" + "@types/express": "^4.17.13" }, "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { + "@types/express": { "optional": true } } }, + "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==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-inside-container": "^1.0.0" + }, + "engines": { + "node": ">=16" + }, + "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==", + "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/webpack-merge": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz", - "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz", + "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==", "dev": true, + "license": "MIT", "dependencies": { "clone-deep": "^4.0.1", "flat": "^5.0.2", - "wildcard": "^2.0.0" + "wildcard": "^2.0.1" }, "engines": { - "node": ">=10.0.0" + "node": ">=18.0.0" } }, "node_modules/webpack-sources": { @@ -18618,6 +18248,7 @@ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.13.0" } @@ -18627,6 +18258,7 @@ "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz", "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==", "dev": true, + "license": "MIT", "dependencies": { "typed-assert": "^1.0.8" }, @@ -18648,6 +18280,7 @@ "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", @@ -18664,27 +18297,55 @@ "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", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/webpack/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, "node_modules/webpack/node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true + "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==", - "dev": true + "dev": true, + "license": "MIT" }, "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==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -18703,6 +18364,7 @@ "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "http-parser-js": ">=0.5.1", "safe-buffer": ">=5.1.0", @@ -18717,6 +18379,7 @@ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=0.8.0" } @@ -18775,13 +18438,13 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", - "dev": true + "dev": true, + "license": "MIT" }, "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, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -18800,6 +18463,7 @@ "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", @@ -18812,78 +18476,34 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/ws": { + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, + "license": "MIT", "engines": { - "node": ">=8" + "node": ">=10.0.0" }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" }, - "engines": { - "node": ">=7.0.0" + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } } }, - "node_modules/wrap-ansi/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, "node_modules/xhr2": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz", @@ -18896,7 +18516,6 @@ "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, "engines": { "node": ">=10" } @@ -18905,13 +18524,13 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/yargs": { "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -18929,7 +18548,6 @@ "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, "engines": { "node": ">=12" } @@ -18946,13 +18564,24 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/zone.js": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.5.tgz", - "integrity": "sha512-9XYWZzY6PhHOSdkYryNcMm7L8EK7a4q+GbTvxbIA2a9lMdRUpGuyaYvLDcg8D6bdn+JomSsbPcilVKg6SmUx6w==", - "dependencies": { - "tslib": "^2.3.0" + "node_modules/yoctocolors-cjs": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz", + "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } + }, + "node_modules/zone.js": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.0.tgz", + "integrity": "sha512-9oxn0IIjbCZkJ67L+LkhYWRyAy7axphb3VgE2MBDlOqnmHMPWGYMxJxBYFueFq/JGY2GMwS0rU+UCLunEmy5UA==", + "license": "MIT" } } } diff --git a/package.json b/package.json index 74370975..bd47d23f 100644 --- a/package.json +++ b/package.json @@ -1,119 +1,117 @@ { "name": "clearml-webapp", - "version": "1.16.0", + "version": "1.17.0", "license": "", "scripts": { "ng": "ng", "start": "npx ng serve", "start-widgets": "npx ng serve --port 4201 --project report-widgets --proxy-config proxy.config.mjs --live-reload false", "hmr": "npx ng serve --live-reload true", - "build": "npx ng build --configuration production --source-map --vendor-chunk", + "build": "npx ng build --configuration production --source-map", "build-dev": "node ./node_modules/.bin/ng build --extract-css=false", "build-widgets": "npx ng build --project report-widgets --configuration production", "fetch": "./scripts/get-remote-build.sh", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e --port 4300", - "bundle-report": "node --max_old_space_size=3248 ./node_modules/.bin/ng build --configuration production --vendor-chunk --aot --stats-json; webpack-bundle-analyzer build/stats.json", + "bundle-report": "node --max_old_space_size=3248 ./node_modules/.bin/ng build --configuration production --aot --stats-json; webpack-bundle-analyzer build/stats.json", "submodule": "git submodule update --recursive --remote --init" }, "private": true, "dependencies": { - "@angular/animations": "^17.3.7", - "@angular/cdk": "^17.3.7", - "@angular/common": "^17.3.7", - "@angular/compiler": "^17.3.7", - "@angular/core": "^17.3.7", - "@angular/forms": "^17.3.7", - "@angular/material": "^17.3.7", - "@angular/platform-browser": "^17.3.7", - "@angular/platform-browser-dynamic": "^17.3.7", - "@angular/platform-server": "^17.3.7", - "@angular/router": "^17.3.7", - "@angular/service-worker": "^17.3.7", - "@angular/youtube-player": "^17.3.7", - "@aws-sdk/client-s3": "^3.569.0", - "@aws-sdk/s3-request-presigner": "^3.569.0", + "@angular/animations": "^18.2.10", + "@angular/cdk": "^18.2.11", + "@angular/common": "^18.2.10", + "@angular/compiler": "^18.2.10", + "@angular/core": "^18.2.10", + "@angular/forms": "^18.2.10", + "@angular/material": "^18.2.11", + "@angular/platform-browser": "^18.2.10", + "@angular/platform-browser-dynamic": "^18.2.10", + "@angular/platform-server": "^18.2.10", + "@angular/router": "^18.2.10", + "@angular/service-worker": "^18.2.10", + "@angular/youtube-player": "^18.2.11", + "@aws-sdk/client-s3": "^3.637.0", + "@aws-sdk/s3-request-presigner": "^3.637.0", "@ctrl/ngx-github-buttons": "^9.0.0", "@ctrl/tinycolor": "^4.1.0", "@ngneat/dag": "^2.0.0", - "@ngrx/effects": "^17.2.0", - "@ngrx/entity": "^17.2.0", - "@ngrx/router-store": "^17.2.0", - "@ngrx/store": "^17.2.0", - "ace-builds": "^1.33.1", + "@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", + "ace-builds": "^1.36.2", "angular-resizable-element": "^7.0.2", "angular-split": "^17.2.0", "ansi-to-html": "^0.7.2", "bootstrap": "^5.3.3", - "chart.js": "^4.4.2", + "chart.js": "^4.4.4", "chartjs-adapter-date-fns": "^3.0.0", "chartjs-plugin-annotation": "^3.0.1", "chartjs-plugin-zoom": "^2.0.1", - "curved-arrows": "^0.2.0", + "curved-arrows": "^0.3.0", "d3-selection": "^3.0.0", "date-fns": "^3.6.0", "diff": "^5.2.0", "dom-to-image": "^2.6.0", - "dompurify": "^3.1.3", + "dompurify": "^3.1.6", "export-to-csv": "^1.3.0", - "filesize": "^10.1.1", - "has-ansi": "^5.0.1", + "filesize": "^10.1.4", + "has-ansi": "^6.0.0", "hocon-parser": "^1.0.1", - "localforage": "^1.10.0", "lodash-es": "^4.17.21", "lucene": "^2.1.1", "marked": "^12.0.2", "ng2-charts": "^6.0.1", "ngx-clipboard": "^16.0.0", - "ngx-color-picker": "^16.0.0", - "ngx-device-detector": "^7.0.0", + "ngx-color-picker": "^17.0.0", + "ngx-device-detector": "^8.0.0", "ngx-markdown-editor": "^5.3.4", "ngx-print": "^1.5.1", "ngx-window-token": "^7.0.0", + "ngxtension": "^4.1.0", "object-hash": "^3.0.0", "primeicons": "^7.0.0", - "primeng": "^17.16.0", + "primeng": "^17.18.9", "rxjs": "^7.8.1", "string-to-color": "^2.2.2", "taira": "^3.2.2", - "tslib": "^2.6.2", - "url": "^0.11.3", - "uuid": "^9.0.1", - "zone.js": "~0.14.5" + "tslib": "^2.7.0", + "url": "^0.11.4", + "uuid": "^10.0.0", + "zone.js": "~0.15.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^17.3.6", - "@angular-devkit/core": "^17.3.6", - "@angular-devkit/schematics": "^17.3.6", - "@angular-devkit/schematics-cli": "^17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "^17.3.6", - "@angular/compiler-cli": "^17.3.7", - "@angular/language-service": "^17.3.7", - "@fortawesome/fontawesome-free": "^6.5.2", - "@ngrx/eslint-plugin": "^17.2.0", - "@ngrx/schematics": "^17.2.0", - "@ngrx/store-devtools": "^17.2.0", + "@angular-devkit/build-angular": "^18.2.11", + "@angular-devkit/core": "^18.2.11", + "@angular-devkit/schematics": "^18.2.11", + "@angular-devkit/schematics-cli": "^18.2.1", + "@angular/cli": "^18.2.11", + "@angular/compiler-cli": "^18.2.10", + "@angular/language-service": "^18.2.10", + "@fortawesome/fontawesome-free": "^6.6.0", + "@ngrx/eslint-plugin": "^18.1.1", + "@ngrx/schematics": "^18.1.1", + "@ngrx/store-devtools": "^18.1.1", "@types/d3-selection": "^3.0.10", "@types/dom-to-image": "^2.6.7", + "@types/dompurify": "^3.0.5", "@types/has-ansi": "^5.0.2", "@types/jasmine": "^5.1.4", "@types/lodash-es": "^4.17.12", - "@types/node": "^20.12.10", - "@types/plotly.js": "^2.29.3", + "@types/node": "^20.14.10", + "@types/plotly.js": "^2.33.3", "@types/tinycolor2": "^1.4.6", - "@types/uuid": "^9.0.8", - "@typescript-eslint/eslint-plugin": "^7.8.0", - "@typescript-eslint/parser": "^7.8.0", - "eslint": "^8.57.0", - "eslint-plugin-import": "^2.29.1", - "eslint-plugin-jsdoc": "^48.2.3", - "eslint-plugin-prefer-arrow": "^1.2.3", - "typescript": "~5.4.5" + "@types/uuid": "^10.0.0", + "angular-eslint": "^18.3.0", + "eslint": "^9.9.1", + "eslint-plugin-import": "2.29.1", + "eslint-plugin-jsdoc": "^50.2.2", + "eslint-plugin-prefer-arrow": "1.2.3", + "typescript": "^5.5.4", + "typescript-eslint": "^8.2.0" } } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 97cb2825..94e59a7f 100755 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,16 +1,13 @@ -import {ApiUsersService} from './business-logic/api-services/users.service'; import {selectCurrentUser} from '@common/core/reducers/users-reducer'; -import {Component, OnDestroy, OnInit, ViewEncapsulation, HostListener, Renderer2, Injector} from '@angular/core'; -import {ActivatedRoute, NavigationEnd, Router} from '@angular/router'; +import {Component, OnDestroy, OnInit, ViewEncapsulation, HostListener, Renderer2, inject} from '@angular/core'; +import {NavigationEnd, Router} from '@angular/router'; import {Title} from '@angular/platform-browser'; import {selectBreadcrumbs, selectLoggedOut} from '@common/core/reducers/view.reducer'; import {Store} from '@ngrx/store'; import {selectRouterParams, selectRouterUrl} from '@common/core/reducers/router-reducer'; -import {ApiProjectsService} from './business-logic/api-services/projects.service'; import {Project} from './business-logic/model/projects/project'; import {getAllSystemProjects, setSelectedProjectId, updateProject} from '@common/core/actions/projects.actions'; import {selectRouterProjectId, selectSelectedProject} from '@common/core/reducers/projects.reducer'; -import {MatDialog} from '@angular/material/dialog'; import {getTutorialBucketCredentials} from '@common/core/actions/common-auth.actions'; import {termsOfUseAccepted} from '@common/core/actions/users.actions'; import {distinctUntilChanged, filter, tap} from 'rxjs/operators'; @@ -21,8 +18,6 @@ import {selectAvailableUpdates} from './core/reducers/view.reducer'; import {UPDATE_SERVER_PATH} from './app.constants'; import {aceReady, firstLogin, plotlyReady, setScaleFactor, visibilityChanged} from '@common/core/actions/layout.actions'; import {UiUpdatesService} from '@common/shared/services/ui-updates.service'; -import {UsageStatsService} from './core/services/usage-stats.service'; -import {dismissSurvey} from './core/actions/layout.actions'; import {getScaleFactor} from '@common/shared/utils/shared-utils'; import {ConfigurationService} from '@common/shared/services/configuration.service'; import {selectIsSharedAndNotOwner} from './features/experiments/reducers'; @@ -31,6 +26,7 @@ import {USER_PREFERENCES_KEY} from '@common/user-preferences'; import {Environment} from '../environments/base'; import {loadExternalLibrary} from '@common/shared/utils/load-external-library'; import {User} from '~/business-logic/model/users/user'; +import {BreadcrumbsService} from '@common/shared/services/breadcrumbs.service'; @Component({ selector: 'sm-root', @@ -39,24 +35,30 @@ import {User} from '~/business-logic/model/users/user'; encapsulation: ViewEncapsulation.None }) export class AppComponent implements OnInit, OnDestroy { - public loggedOut$: Observable; + private router = inject(Router); + private titleService = inject(Title); + private store = inject(Store); + public serverUpdatesService = inject(ServerUpdatesService); + private uiUpdatesService = inject(UiUpdatesService); + private tipsService = inject(TipsService); + private renderer = inject(Renderer2); + private configService = inject(ConfigurationService); + private breadcrumbsService = inject(BreadcrumbsService); // don't delete + protected loggedOut$: Observable; private urlSubscription: Subscription; - public selectedProject$: Observable; - public projectId: string; - public isWorkersContext: boolean; - public updatesAvailable$: Observable; + protected selectedProject$: Observable; + protected projectId: string; + protected isWorkersContext: boolean; + protected updatesAvailable$: Observable; private breadcrumbsSubscription: Subscription; private selectedCurrentUserSubscription: Subscription; - public showNotification: boolean = true; - public demo = ConfigurationService.globalEnvironment.demo; - public isLoginContext: boolean; - public currentUser: User; - private gtmService; - public isSharedAndNotOwner$: Observable; + protected showNotification = true; + protected isLoginContext: boolean; + protected currentUser: User; + protected isSharedAndNotOwner$: Observable; private activeWorkspace: string; - public hideUpdate: boolean; - public showSurvey: boolean; - private plotlyURL: string; + protected hideUpdate: boolean; + protected showSurvey: boolean; private environment: Environment; private title = 'ClearML'; @@ -70,22 +72,8 @@ export class AppComponent implements OnInit, OnDestroy { } constructor( - private router: Router, - private route: ActivatedRoute, - private titleService: Title, - private store: Store, - private projectsApi: ApiProjectsService, - private userService: ApiUsersService, - public serverUpdatesService: ServerUpdatesService, - private uiUpdatesService: UiUpdatesService, - private tipsService: TipsService, - private matDialog: MatDialog, - private userStats: UsageStatsService, - private renderer: Renderer2, - private injector: Injector, - private configService: ConfigurationService ) { - this.loggedOut$ = store.select(selectLoggedOut); + this.loggedOut$ = this.store.select(selectLoggedOut); this.isSharedAndNotOwner$ = this.store.select(selectIsSharedAndNotOwner); this.selectedProject$ = this.store.select(selectSelectedProject); this.updatesAvailable$ = this.store.select(selectAvailableUpdates); @@ -109,20 +97,11 @@ export class AppComponent implements OnInit, OnDestroy { this.configService.globalEnvironmentObservable.subscribe(env => { this.hideUpdate = env.hideUpdateNotice; this.showSurvey = env.showSurvey; - this.plotlyURL = env.plotlyURL; this.environment = env; }); this.router.events .pipe(filter(event => event instanceof NavigationEnd)) - .subscribe( - (item: NavigationEnd) => { - const gtmTag = { - event: 'page', - pageName: item.url - }; - this.gtmService?.pushTag(gtmTag); - this.store.dispatch(routerActions.navigationEnd()); - }); + .subscribe(() => this.store.dispatch(routerActions.navigationEnd())); this.selectedCurrentUserSubscription = this.store.select(selectCurrentUser).pipe( tap(user => this.currentUser = user as unknown as User), @@ -160,7 +139,9 @@ export class AppComponent implements OnInit, OnDestroy { this.breadcrumbsSubscription = this.store.select(selectBreadcrumbs).subscribe(breadcrumbs => { const crumbs = breadcrumbs.flat().filter((breadcrumb => !!breadcrumb?.name)).map(breadcrumb => breadcrumb.name); - crumbs.length> 0 && this.titleService.setTitle(`${this.title ? this.title + '-' : ''} ${crumbs.join(' / ')}`); + if (crumbs.length> 0) { + this.titleService.setTitle(`${this.title ? this.title + '-' : ''} ${crumbs.join(' / ')}`); + } }); if (window.localStorage.getItem('disableHidpi') !== 'true') { @@ -191,14 +172,6 @@ export class AppComponent implements OnInit, OnDestroy { this.selectedCurrentUserSubscription.unsubscribe(); } - changeRoute(feature) { - return this.router.navigateByUrl('projects/' + this.projectId + '/' + feature); - } - - backToProjects() { - return this.router.navigateByUrl('projects'); - } - versionDismissed(version: string) { this.serverUpdatesService.setDismissedVersion(version); } @@ -206,13 +179,4 @@ export class AppComponent implements OnInit, OnDestroy { notifierActive(show: boolean) { this.showNotification = show; } - - dismissSurvey() { - this.store.dispatch(dismissSurvey()); - - } - - get guestUser(): boolean { - return !this.currentUser || this.currentUser?.role === 'guest'; - } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 912aa94c..3a548b72 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -27,6 +27,7 @@ import {MAT_TOOLTIP_DEFAULT_OPTIONS, MatTooltipDefaultOptions} from '@angular/ma import {UpdateNotifierComponent} from '@common/shared/ui-components/overlay/update-notifier/update-notifier.component'; import {ChooseColorModule} from '@common/shared/ui-components/directives/choose-color/choose-color.module'; import {SpinnerComponent} from '@common/shared/ui-components/overlay/spinner/spinner.component'; +import {provideCharts, withDefaultRegisterables} from 'ng2-charts'; @NgModule({ declarations : [AppComponent], @@ -62,7 +63,7 @@ import {SpinnerComponent} from '@common/shared/ui-components/overlay/spinner/spi ChooseColorModule, SpinnerComponent, ], - providers : [ + providers: [ UserPreferences, {provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: {floatLabel: 'always'}}, { @@ -77,7 +78,8 @@ import {SpinnerComponent} from '@common/shared/ui-components/overlay/spinner/spi { provide: MAT_TOOLTIP_DEFAULT_OPTIONS, useValue: {position: 'above'} as MatTooltipDefaultOptions - } + }, + provideCharts(withDefaultRegisterables()), ], bootstrap : [AppComponent], exports : [] diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index c71a4015..7a0637b7 100755 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -101,6 +101,11 @@ export const routes: Routes = [ loadChildren: () => import('./webapp-common/reports/reports.module').then(m => m.ReportsModule) }, {path: 'workers-and-queues', loadChildren: () => import('./features/workers-and-queues/workers-and-queues.module').then(m => m.WorkersAndQueuesModule)}, + { + path: 'endpoints', + loadChildren: () => import('./webapp-common/serving/serving.module').then(m => m.ServingModule), + canDeactivate: [resetContextMenuGuard] + }, {path: '404', loadChildren: () => import('./features/not-found/not-found.module').then(m => m.NotFoundModule)}, {path: '**', loadChildren: () => import('./features/not-found/not-found.module').then(m => m.NotFoundModule)}, diff --git a/src/app/business-logic/api-services/api-requests.service.ts b/src/app/business-logic/api-services/api-requests.service.ts index 71349891..5b576b17 100755 --- a/src/app/business-logic/api-services/api-requests.service.ts +++ b/src/app/business-logic/api-services/api-requests.service.ts @@ -5,6 +5,7 @@ import {IApiRequest, SmHttpResponse} from '../model/api-request'; import {HttpClient, HttpParams} from '@angular/common/http'; import {HttpHeaders} from '@angular/common/http'; import {map} from 'rxjs/operators'; +import {ApiOptions} from '~/business-logic/api-services/api'; @Injectable() export class SmApiRequestsService { @@ -35,7 +36,7 @@ export class SmApiRequestsService { reportProgress?: boolean; responseType?: 'json'; withCredentials?: boolean; - }): Observable { + }, extOptions?: ApiOptions): Observable { options.withCredentials = true; return this.http.post(url, body, options).pipe(map(res => res.data)); } diff --git a/src/app/business-logic/api-services/api.ts b/src/app/business-logic/api-services/api.ts index b1982a00..8024c329 100644 --- a/src/app/business-logic/api-services/api.ts +++ b/src/app/business-logic/api-services/api.ts @@ -1,3 +1,7 @@ export * from './tasks.service'; -import { TasksService } from './tasks.service'; -export const APIS = [TasksService]; + +export interface ApiOptions { + headers?: Record; + adminQuery?: boolean; + userId?: string; +} diff --git a/src/app/business-logic/api-services/queues.service.ts b/src/app/business-logic/api-services/queues.service.ts index ee4cd942..f4a79b56 100644 --- a/src/app/business-logic/api-services/queues.service.ts +++ b/src/app/business-logic/api-services/queues.service.ts @@ -58,6 +58,9 @@ import { QueuesUpdateResponse } from '../model/queues/queuesUpdateResponse'; import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; import { Configuration } from '../configuration'; +import {QueuesClearQueueRequest} from '~/business-logic/model/queues/queuesClearQueueRequest'; +import {ApiOptions} from '~/business-logic/api-services/api'; +import {QueuesClearQueueResponse} from '~/business-logic/model/queues/queuesClearQueueResponse'; @Injectable() @@ -93,7 +96,7 @@ export class ApiQueuesService { /** - * + * * Add or update queue metadata * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -138,7 +141,7 @@ export class ApiQueuesService { } /** - * + * * Adds a task entry to the queue. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -171,6 +174,7 @@ export class ApiQueuesService { headers = headers.set("Content-Type", httpContentTypeSelected); } + return this.apiRequest.post(`${this.basePath}/queues.add_task`, request, { @@ -182,8 +186,23 @@ export class ApiQueuesService { ); } - /** - * + /** + * Remove all tasks from the queue and change their statuses to what they were prior to enqueuing or \'created\' + * @param request request body + * @param options flags and headers to use in webapp + */ + public queuesClearQueue(request: QueuesClearQueueRequest, options?: ApiOptions): Observable { + return this.apiRequest.post(`${this.basePath}/queues.clear_queue`, + request, + { + headers: this.defaultHeaders, + withCredentials: this.configuration.withCredentials + }, + ); + } + + /** + * * Create a new queue * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -228,7 +247,7 @@ export class ApiQueuesService { } /** - * + * * Deletes a queue. If the queue is not empty and force is not set to true, queue will not be deleted. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -273,7 +292,7 @@ export class ApiQueuesService { } /** - * + * * Delete metadata from queue * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -318,7 +337,7 @@ export class ApiQueuesService { } /** - * + * * Get all queues * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -363,7 +382,7 @@ export class ApiQueuesService { } /** - * + * * Get all queues * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -408,7 +427,7 @@ export class ApiQueuesService { } /** - * + * * Gets queue information * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -453,8 +472,8 @@ export class ApiQueuesService { } /** - * - * + * + * * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. @@ -498,7 +517,7 @@ export class ApiQueuesService { } /** - * + * * Gets the next task from the top of the queue (FIFO). The task entry is removed from the queue. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -543,7 +562,7 @@ export class ApiQueuesService { } /** - * + * * Returns metrics of the company queues. The metrics are avaraged in the specified interval. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -588,8 +607,8 @@ export class ApiQueuesService { } /** - * - * + * + * * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. @@ -633,7 +652,7 @@ export class ApiQueuesService { } /** - * + * * Moves a task entry one step forward towards the top of the queue. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -678,8 +697,8 @@ export class ApiQueuesService { } /** - * - * + * + * * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. @@ -723,8 +742,8 @@ export class ApiQueuesService { } /** - * - * + * + * * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. @@ -768,7 +787,7 @@ export class ApiQueuesService { } /** - * + * * Removes a task entry from the queue. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -813,7 +832,7 @@ export class ApiQueuesService { } /** - * + * * Update queue information * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. diff --git a/src/app/business-logic/api-services/serving.service.ts b/src/app/business-logic/api-services/serving.service.ts new file mode 100644 index 00000000..8668f2fc --- /dev/null +++ b/src/app/business-logic/api-services/serving.service.ts @@ -0,0 +1,171 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/member-ordering */ + +import {HTTP} from '~/app.constants'; +import {SmApiRequestsService} from './api-requests.service'; + +import { Inject, Injectable, Optional } from '@angular/core'; +import { HttpClient, HttpHeaders, HttpParams, + HttpResponse, HttpEvent } from '@angular/common/http'; +import { CustomHttpUrlEncodingCodec } from '../encoder'; +import { ApiOptions } from './api'; + +import { Observable } from 'rxjs'; + +import { ServingContainerStatusReportRequest } from '../model/serving/servingContainerStatusReportRequest'; +import { ServingGetEndpointDetailsRequest } from '../model/serving/servingGetEndpointDetailsRequest'; +import { ServingGetEndpointDetailsResponse } from '../model/serving/servingGetEndpointDetailsResponse'; +import { ServingGetEndpointsResponse } from '../model/serving/servingGetEndpointsResponse'; +import { ServingRegisterContainerRequest } from '../model/serving/servingRegisterContainerRequest'; +import { ServingUnregisterContainerRequest } from '../model/serving/servingUnregisterContainerRequest'; + +import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; +import { Configuration } from '../configuration'; +import {ServingGetLoadingInstancesResponse} from '~/business-logic/model/serving/servingGetLoadingInstancesResponse'; +import {ServingGetEndpointMetricsHistoryRequest} from '~/business-logic/model/serving/servingGetEndpointMetricsHistoryRequest'; +import {ServingGetEndpointMetricsHistoryResponse} from '~/business-logic/model/serving/servingGetEndpointMetricsHistoryResponse'; + + +@Injectable() +export class ApiServingService { + + protected basePath = HTTP.API_BASE_URL; + public defaultHeaders = new HttpHeaders({'Accept': 'application/json'}); + public configuration = new Configuration(); + + constructor(protected apiRequest: SmApiRequestsService, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) { + if (basePath) { + this.basePath = basePath; + } + if (configuration) { + this.configuration = configuration; + this.basePath = basePath || configuration.basePath || this.basePath; + } + } + + + + /** + * Container status report + * @param request request body + * @param options flags and headers to use in webapp + */ + public servingContainerStatusReport(request: ServingContainerStatusReportRequest, options?: ApiOptions): Observable { + return this.apiRequest.post(`${this.basePath}/serving.container_status_report`, + request, + { + headers: this.defaultHeaders, + withCredentials: this.configuration.withCredentials + }, + options + ); + } + + /** + * Get endpoint details + * @param request request body + * @param options flags and headers to use in webapp + */ + public servingGetEndpointDetails(request: ServingGetEndpointDetailsRequest, options?: ApiOptions): Observable { + return this.apiRequest.post(`${this.basePath}/serving.get_endpoint_details`, + request, + { + headers: this.defaultHeaders, + withCredentials: this.configuration.withCredentials + }, + options + ); + } + + /** + * Get endpoint charts + * @param request request body + * @param options flags and headers to use in webapp + */ + public servingGetEndpointMetricsHistory(request: ServingGetEndpointMetricsHistoryRequest, options?: ApiOptions): Observable { + return this.apiRequest.post(`${this.basePath}/serving.get_endpoint_metrics_history`, + request, + { + headers: this.defaultHeaders, + withCredentials: this.configuration.withCredentials + }, + options + ); + } + + /** + * Get all the registered endpoints + * @param request request body + * @param options flags and headers to use in webapp + */ + public servingGetEndpoints(request: object, options?: ApiOptions): Observable { + return this.apiRequest.post(`${this.basePath}/serving.get_endpoints`, + request, + { + headers: this.defaultHeaders, + withCredentials: this.configuration.withCredentials + }, + options + ); + } + + /** + * Get loading instances (enpoint_url not set yet) + * @param request request body + * @param options flags and headers to use in webapp + */ + public servingGetLoadingInstances(request: object, options?: ApiOptions): Observable { + return this.apiRequest.post(`${this.basePath}/serving.get_loading_instances`, + request, + { + headers: this.defaultHeaders, + withCredentials: this.configuration.withCredentials + }, + options + ); + } + + /** + * Register container + * @param request request body + * @param options flags and headers to use in webapp + */ + public servingRegisterContainer(request: ServingRegisterContainerRequest, options?: ApiOptions): Observable { + return this.apiRequest.post(`${this.basePath}/serving.register_container`, + request, + { + headers: this.defaultHeaders, + withCredentials: this.configuration.withCredentials + }, + options + ); + } + + /** + * Unregister container + * @param request request body + * @param options flags and headers to use in webapp + */ + public servingUnregisterContainer(request: ServingUnregisterContainerRequest, options?: ApiOptions): Observable { + return this.apiRequest.post(`${this.basePath}/serving.unregister_container`, + request, + { + headers: this.defaultHeaders, + withCredentials: this.configuration.withCredentials + }, + options + ); + } + + } diff --git a/src/app/business-logic/api-services/tasks.service.ts b/src/app/business-logic/api-services/tasks.service.ts index 47288b29..b660e0dd 100644 --- a/src/app/business-logic/api-services/tasks.service.ts +++ b/src/app/business-logic/api-services/tasks.service.ts @@ -117,6 +117,9 @@ import { BASE_PATH, COLLECTION_FORMATS } from '../variables' import { Configuration } from '../configuration'; import {TasksUpdateTagsResponse} from '~/business-logic/model/tasks/tasksUpdateTagsResponse'; import {TasksUpdateTagsRequest} from '~/business-logic/model/tasks/tasksUpdateTagsRequest'; +import {TasksGetOperationsLogRequest} from '~/business-logic/model/tasks/tasksGetOperationsLogRequest'; +import {TasksGetOperationsLogResponse} from '~/business-logic/model/tasks/tasksGetOperationsLogResponse'; +import {ApiOptions} from '~/business-logic/api-services/api'; @Injectable() @@ -1366,7 +1369,22 @@ export class ApiTasksService { ); } - /** + /** + * Get the task operations log + * @param request request body + * @param options flags and headers to use in webapp + */ + public tasksGetOperationsLog(request: TasksGetOperationsLogRequest, options?: ApiOptions): Observable { + return this.apiRequest.post(`${this.basePath}/tasks.get_operations_log`, + request, + { + headers: this.defaultHeaders, + withCredentials: this.configuration.withCredentials + }, + ); + } + + /** * * Get the list of task configurations * @param request request body diff --git a/src/app/business-logic/business-logic.module.ts b/src/app/business-logic/business-logic.module.ts index 3958527a..8e56fd5e 100755 --- a/src/app/business-logic/business-logic.module.ts +++ b/src/app/business-logic/business-logic.module.ts @@ -17,6 +17,7 @@ import {ApiOrganizationService} from './api-services/organization.service'; import {ApiLoginService} from './api-services/login.service'; import {ApiPipelinesService} from '~/business-logic/api-services/pipelines.service'; import {ApiReportsService} from '~/business-logic/api-services/reports.service'; +import {ApiServingService} from '~/business-logic/api-services/serving.service'; @NgModule({ imports : [CommonModule, HttpClientModule], @@ -39,6 +40,7 @@ import {ApiReportsService} from '~/business-logic/api-services/reports.service'; ApiLoginService, ApiPipelinesService, ApiReportsService, + ApiServingService ] }) export class BusinessLogicModule { diff --git a/src/app/business-logic/model/queues/queuesClearQueueRequest.ts b/src/app/business-logic/model/queues/queuesClearQueueRequest.ts new file mode 100644 index 00000000..e63dd112 --- /dev/null +++ b/src/app/business-logic/model/queues/queuesClearQueueRequest.ts @@ -0,0 +1,20 @@ +/** + * queues + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface QueuesClearQueueRequest { + /** + * Queue id + */ + queue: string; +} diff --git a/src/app/business-logic/model/queues/queuesClearQueueResponse.ts b/src/app/business-logic/model/queues/queuesClearQueueResponse.ts new file mode 100644 index 00000000..5c8fb9bd --- /dev/null +++ b/src/app/business-logic/model/queues/queuesClearQueueResponse.ts @@ -0,0 +1,20 @@ +/** + * queues + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface QueuesClearQueueResponse { + /** + * IDs of the removed tasks + */ + removed_tasks?: Array; +} diff --git a/src/app/business-logic/model/queues/queuesRemoveTaskRequest.ts b/src/app/business-logic/model/queues/queuesRemoveTaskRequest.ts index a3b6778c..d3ac148a 100644 --- a/src/app/business-logic/model/queues/queuesRemoveTaskRequest.ts +++ b/src/app/business-logic/model/queues/queuesRemoveTaskRequest.ts @@ -21,4 +21,8 @@ export interface QueuesRemoveTaskRequest { * Task id */ task: string; + /** + * If set to \'true\' then change the removed task status to the one it had prior to enqueuing or \'created\' + */ + update_task_status?: boolean; } diff --git a/src/app/business-logic/model/serving/containerInfo.ts b/src/app/business-logic/model/serving/containerInfo.ts new file mode 100644 index 00000000..9a8ddfac --- /dev/null +++ b/src/app/business-logic/model/serving/containerInfo.ts @@ -0,0 +1,60 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface ContainerInfo { + /** + * Endpoint name + */ + endpoint?: string; + /** + * Model name + */ + model?: string; + /** + * Model url + */ + url?: string; + /** + * Model source + */ + model_source?: string; + /** + * Model version + */ + model_version?: string; + /** + * Preprocess Artifact + */ + preprocess_artifact?: string; + /** + * Input type + */ + input_type?: string; + /** + * Input size in bytes + */ + input_size?: number; + /** + * Container ID + */ + id: string; + /** + * Model instance uptime in seconds + */ + uptime_sec?: number; + /** + * The latest time when the container instance sent update + */ + last_update?: string; +} diff --git a/src/app/business-logic/model/serving/containerInstanceStats.ts b/src/app/business-logic/model/serving/containerInstanceStats.ts new file mode 100644 index 00000000..26b7e1d9 --- /dev/null +++ b/src/app/business-logic/model/serving/containerInstanceStats.ts @@ -0,0 +1,45 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 2.31 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { ContainerInstanceStatsReference } from '././containerInstanceStatsReference'; + + +export interface ContainerInstanceStats { + /** + * Container ID + */ + id?: string; + /** + * Uptime in seconds + */ + uptime_sec?: number; + /** + * Number of requests + */ + requests?: number; + /** + * Average requests per minute + */ + requests_min?: number; + /** + * Average request latency in ms + */ + latency_ms?: number; + /** + * The latest time when the container instance sent update + */ + last_update?: string; + /** + * Array of reference items provided by the container instance. Can contain multiple reference items with the same type + */ + reference?: Array; +} diff --git a/src/app/business-logic/model/serving/containerInstanceStatsReference.ts b/src/app/business-logic/model/serving/containerInstanceStatsReference.ts new file mode 100644 index 00000000..7717cd2e --- /dev/null +++ b/src/app/business-logic/model/serving/containerInstanceStatsReference.ts @@ -0,0 +1,34 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 2.31 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface ContainerInstanceStatsReference { + /** + * The type of the reference item + */ + type: ContainerInstanceStatsReference.TypeEnum; + /** + * The reference item value + */ + value: string; +} +export namespace ContainerInstanceStatsReference { + export type TypeEnum = 'app_id' | 'app_instance' | 'model' | 'task' | 'url'; + export const TypeEnum = { + AppId: 'app_id' as TypeEnum, + AppInstance: 'app_instance' as TypeEnum, + Model: 'model' as TypeEnum, + Task: 'task' as TypeEnum, + Url: 'url' as TypeEnum + } +} diff --git a/src/app/business-logic/model/serving/endpointStats.ts b/src/app/business-logic/model/serving/endpointStats.ts new file mode 100644 index 00000000..93c1bca6 --- /dev/null +++ b/src/app/business-logic/model/serving/endpointStats.ts @@ -0,0 +1,53 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface EndpointStats { + /** + * Endpoint name + */ + id: string; + endpoint?: string; + /** + * Model name + */ + model?: string; + /** + * Model url + */ + url?: string; + /** + * The number of model serving instances + */ + instances?: number; + /** + * Max of model instance uptime in seconds + */ + uptime_sec?: number; + /** + * Total requests processed by model instances + */ + requests?: number; + /** + * Average of request rate of model instances per minute + */ + requests_min?: number; + /** + * Average of latency of model instances in ms + */ + latency_ms?: number; + /** + * The latest time when one of the model instances was updated + */ + last_update?: string; +} diff --git a/src/app/business-logic/model/serving/machineStats.ts b/src/app/business-logic/model/serving/machineStats.ts new file mode 100644 index 00000000..0400c188 --- /dev/null +++ b/src/app/business-logic/model/serving/machineStats.ts @@ -0,0 +1,76 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface MachineStats { + /** + * Average CPU usage per core + */ + cpu_usage?: Array; + /** + * Average GPU usage per GPU card + */ + gpu_usage?: Array; + /** + * Used memory MBs + */ + memory_used?: number; + /** + * Free memory MBs + */ + memory_free?: number; + /** + * GPU free memory MBs + */ + gpu_memory_free?: Array; + /** + * GPU used memory MBs + */ + gpu_memory_used?: Array; + /** + * Mbytes per second + */ + network_tx?: number; + /** + * Mbytes per second + */ + network_rx?: number; + /** + * Free space in % of /home drive + */ + disk_free_home?: number; + /** + * Free space in % of /tmp drive + */ + disk_free_temp?: number; + /** + * Mbytes read per second + */ + disk_read?: number; + /** + * Mbytes write per second + */ + disk_write?: number; + /** + * CPU temperature + */ + cpu_temperature?: Array; + /** + * GPU temperature + */ + gpu_temperature?: Array; + /** + * GPU fraction + */ + gpu_fraction?: Array; +} diff --git a/src/app/business-logic/model/serving/models.ts b/src/app/business-logic/model/serving/models.ts new file mode 100644 index 00000000..e6aa7163 --- /dev/null +++ b/src/app/business-logic/model/serving/models.ts @@ -0,0 +1,15 @@ +export * from '././containerInfo'; +export * from '././containerInstanceStats'; +export * from '././endpointStats'; +export * from '././machineStats'; +export * from '././servingContainerStatusReportRequest'; +export * from '././servingGetEndpointDetailsRequest'; +export * from '././servingGetEndpointDetailsResponse'; +export * from '././servingGetEndpointMetricsHistoryRequest'; +export * from '././servingGetEndpointMetricsHistoryResponse'; +export * from '././servingGetEndpointMetricsHistoryResponseInstances'; +export * from '././servingGetEndpointMetricsHistoryResponseTotal'; +export * from '././servingGetEndpointsResponse'; +export * from '././servingGetLoadingInstancesResponse'; +export * from '././servingRegisterContainerRequest'; +export * from '././servingUnregisterContainerRequest'; diff --git a/src/app/business-logic/model/serving/servingContainerStatusReportRequest.ts b/src/app/business-logic/model/serving/servingContainerStatusReportRequest.ts new file mode 100644 index 00000000..a2ff1b1e --- /dev/null +++ b/src/app/business-logic/model/serving/servingContainerStatusReportRequest.ts @@ -0,0 +1,70 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { MachineStats } from '././machineStats'; + + +export interface ServingContainerStatusReportRequest { + /** + * Container ID + */ + container_id: string; + /** + * Endpoint name + */ + endpoint_name: string; + /** + * Endpoint URL + */ + endpoint_url?: string; + /** + * Model name + */ + model_name: string; + /** + * Model source + */ + model_source?: string; + /** + * Model version + */ + model_version?: string; + /** + * Preprocess Artifact + */ + preprocess_artifact?: string; + /** + * Input type + */ + input_type?: string; + /** + * Input size in bytes + */ + input_size?: number; + /** + * Uptime in seconds + */ + uptime_sec?: number; + /** + * Number of requests + */ + requests_num?: number; + /** + * Average requests per minute + */ + requests_min?: number; + /** + * Average request latency in ms + */ + latency_ms?: number; + machine_stats?: MachineStats; +} diff --git a/src/app/business-logic/model/serving/servingGetEndpointDetailsRequest.ts b/src/app/business-logic/model/serving/servingGetEndpointDetailsRequest.ts new file mode 100644 index 00000000..a52c2a2f --- /dev/null +++ b/src/app/business-logic/model/serving/servingGetEndpointDetailsRequest.ts @@ -0,0 +1,20 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface ServingGetEndpointDetailsRequest { + /** + * Endpoint URL + */ + endpoint_url: string; +} diff --git a/src/app/business-logic/model/serving/servingGetEndpointDetailsResponse.ts b/src/app/business-logic/model/serving/servingGetEndpointDetailsResponse.ts new file mode 100644 index 00000000..1c2f05d2 --- /dev/null +++ b/src/app/business-logic/model/serving/servingGetEndpointDetailsResponse.ts @@ -0,0 +1,58 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { ContainerInstanceStats } from '././containerInstanceStats'; + + +export interface ServingGetEndpointDetailsResponse { + /** + * Endpoint name + */ + endpoint?: string; + /** + * Model name + */ + model?: string; + /** + * Model url + */ + url?: string; + /** + * Model source + */ + model_source?: string; + /** + * Model version + */ + model_version?: string; + /** + * Preprocess Artifact + */ + preprocess_artifact?: string; + /** + * Input type + */ + input_type?: string; + /** + * Input size in bytes + */ + input_size?: number; + /** + * Max of model instance uptime in seconds + */ + uptime_sec?: number; + /** + * The latest time when one of the model instances was updated + */ + last_update?: Date; + instances?: Array; +} diff --git a/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryRequest.ts b/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryRequest.ts new file mode 100644 index 00000000..2deed59d --- /dev/null +++ b/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryRequest.ts @@ -0,0 +1,58 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface ServingGetEndpointMetricsHistoryRequest { + /** + * Endpoint Url + */ + endpoint_url: string; + /** + * Starting time (in seconds from epoch) for collecting statistics + */ + from_date: number; + /** + * Ending time (in seconds from epoch) for collecting statistics + */ + to_date: number; + /** + * Time interval in seconds for a single statistics point. The minimal value is 1 + */ + interval: number; + /** + * The type of the metrics to return on the chart + */ + metric_type?: ServingGetEndpointMetricsHistoryRequest.MetricTypeEnum; + /** + * If set then return instance charts and total. Otherwise total only + */ + instance_charts?: boolean; +} +export namespace ServingGetEndpointMetricsHistoryRequest { + export type MetricTypeEnum = 'requests' | 'requests_min' | 'latency_ms' | 'cpu_count' | 'gpu_count' | 'cpu_util' | 'gpu_util' | 'ram_total' | 'ram_free' | 'gpu_ram_total' | 'gpu_ram_free' | 'network_rx' | 'network_tx'; + export const MetricTypeEnum = { + Requests: 'requests' as MetricTypeEnum, + RequestsMin: 'requests_min' as MetricTypeEnum, + LatencyMs: 'latency_ms' as MetricTypeEnum, + CpuCount: 'cpu_count' as MetricTypeEnum, + GpuCount: 'gpu_count' as MetricTypeEnum, + CpuUtil: 'cpu_util' as MetricTypeEnum, + GpuUtil: 'gpu_util' as MetricTypeEnum, + RamTotal: 'ram_total' as MetricTypeEnum, + RamFree: 'ram_free' as MetricTypeEnum, + GpuRamTotal: 'gpu_ram_total' as MetricTypeEnum, + GpuRamFree: 'gpu_ram_free' as MetricTypeEnum, + NetworkRx: 'network_rx' as MetricTypeEnum, + NetworkTx: 'network_tx' as MetricTypeEnum + } +} diff --git a/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryResponse.ts b/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryResponse.ts new file mode 100644 index 00000000..da41c624 --- /dev/null +++ b/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryResponse.ts @@ -0,0 +1,27 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { ServingGetEndpointMetricsHistoryResponseTotal } from '././servingGetEndpointMetricsHistoryResponseTotal'; +import { ServingGetEndpointMetricsHistoryResponseInstances } from '././servingGetEndpointMetricsHistoryResponseInstances'; + + +export interface ServingGetEndpointMetricsHistoryResponse { + /** + * The inteval that was actually used for the histogram. May be larger then the requested one + */ + computed_interval?: number; + total?: ServingGetEndpointMetricsHistoryResponseTotal; + /** + * Instance charts + */ + instances?: { [key: string]: ServingGetEndpointMetricsHistoryResponseInstances; }; +} diff --git a/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryResponseInstances.ts b/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryResponseInstances.ts new file mode 100644 index 00000000..7f2c8fb8 --- /dev/null +++ b/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryResponseInstances.ts @@ -0,0 +1,28 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface ServingGetEndpointMetricsHistoryResponseInstances { + /** + * The title of the series + */ + title?: string; + /** + * List of timestamps (in seconds from epoch) in the acceding order. The timestamps are separated by the requested interval. + */ + dates?: Array; + /** + * List of values corresponding to the timestamps in the dates list. + */ + values?: Array; +} diff --git a/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryResponseInstancesValue.ts b/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryResponseInstancesValue.ts new file mode 100644 index 00000000..27e51124 --- /dev/null +++ b/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryResponseInstancesValue.ts @@ -0,0 +1,28 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 2.31 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface ServingGetEndpointMetricsHistoryResponseInstancesValue { + /** + * The title of the series + */ + title?: string; + /** + * List of timestamps (in seconds from epoch) in the acceding order. The timestamps are separated by the requested interval. + */ + dates?: Array; + /** + * List of values corresponding to the timestamps in the dates list. + */ + values?: Array; +} diff --git a/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryResponseTotal.ts b/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryResponseTotal.ts new file mode 100644 index 00000000..3ba7025b --- /dev/null +++ b/src/app/business-logic/model/serving/servingGetEndpointMetricsHistoryResponseTotal.ts @@ -0,0 +1,29 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface ServingGetEndpointMetricsHistoryResponseTotal { + /** + * The title of the series + */ + title?: string; + /** + * List of timestamps (in seconds from epoch) in the acceding order. The timestamps are separated by the requested interval. + */ + dates?: Array; + /** + * List of values corresponding to the timestamps in the dates list. + */ + values?: Array; + description?: object; +} diff --git a/src/app/business-logic/model/serving/servingGetEndpointsResponse.ts b/src/app/business-logic/model/serving/servingGetEndpointsResponse.ts new file mode 100644 index 00000000..d0482972 --- /dev/null +++ b/src/app/business-logic/model/serving/servingGetEndpointsResponse.ts @@ -0,0 +1,18 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { EndpointStats } from '././endpointStats'; + + +export interface ServingGetEndpointsResponse { + endpoints?: Array; +} diff --git a/src/app/business-logic/model/serving/servingGetLoadingInstancesResponse.ts b/src/app/business-logic/model/serving/servingGetLoadingInstancesResponse.ts new file mode 100644 index 00000000..dc2ae3ff --- /dev/null +++ b/src/app/business-logic/model/serving/servingGetLoadingInstancesResponse.ts @@ -0,0 +1,18 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { ContainerInfo } from '././containerInfo'; + + +export interface ServingGetLoadingInstancesResponse { + instances?: Array; +} diff --git a/src/app/business-logic/model/serving/servingRegisterContainerRequest.ts b/src/app/business-logic/model/serving/servingRegisterContainerRequest.ts new file mode 100644 index 00000000..6c29bc64 --- /dev/null +++ b/src/app/business-logic/model/serving/servingRegisterContainerRequest.ts @@ -0,0 +1,56 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface ServingRegisterContainerRequest { + /** + * Container ID + */ + container_id: string; + /** + * Endpoint name + */ + endpoint_name: string; + /** + * Endpoint URL + */ + endpoint_url?: string; + /** + * Model name + */ + model_name: string; + /** + * Model source + */ + model_source?: string; + /** + * Model version + */ + model_version?: string; + /** + * Preprocess Artifact + */ + preprocess_artifact?: string; + /** + * Input type + */ + input_type?: string; + /** + * Input size in bytes + */ + input_size?: number; + /** + * Registration timeout in seconds. If timeout seconds have passed since the service container last call to register or status_report, the container is automatically removed from the list of registered containers. + */ + timeout?: number; +} diff --git a/src/app/business-logic/model/serving/servingUnregisterContainerRequest.ts b/src/app/business-logic/model/serving/servingUnregisterContainerRequest.ts new file mode 100644 index 00000000..9ce46c9d --- /dev/null +++ b/src/app/business-logic/model/serving/servingUnregisterContainerRequest.ts @@ -0,0 +1,20 @@ +/** + * serving + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface ServingUnregisterContainerRequest { + /** + * Container ID + */ + container_id: string; +} diff --git a/src/app/business-logic/model/tasks/task.ts b/src/app/business-logic/model/tasks/task.ts index 7a579438..d087e820 100644 --- a/src/app/business-logic/model/tasks/task.ts +++ b/src/app/business-logic/model/tasks/task.ts @@ -116,7 +116,7 @@ export interface Task { /** * Last time any update was done to the task */ - last_change?: string; + last_change?: Date; /** * Last iteration reported for this task */ diff --git a/src/app/business-logic/model/tasks/tasksGetOperationsLogRequest.ts b/src/app/business-logic/model/tasks/tasksGetOperationsLogRequest.ts new file mode 100644 index 00000000..b35b10a5 --- /dev/null +++ b/src/app/business-logic/model/tasks/tasksGetOperationsLogRequest.ts @@ -0,0 +1,39 @@ +/** + * tasks + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface TasksGetOperationsLogRequest { + /** + * Task ID + */ + task: string; + /** + * The amount of records to retrieve + */ + page_size?: number; + /** + * The page to retrieve + */ + page?: number; + /** + * The time sorting + */ + order?: TasksGetOperationsLogRequest.OrderEnum; +} +export namespace TasksGetOperationsLogRequest { + export type OrderEnum = 'asc' | 'desc'; + export const OrderEnum = { + Asc: 'asc' as OrderEnum, + Desc: 'desc' as OrderEnum + } +} diff --git a/src/app/business-logic/model/tasks/tasksGetOperationsLogResponse.ts b/src/app/business-logic/model/tasks/tasksGetOperationsLogResponse.ts new file mode 100644 index 00000000..0c26e27f --- /dev/null +++ b/src/app/business-logic/model/tasks/tasksGetOperationsLogResponse.ts @@ -0,0 +1,18 @@ +/** + * tasks + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { TasksGetOperationsLogResponseOperations } from '././tasksGetOperationsLogResponseOperations'; + + +export interface TasksGetOperationsLogResponse { + operations?: Array; +} diff --git a/src/app/business-logic/model/tasks/tasksGetOperationsLogResponseOperations.ts b/src/app/business-logic/model/tasks/tasksGetOperationsLogResponseOperations.ts new file mode 100644 index 00000000..125fd812 --- /dev/null +++ b/src/app/business-logic/model/tasks/tasksGetOperationsLogResponseOperations.ts @@ -0,0 +1,70 @@ +/** + * tasks + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { TasksGetOperationsLogResponseUser } from '././tasksGetOperationsLogResponseUser'; + + +export interface TasksGetOperationsLogResponseOperations { + /** + * Log record ID + */ + id?: string; + /** + * Log record creation time + */ + created?: string; + /** + * The operation that was performed on the task. Either new task status or \'deleted\' + */ + operation?: string; + /** + * The reason for the task operation + */ + reason?: string; + /** + * The info that was passed by the client for the task operation if any + */ + info?: string; + /** + * The calling client IP + */ + ip?: string; + /** + * The calling agent + */ + originator?: TasksGetOperationsLogResponseOperations.OriginatorEnum; + /** + * The calling agent version + */ + originator_version?: string; + /** + * The calling client id + */ + originator_id?: string; + user?: TasksGetOperationsLogResponseUser; +} +export namespace TasksGetOperationsLogResponseOperations { + export type OriginatorEnum = 'agent' | 'webapp' | 'enterprise SDK' | 'SDK' | 'session' | 'serving' | 'task' | 'python' | 'curl' | 'postman' | 'other'; + export const OriginatorEnum = { + Agent: 'agent' as OriginatorEnum, + Webapp: 'webapp' as OriginatorEnum, + EnterpriseSDK: 'enterprise SDK' as OriginatorEnum, + SDK: 'SDK' as OriginatorEnum, + Session: 'session' as OriginatorEnum, + Serving: 'serving' as OriginatorEnum, + Task: 'task' as OriginatorEnum, + Python: 'python' as OriginatorEnum, + Curl: 'curl' as OriginatorEnum, + Postman: 'postman' as OriginatorEnum, + Other: 'other' as OriginatorEnum + } +} diff --git a/src/app/business-logic/model/tasks/tasksGetOperationsLogResponseUser.ts b/src/app/business-logic/model/tasks/tasksGetOperationsLogResponseUser.ts new file mode 100644 index 00000000..65907165 --- /dev/null +++ b/src/app/business-logic/model/tasks/tasksGetOperationsLogResponseUser.ts @@ -0,0 +1,24 @@ +/** + * tasks + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface TasksGetOperationsLogResponseUser { + /** + * User ID + */ + id?: string; + /** + * User name + */ + name?: string; +} diff --git a/src/app/business-logic/model/users/getCurrentUserResponseUserObject.ts b/src/app/business-logic/model/users/getCurrentUserResponseUserObject.ts index 159359bc..892081d3 100644 --- a/src/app/business-logic/model/users/getCurrentUserResponseUserObject.ts +++ b/src/app/business-logic/model/users/getCurrentUserResponseUserObject.ts @@ -28,5 +28,6 @@ export interface GetCurrentUserResponseUserObject { /** * User preferences */ - preferences?: object; + preferences?: any; + created_in_version?: string; } diff --git a/src/app/business-logic/model/workers/resourceUsageSeries.ts b/src/app/business-logic/model/workers/resourceUsageSeries.ts new file mode 100644 index 00000000..397a245f --- /dev/null +++ b/src/app/business-logic/model/workers/resourceUsageSeries.ts @@ -0,0 +1,28 @@ +/** + * workers + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface ResourceUsageSeries { + /** + * The title of the series + */ + title?: string; + /** + * List of timestamps (in seconds from epoch) in the acceding order. The timestamps are separated by the requested interval. + */ + dates?: Array; + /** + * List of values corresponding to the timestamps in the dates list. + */ + values?: Array; +} diff --git a/src/app/business-logic/services/tasks.service.ts b/src/app/business-logic/services/tasks.service.ts index 1f7cb7d6..7441ff11 100755 --- a/src/app/business-logic/services/tasks.service.ts +++ b/src/app/business-logic/services/tasks.service.ts @@ -1,15 +1,12 @@ import {Injectable} from '@angular/core'; -import {TASK_TYPES} from '../../app.constants'; -import {TAGS, TASKS_STATUS} from '../../webapp-common/tasks/tasks.constants'; +import {TASK_TYPES} from '~/app.constants'; +import {TAGS, TASKS_STATUS} from '@common/tasks/tasks.constants'; import {Task} from '../model/tasks/task'; import {DEFAULT_QUEUE_TAG} from '../variables'; +import {ISelectedExperiment} from '~/features/experiments/shared/experiment-info.model'; @Injectable() export class BlTasksService { - - constructor() { - } - private previouslyUsedQueue; getDefaultQueue(queues) { @@ -24,11 +21,11 @@ export class BlTasksService { return queue.system_tags && queue.system_tags.includes(DEFAULT_QUEUE_TAG); } - canEnqueue(task: Task): boolean { + canEnqueue(task: ISelectedExperiment): boolean { return !!(task && (TASKS_STATUS.CREATED === task.status || TASKS_STATUS.STOPPED === task.status) && task.type !== TASK_TYPES.MANUAL_ANNOTATION); } - canDequeue(task: Task): boolean { + canDequeue(task: ISelectedExperiment): boolean { return !!(task && TASKS_STATUS.QUEUED === task.status); } diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 21d128dd..6abc6b29 100755 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -12,10 +12,6 @@ import {messagesReducer} from '@common/core/reducers/messages-reducer'; import {projectsReducer} from '@common/core/reducers/projects.reducer'; import {routerReducer} from '@common/core/reducers/router-reducer'; import {SmSyncStateSelectorService} from '@common/core/services/sync-state-selector.service'; -import { - EXPERIMENTS_COMPARE_METRICS_CHARTS_ -} from '@common/experiments-compare/actions/experiments-compare-charts.actions'; -import {compareSyncedKeys} from '@common/experiments-compare/experiments-compare.module'; import {PROJECTS_PREFIX} from '@common/projects/common-projects.consts'; import {CHOOSE_COLOR_PREFIX} from '@common/shared/ui-components/directives/choose-color/choose-color.actions'; import {colorSyncedKeys} from '@common/shared/ui-components/directives/choose-color/choose-color.module'; @@ -27,10 +23,10 @@ import {USERS_PREFIX, VIEW_PREFIX} from '~/app.constants'; import {ProjectsEffects} from '~/core/effects/projects.effects'; import {loginReducer} from '~/features/login/login.reducer'; import {projectSyncedKeys} from '~/features/projects/projects.module'; -import {authReducer} from '~/features/settings/containers/admin/auth.reducers'; +import {authReducer} from '~/core/reducers/auth.reducers'; import {AdminService} from '~/shared/services/admin.service'; import {UserEffects} from './effects/users.effects'; -import {usageStatsReducer} from './reducers/usage-stats.reducer'; +import {usageStatsReducer, userStatsFeatureKey} from './reducers/usage-stats.reducer'; import {usersReducer} from './reducers/users.reducer'; import {viewReducer} from './reducers/view.reducer'; import {UsageStatsService} from './services/usage-stats.service'; @@ -49,7 +45,7 @@ export const reducers = { users: usersReducer, login: loginReducer, rootProjects: projectsReducer, - userStats: usageStatsReducer + [userStatsFeatureKey]: usageStatsReducer }; const syncedKeys = [ diff --git a/src/app/core/effects/projects.effects.ts b/src/app/core/effects/projects.effects.ts index d7757af2..f2bb2246 100644 --- a/src/app/core/effects/projects.effects.ts +++ b/src/app/core/effects/projects.effects.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import * as actions from '../../webapp-common/core/actions/projects.actions'; import {Store} from '@ngrx/store'; import {selectSelectedProjectId, selectShowHidden} from '@common/core/reducers/projects.reducer'; @@ -10,7 +11,7 @@ import {requestFailed} from '@common/core/actions/http.actions'; import {ApiProjectsService} from '~/business-logic/api-services/projects.service'; import {selectCurrentUser, selectShowOnlyUserWork,} from '@common/core/reducers/users-reducer'; import {ProjectsGetAllExRequest} from '~/business-logic/model/projects/projectsGetAllExRequest'; -import {selectRouterConfig} from "@common/core/reducers/router-reducer"; +import {selectRouterConfig} from '@common/core/reducers/router-reducer'; @Injectable() diff --git a/src/app/core/effects/users.effects.ts b/src/app/core/effects/users.effects.ts index e1cb680c..af72f62f 100755 --- a/src/app/core/effects/users.effects.ts +++ b/src/app/core/effects/users.effects.ts @@ -1,6 +1,6 @@ import {Injectable} from '@angular/core'; import {Actions, ofType, createEffect} from '@ngrx/effects'; -import {filter, take, mergeMap, switchMap, catchError} from 'rxjs/operators'; +import {mergeMap, switchMap, catchError, map} from 'rxjs/operators'; import {ApiServerService} from '~/business-logic/api-services/server.service'; import {ServerReportStatsOptionResponse} from '~/business-logic/model/server/serverReportStatsOptionResponse'; import {setUsageStats, updateUsageStats} from '../actions/usage-stats.actions'; @@ -16,20 +16,18 @@ export class UserEffects { constructor(private actions: Actions, private userService: ApiUsersService, private serverService: ApiServerService) {} - setUser$ = createEffect(() => this.actions.pipe( - ofType(fetchCurrentUser), - filter(user => !!user), - take(1), - mergeMap(() => this.serverService.serverReportStatsOption({}) - .pipe( - switchMap((options: ServerReportStatsOptionResponse) => [setUsageStats({ - allowed: options.enabled, - currVersion: options.current_version, - allowedVersion: options.enabled_version - })]) - ) - ) - )); + setUser$ = createEffect(() => { + return this.actions.pipe( + ofType(fetchCurrentUser), + mergeMap(() => this.serverService.serverReportStatsOption({})), + switchMap((options: ServerReportStatsOptionResponse) => [setUsageStats({ + supported: options.supported, + allowed: options.enabled, + currVersion: options.current_version, + allowedVersion: options.enabled_version + })]) + ); + }); setStatsPref$ = createEffect( () => this.actions.pipe( @@ -38,6 +36,7 @@ export class UserEffects { (action) => this.serverService.serverReportStatsOption({enabled: action.allowed}) .pipe( switchMap((options: ServerReportStatsOptionResponse) => [setUsageStats({ + supported: options.supported, allowed: options.enabled, currVersion: options.current_version, allowedVersion: options.enabled_version @@ -52,10 +51,10 @@ export class UserEffects { // eslint-disable-next-line @typescript-eslint/naming-convention mergeMap(() => this.userService.usersGetCurrentUser({get_supported_features: true}) .pipe( - switchMap((res: UsersGetCurrentUserResponse) => [setCurrentUser({ + map((res: UsersGetCurrentUserResponse) => setCurrentUser({ user: res.user, gettingStarted: res.getting_started as unknown as GettingStarted, settings: res.settings - })]), + })), catchError(error => [requestFailed(error)]) ) ) diff --git a/src/app/core/reducers/auth.reducers.ts b/src/app/core/reducers/auth.reducers.ts new file mode 100644 index 00000000..22386a29 --- /dev/null +++ b/src/app/core/reducers/auth.reducers.ts @@ -0,0 +1,12 @@ +import {commonAuthReducer, initAuth, selectAuth} from '@common/core/reducers/common-auth-reducer'; +import {createReducer, createSelector} from '@ngrx/store'; + +const extraCredentials = []; + +// eslint-disable-next-line @typescript-eslint/no-unused-vars +export const selectExtraCredentials = createSelector(selectAuth, state => extraCredentials); + +export const authReducer = createReducer( + initAuth, + ...commonAuthReducer +); diff --git a/src/app/core/reducers/usage-stats.reducer.ts b/src/app/core/reducers/usage-stats.reducer.ts index 39296f73..3f591861 100644 --- a/src/app/core/reducers/usage-stats.reducer.ts +++ b/src/app/core/reducers/usage-stats.reducer.ts @@ -1,10 +1,11 @@ -import {Action, createReducer, on, createSelector} from '@ngrx/store'; +import {createReducer, on, createSelector} from '@ngrx/store'; import {setUsageStats} from '../actions/usage-stats.actions'; export const userStatsFeatureKey = 'userStats'; export interface UsageStatState { + supported: boolean; allowed: boolean; currVersion: string; allowedVersion: string; @@ -12,19 +13,20 @@ export interface UsageStatState { export const initialState: UsageStatState = { + supported: null, allowed: null, currVersion: '', allowedVersion: '' }; -const _statsReducer = createReducer(initialState, +export const usageStatsReducer = createReducer( + initialState, on(setUsageStats, (state: UsageStatState, newState) => ({...state, ...newState})) ); -export const usageStatsReducer = (state = initialState, action: Action) => _statsReducer(state, action); - -export const selectSendStats = state => state.userStatsFeatureKey; +export const selectSendStats = state => state[userStatsFeatureKey] as UsageStatState; +export const selectStatsSupported = createSelector(selectSendStats, (state) => state.supported); export const selectAllowed = createSelector(selectSendStats, (state) => state?.allowed); export const selectCurrentVersion = createSelector(selectSendStats, (state) => state?.currVersion); export const selectAllowedVersion = createSelector(selectSendStats, (state) => state?.allowedVersion); diff --git a/src/app/features/dashboard/dashboard.component.ts b/src/app/features/dashboard/dashboard.component.ts index fdab2df5..e36a898e 100755 --- a/src/app/features/dashboard/dashboard.component.ts +++ b/src/app/features/dashboard/dashboard.component.ts @@ -1,9 +1,9 @@ import {Component, inject, OnDestroy, OnInit} from '@angular/core'; -import {Subscription} from 'rxjs'; +import {Subscription, combineLatest} from 'rxjs'; import {Store} from '@ngrx/store'; import {ActivatedRoute, Router} from '@angular/router'; -import {selectShowOnlyUserWork} from '@common/core/reducers/users-reducer'; -import {filter, skip, take} from 'rxjs/operators'; +import {selectCurrentUser, selectShowOnlyUserWork} from '@common/core/reducers/users-reducer'; +import {debounceTime, filter, take} from 'rxjs/operators'; import {setDeep} from '@common/core/actions/projects.actions'; import {getRecentProjects, getRecentExperiments} from '@common/dashboard/common-dashboard.actions'; import {selectFirstLogin} from '@common/core/reducers/view.reducer'; @@ -29,7 +29,6 @@ export class DashboardComponent implements OnInit, OnDestroy { public recentTasks$ = this.store.select(selectRecentTasks); public width: number; private welcomeSub: Subscription; - private subscriptions = new Subscription(); constructor() { this.store.dispatch(initSearch({payload: 'Search for all'})); @@ -41,12 +40,19 @@ export class DashboardComponent implements OnInit, OnDestroy { ) .subscribe(() => this.router.navigate(['search'], {relativeTo: this.activatedRoute, queryParamsHandling: 'preserve'})); - this.subscriptions.add(this.store.select(selectShowOnlyUserWork).pipe( - skip(1), - ).subscribe(() => { - this.store.dispatch(getRecentProjects()); - this.store.dispatch(getRecentExperiments()); - })); + combineLatest([ + this.store.select(selectShowOnlyUserWork), + this.store.select(selectCurrentUser) + ]) + .pipe( + debounceTime(100), + takeUntilDestroyed(), + filter(([, user]) => !!user), + ) + .subscribe(() => { + this.store.dispatch(getRecentProjects()); + this.store.dispatch(getRecentExperiments()); + }); this.welcomeSub = this.store.select(selectFirstLogin) .pipe( diff --git a/src/app/features/datasets/datasets.module.ts b/src/app/features/datasets/datasets.module.ts index 73a9fa80..bd7f0a54 100644 --- a/src/app/features/datasets/datasets.module.ts +++ b/src/app/features/datasets/datasets.module.ts @@ -9,6 +9,8 @@ import {ProjectsSharedModule} from '~/features/projects/shared/projects-shared.m import {LabeledFormFieldDirective} from '@common/shared/directive/labeled-form-field.directive'; import {ButtonToggleComponent} from '@common/shared/ui-components/inputs/button-toggle/button-toggle.component'; import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; +import {PushPipe} from '@ngrx/component'; +import {DotsLoadMoreComponent} from '@common/shared/ui-components/indicators/dots-load-more/dots-load-more.component'; @NgModule({ @@ -21,7 +23,9 @@ import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indic ProjectsSharedModule, LabeledFormFieldDirective, ButtonToggleComponent, - ShowTooltipIfEllipsisDirective + ShowTooltipIfEllipsisDirective, + PushPipe, + DotsLoadMoreComponent ], declarations: [ SimpleDatasetsComponent, 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 2d43f913..168ffc12 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 @@ -4,7 +4,7 @@ border-bottom: 1px solid #efefef; &.minimized { - grid-template-columns: 0 1fr 60px; + grid-template-columns: 0 1fr 90px; } @media(max-width: 1200px) { @@ -14,4 +14,4 @@ sm-router-tab-nav-bar { overflow: hidden; -} \ No newline at end of file +} 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 4c8f9cc2..0e2abbe2 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,4 +1,4 @@ -import {Component, Input} from '@angular/core'; +import {Component, computed} from '@angular/core'; import {ExperimentMenuComponent} from '@common/experiments/shared/components/experiment-menu/experiment-menu.component'; @Component({ @@ -7,8 +7,5 @@ import {ExperimentMenuComponent} from '@common/experiments/shared/components/exp styleUrls: ['../../../../webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.scss'] }) export class ExperimentMenuExtendedComponent extends ExperimentMenuComponent{ - set contextMenu(data) {} - get contextMenu() { - return this; - } + 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 e2e2255a..666e2341 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 @@ -5,32 +5,49 @@
- - - - - - - + > + + @if ((routerConfig.includes('scalar') && minimized) || !minimized ) { +
+ } + @if ((routerConfig.includes('scalar') && minimized) || !minimized ) { + +
+ @if (routerConfig.includes('scalar')) { +
+ +
+ } + @if ((metricValuesView$ | async) === false && routerConfig.includes('scalar') && minimized) { + + } +
+ @if (!minimized){ + + } - + } +
diff --git a/src/app/features/experiments/experiments.module.ts b/src/app/features/experiments/experiments.module.ts index 33a3d776..8fa6aaab 100755 --- a/src/app/features/experiments/experiments.module.ts +++ b/src/app/features/experiments/experiments.module.ts @@ -12,29 +12,62 @@ import {ExperimentCompareSharedModule} from '@common/experiments-compare/shared/ import {AngularSplitModule} from 'angular-split'; import {CommonLayoutModule} from '@common/layout/layout.module'; 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 { + 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 {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 {ExperimentArtifactsNavbarComponent} from '@common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.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'; @@ -51,7 +84,9 @@ import {MatTabsModule} from '@angular/material/tabs'; import {LabeledFormFieldDirective} from '@common/shared/directive/labeled-form-field.directive'; 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'; @@ -86,8 +121,18 @@ 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'; @NgModule({ @@ -152,13 +197,16 @@ import {SelectQueueModule} from '@common/experiments/shared/components/select-qu HesitateDirective, ShowTooltipIfEllipsisDirective, SelectQueueModule, + PushPipe, + ExperimentHeaderComponent, + ExperimentOperationsLogComponent, + ExperimentArtifactsNavbarComponent, ], declarations: [ ExperimentsComponent, ExperimentInfoExecutionComponent, ExperimentOutputComponent, ExperimentInfoNavbarComponent, - ExperimentInfoNavbarComponent, BaseClickableArtifactComponent, ExperimentInfoHeaderComponent, ExperimentInfoModelComponent, @@ -171,7 +219,6 @@ import {SelectQueueModule} from '@common/experiments/shared/components/select-qu ExperimentOutputScalarsComponent, ExperimentInfoHyperParametersComponent, ExperimentInfoHyperParametersFormContainerComponent, - ExperimentArtifactsNavbarComponent, ExperimentInfoArtifactsComponent, ExperimentHyperParamsNavbarComponent, ExperimentInfoArtifactItemComponent, diff --git a/src/app/features/experiments/shared/experiment-shared.module.ts b/src/app/features/experiments/shared/experiment-shared.module.ts index 866c1787..bd9d2fb3 100755 --- a/src/app/features/experiments/shared/experiment-shared.module.ts +++ b/src/app/features/experiments/shared/experiment-shared.module.ts @@ -3,7 +3,6 @@ import {CommonModule} from '@angular/common'; import {ExperimentConverterService} from './services/experiment-converter.service'; import { ExperimentMenuComponent } from '@common/experiments/shared/components/experiment-menu/experiment-menu.component'; import {ExperimentMenuExtendedComponent} from '../containers/experiment-menu-extended/experiment-menu-extended.component'; -import {ExperimentHeaderComponent} from '@common/experiments/dumb/experiment-header/experiment-header.component'; import {ExperimentExecutionParametersComponent} from '@common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component'; import {CloneDialogComponent} from '@common/experiments/shared/components/clone-dialog/clone-dialog.component'; import {ExperimentSystemTagsComponent} from '@common/experiments/shared/components/experiments-system-tags/experiment-system-tags.component'; @@ -79,6 +78,7 @@ import {DotsLoadMoreComponent} from '@common/shared/ui-components/indicators/dot import {ExperimentCustomColsMenuComponent} from '@common/experiments/dumb/experiment-custom-cols-menu/experiment-custom-cols-menu.component'; import {SelectMetricForCustomColComponent} from '@common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component'; import {SelectHyperParamsForCustomColComponent} from '@common/experiments/dumb/select-hyper-params-for-custom-col/select-hyper-params-for-custom-col.component'; +import {PushPipe} from '@ngrx/component'; export const experimentSyncedKeys = [ 'view.projectColumnsSortOrder', @@ -132,7 +132,6 @@ const DECLARATIONS = [ AbortAllChildrenDialogComponent, ExperimentExecutionParametersComponent, ExperimentsTableComponent, - ExperimentHeaderComponent, ExperimentOutputPlotsComponent, ]; @@ -198,6 +197,7 @@ const DECLARATIONS = [ ExperimentCustomColsMenuComponent, SelectMetricForCustomColComponent, SelectHyperParamsForCustomColComponent, + PushPipe, ], declarations : [...DECLARATIONS], providers : [ diff --git a/src/app/features/login/login.module.ts b/src/app/features/login/login.module.ts index 4e00d130..967f23f0 100644 --- a/src/app/features/login/login.module.ts +++ b/src/app/features/login/login.module.ts @@ -16,6 +16,7 @@ import {MatRadioModule} from '@angular/material/radio'; import {LoginComponent} from '@common/login/login/login.component'; import {NtkmeButtonModule} from '@ctrl/ngx-github-buttons'; import {SafePipe} from '@common/shared/pipes/safe.pipe'; +import {PushPipe} from '@ngrx/component'; @NgModule({ declarations: [LoginComponent, SignupComponent], @@ -33,7 +34,8 @@ import {SafePipe} from '@common/shared/pipes/safe.pipe'; MatInputModule, MatRadioModule, NtkmeButtonModule, - SafePipe + SafePipe, + PushPipe ] }) export class LoginModule { } 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 ae764c88..ea529015 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,5 +1,5 @@ import { Component} 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', @@ -7,8 +7,6 @@ import {ModelMenuComponent} from '../../../../webapp-common/models/containers/mo styleUrls: ['../../../../webapp-common/models/containers/model-menu/model-menu.component.scss'] }) export class ModelMenuExtendedComponent extends ModelMenuComponent { - - 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 091de85f..5e04d1b0 100755 --- a/src/app/features/projects/shared/projects-shared.module.ts +++ b/src/app/features/projects/shared/projects-shared.module.ts @@ -33,6 +33,7 @@ import {ButtonToggleComponent} from '@common/shared/ui-components/inputs/button- import {NavbarItemComponent} from '@common/shared/ui-components/panel/navbar-item/navbar-item.component'; import {SaferPipe} from '@common/shared/pipes/safe.pipe'; import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; +import {DotsLoadMoreComponent} from '@common/shared/ui-components/indicators/dots-load-more/dots-load-more.component'; const _declarations = [ ProjectCardMenuExtendedComponent, @@ -70,7 +71,8 @@ const _declarations = [ TooltipDirective, ButtonToggleComponent, NavbarItemComponent, - ShowTooltipIfEllipsisDirective + ShowTooltipIfEllipsisDirective, + DotsLoadMoreComponent ], declarations: [..._declarations, PipelinesEmptyStateComponent], exports: [..._declarations, PipelinesEmptyStateComponent] 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 new file mode 100644 index 00000000..56175b4b --- /dev/null +++ b/src/app/features/serving/empty-state/serving-empty-state.component.html @@ -0,0 +1,5 @@ +
+ + MODEL ENDPOINTS WILL APPEAR HERE + Monitor models deployed with clearml-serving +
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 new file mode 100644 index 00000000..11397702 --- /dev/null +++ b/src/app/features/serving/empty-state/serving-empty-state.component.scss @@ -0,0 +1,31 @@ +@import "variables"; + +.no-data-center { + display: flex; + flex-direction: column; + justify-content: center; + gap: 24px; + align-items: center; +} +.al-icon { + color: $blue-600; +} + +.message { + font-size: 20px; + font-weight: 500; + color: $blue-100; +} + +.sub-message { + color: $blue-250; +} + +a[href] { + color: $neon-yellow; + + &:hover { + color: $neon-yellow; + } + +} 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 new file mode 100644 index 00000000..5f915b4c --- /dev/null +++ b/src/app/features/serving/empty-state/serving-empty-state.component.ts @@ -0,0 +1,15 @@ +import { Component } from '@angular/core'; +import {RouterLink} from '@angular/router'; + +@Component({ + selector: 'sm-serving-empty-state', + standalone: true, + imports: [ + RouterLink + ], + templateUrl: './serving-empty-state.component.html', + styleUrl: './serving-empty-state.component.scss' +}) +export class ServingEmptyStateComponent { + +} diff --git a/src/app/features/settings/containers/admin/auth.reducers.ts b/src/app/features/settings/containers/admin/auth.reducers.ts deleted file mode 100644 index 952c588c..00000000 --- a/src/app/features/settings/containers/admin/auth.reducers.ts +++ /dev/null @@ -1,7 +0,0 @@ -import {commonAuthReducer, initAuth} from '@common/core/reducers/common-auth-reducer'; -import {createReducer} from '@ngrx/store'; - -export const authReducer = createReducer( - initAuth, - ...commonAuthReducer -); diff --git a/src/app/features/settings/containers/admin/create-credential-dialog/create-credential-dialog.component.html b/src/app/features/settings/containers/admin/create-credential-dialog/create-credential-dialog.component.html index c5f447e2..a8d5b083 100644 --- a/src/app/features/settings/containers/admin/create-credential-dialog/create-credential-dialog.component.html +++ b/src/app/features/settings/containers/admin/create-credential-dialog/create-credential-dialog.component.html @@ -1,6 +1,6 @@ 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 dc16b23e..ce5b6ede 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 @@ -1,25 +1,32 @@ -import {Component, Inject} from '@angular/core'; +import {ChangeDetectionStrategy, Component, inject} from '@angular/core'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import {Store} from '@ngrx/store'; import {updateCredentialLabel} from '@common/core/actions/common-auth.actions'; import {OrganizationGetUserCompaniesResponseCompanies} from '~/business-logic/model/organization/organizationGetUserCompaniesResponseCompanies'; -import {Observable} from 'rxjs'; -import {CredentialKeyExt, selectNewCredential} from '@common/core/reducers/common-auth-reducer'; +import {selectNewCredential} from '@common/core/reducers/common-auth-reducer'; +import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dialog-template/dialog-template.component'; +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'] + styleUrls: ['./create-credential-dialog.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [ + DialogTemplateComponent, + AdminDialogTemplateComponent + ] }) export class CreateCredentialDialogComponent { - public newCredential$: Observable; + private store = inject(Store); + public data = inject<{ + credentials: any; + workspace?: OrganizationGetUserCompaniesResponseCompanies + }>(MAT_DIALOG_DATA); - constructor( - @Inject(MAT_DIALOG_DATA) public data: {credentials: any; workspace?: OrganizationGetUserCompaniesResponseCompanies}, - private store: Store - ) { - this.newCredential$ = this.store.select(selectNewCredential); - } + + protected newCredential = this.store.selectSignal(selectNewCredential); updateLabel({credential, label}) { this.store.dispatch(updateCredentialLabel({credential, label})); diff --git a/src/app/features/settings/containers/admin/usage-stats/usage-stats.component.html b/src/app/features/settings/containers/admin/usage-stats/usage-stats.component.html index 2de9c0b0..d3ba2e3b 100644 --- a/src/app/features/settings/containers/admin/usage-stats/usage-stats.component.html +++ b/src/app/features/settings/containers/admin/usage-stats/usage-stats.component.html @@ -1,4 +1,4 @@ -@if(!demo) { +@if(!demo() && supported()) { Send anonymous usage data (Global setting) diff --git a/src/app/features/settings/containers/admin/usage-stats/usage-stats.component.scss b/src/app/features/settings/containers/admin/usage-stats/usage-stats.component.scss index e69de29b..c6fe529c 100644 --- a/src/app/features/settings/containers/admin/usage-stats/usage-stats.component.scss +++ b/src/app/features/settings/containers/admin/usage-stats/usage-stats.component.scss @@ -0,0 +1,3 @@ +mat-slide-toggle { + margin-bottom: 12px; +} 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 e041be68..a7d7031d 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 @@ -1,7 +1,7 @@ -import {Component, inject} from '@angular/core'; +import {Component, computed, inject} from '@angular/core'; import {MatSlideToggle, MatSlideToggleChange} from '@angular/material/slide-toggle'; import {Store} from '@ngrx/store'; -import {selectAllowed} from '~/core/reducers/usage-stats.reducer'; +import {selectAllowed, selectStatsSupported} from '~/core/reducers/usage-stats.reducer'; import { updateUsageStats } from '~/core/actions/usage-stats.actions'; import {ConfigurationService} from '@common/shared/services/configuration.service'; @@ -16,10 +16,12 @@ import {ConfigurationService} from '@common/shared/services/configuration.servic standalone: true }) export class UsageStatsComponent { - private store =inject(Store); + private store = inject(Store); + private config = inject(ConfigurationService); public shown = true; - public demo = ConfigurationService.globalEnvironment.demo; + public demo = computed(() => this.config.configuration().demo) protected allowed = this.store.selectSignal(selectAllowed); + protected supported = this.store.selectSignal(selectStatsSupported); statsChange(toggle: MatSlideToggleChange) { this.store.dispatch(updateUsageStats({allowed: toggle.checked})); 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 d8461229..c259da5d 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 @@ -1,15 +1,11 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, input} from '@angular/core'; @Component({ selector: 'sm-user-data', templateUrl: './user-data.component.html', styleUrls: ['./user-data.component.scss'] }) -export class UserDataComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } +export class UserDataComponent { + public userId = input(); } diff --git a/src/app/webapp-common/settings/webapp-configuration/webapp-configuration.component.html b/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.html similarity index 71% rename from src/app/webapp-common/settings/webapp-configuration/webapp-configuration.component.html rename to src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.html index 7870ce18..961fb75b 100644 --- a/src/app/webapp-common/settings/webapp-configuration/webapp-configuration.component.html +++ b/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.html @@ -3,7 +3,7 @@
USER PREFERENCES
- +
diff --git a/src/app/webapp-common/settings/webapp-configuration/webapp-configuration.component.scss b/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.scss similarity index 98% rename from src/app/webapp-common/settings/webapp-configuration/webapp-configuration.component.scss rename to src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.scss index eef0d322..9dbc6af8 100644 --- a/src/app/webapp-common/settings/webapp-configuration/webapp-configuration.component.scss +++ b/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.scss @@ -4,13 +4,16 @@ header { padding: 20px 24px; } + .main { padding: 0 24px; } + .section { margin: 6px 0 24px; padding-bottom: 12px; } + .title { color: $white; font-size: 16px; 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 new file mode 100644 index 00000000..df4dc99f --- /dev/null +++ b/src/app/features/settings/containers/webapp-configuration/webapp-configuration.component.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; +import {ProfilePreferencesComponent} from '@common/settings/admin/profile-preferences/profile-preferences.component'; +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' +}) +export class WebappConfigurationComponent { + +} diff --git a/src/app/features/settings/settings-routing.module.ts b/src/app/features/settings/settings-routing.module.ts index 24e419ce..e61e7efe 100644 --- a/src/app/features/settings/settings-routing.module.ts +++ b/src/app/features/settings/settings-routing.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; import {ProfileNameComponent} from '@common/settings/admin/profile-name/profile-name.component'; -import {WebappConfigurationComponent} from '@common/settings/webapp-configuration/webapp-configuration.component'; +import {WebappConfigurationComponent} from '~/features/settings/containers/webapp-configuration/webapp-configuration.component'; import {WorkspaceConfigurationComponent} from '@common/settings/workspace-configuration/workspace-configuration.component'; import {SettingsComponent} from './settings.component'; import {CrumbTypeEnum} from '@common/layout/breadcrumbs/breadcrumbs.component'; diff --git a/src/app/features/settings/settings.module.ts b/src/app/features/settings/settings.module.ts index 6aaaf154..e0fcddec 100644 --- a/src/app/features/settings/settings.module.ts +++ b/src/app/features/settings/settings.module.ts @@ -5,7 +5,7 @@ import { SettingsComponent } from '../settings/settings.component'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {SharedModule} from '~/shared/shared.module'; import {MatExpansionModule} from '@angular/material/expansion'; -import {WebappConfigurationComponent} from '@common/settings/webapp-configuration/webapp-configuration.component'; +import {WebappConfigurationComponent} from '~/features/settings/containers/webapp-configuration/webapp-configuration.component'; import {WorkspaceConfigurationComponent} from '@common/settings/workspace-configuration/workspace-configuration.component'; import {ProfileKeyStorageComponent} from '@common/settings/admin/profile-key-storage/profile-key-storage.component'; import {ProfileNameComponent} from '@common/settings/admin/profile-name/profile-name.component'; @@ -38,6 +38,8 @@ import {AdminDialogTemplateComponent} from '@common/settings/admin/admin-dialog- import {TimeAgoPipe} from '@common/shared/pipes/timeAgo'; import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; import {ProfilePreferencesComponent} from '@common/settings/admin/profile-preferences/profile-preferences.component'; +import {PushPipe} from '@ngrx/component'; +import {IdBadgeComponent} from '@common/shared/components/id-badge/id-badge.component'; @@ -48,13 +50,9 @@ import {ProfilePreferencesComponent} from '@common/settings/admin/profile-prefer UserCredentialsComponent, AdminFooterActionsComponent, AdminCredentialTableComponent, - S3AccessComponent, - CreateCredentialDialogComponent, AdminFooterComponent, ProfileNameComponent, - ProfileKeyStorageComponent, WorkspaceConfigurationComponent, - WebappConfigurationComponent, RedactedArgumentsDialogComponent ], imports: [ @@ -85,12 +83,17 @@ import {ProfilePreferencesComponent} from '@common/settings/admin/profile-prefer TimeAgoPipe, ShowTooltipIfEllipsisDirective, ProfilePreferencesComponent, + S3AccessComponent, + CreateCredentialDialogComponent, + WebappConfigurationComponent, + ProfileKeyStorageComponent, + PushPipe, + IdBadgeComponent, ], exports: [ UserCredentialsComponent, AdminFooterComponent, ProfileNameComponent, - WebappConfigurationComponent, ] }) export class SettingsModule { } diff --git a/src/app/features/settings/settings.util.ts b/src/app/features/settings/settings.util.ts new file mode 100644 index 00000000..3da49810 --- /dev/null +++ b/src/app/features/settings/settings.util.ts @@ -0,0 +1,3 @@ +import {User} from '~/business-logic/model/users/user'; + +export type SettingsUser = User; 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 8bdc249c..9136f08c 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 @@ -52,6 +52,7 @@ import {MatInputModule} from '@angular/material/input'; import {OrchestrationComponent} from "~/features/workers-and-queues/orchestration.component"; import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; import {RefreshButtonComponent} from '@common/shared/components/refresh-button/refresh-button.component'; +import {PushPipe} from '@ngrx/component'; @NgModule({ imports: [ @@ -86,7 +87,8 @@ import {RefreshButtonComponent} from '@common/shared/components/refresh-button/r TableModule, MatInputModule, ShowTooltipIfEllipsisDirective, - RefreshButtonComponent + RefreshButtonComponent, + PushPipe ], declarations: [ OrchestrationComponent, diff --git a/src/app/layout/side-nav/side-nav.component.html b/src/app/layout/side-nav/side-nav.component.html index c24d3bb9..5d98b381 100755 --- a/src/app/layout/side-nav/side-nav.component.html +++ b/src/app/layout/side-nav/side-nav.component.html @@ -2,8 +2,8 @@ logo
- -
+@if (currentUser()) { +
+ + @@ -48,12 +56,15 @@ matTooltipPosition="right">
- - - +} +@if (currentUser()) { + +} diff --git a/src/app/layout/side-nav/side-nav.component.ts b/src/app/layout/side-nav/side-nav.component.ts index 7b5c4f7d..2aa2a5b9 100755 --- a/src/app/layout/side-nav/side-nav.component.ts +++ b/src/app/layout/side-nav/side-nav.component.ts @@ -1,55 +1,35 @@ -import {selectCurrentUser} from '@common/core/reducers/users-reducer'; -import {AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, ViewChild} from '@angular/core'; +import {ChangeDetectionStrategy, Component, computed, ElementRef, inject, viewChild} from '@angular/core'; import {Store} from '@ngrx/store'; -import {selectDefaultNestedModeForFeature, selectSelectedProjectId} from '@common/core/reducers/projects.reducer'; -import {fromEvent, Observable} from 'rxjs'; -import {ConfigurationService} from '@common/shared/services/configuration.service'; +import {selectDefaultNestedModeForFeature} from '@common/core/reducers/projects.reducer'; +import {fromEvent} from 'rxjs'; +import {selectCurrentUser} from '@common/core/reducers/users-reducer'; import {searchDeactivate} from '@common/dashboard-search/dashboard-search.actions'; -import {selectRouterConfig} from '@common/core/reducers/router-reducer'; -import {map} from 'rxjs/operators'; +import {ConfigurationService} from '@common/shared/services/configuration.service'; +import {selectFirstRouterConfig} from '@common/core/reducers/router-reducer'; +import {toSignal} from '@angular/core/rxjs-interop'; @Component({ - selector : 'sm-side-nav', + selector: 'sm-side-nav', templateUrl: './side-nav.component.html', - styleUrls : ['./side-nav.component.scss'], + styleUrls: ['./side-nav.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class SideNavComponent implements AfterViewInit { - public selectedProjectId$: Observable; - currentUser: any; - environment = ConfigurationService.globalEnvironment; - public scrolling: boolean; - public defaultNestedModeForFeature$: Observable<{ [p: string]: boolean }>; - public baseRouteConfig$: Observable; - - @ViewChild('container') container: ElementRef; - - - constructor(public store: Store, private cdr: ChangeDetectorRef) { - this.selectedProjectId$ = this.store.select(selectSelectedProjectId); - this.defaultNestedModeForFeature$ = this.store.select(selectDefaultNestedModeForFeature); - this.store.select(selectCurrentUser).subscribe((res) => this.currentUser = res); - this.baseRouteConfig$ = this.store.select(selectRouterConfig).pipe(map(conf => conf?.[0])); - - fromEvent(window, 'resize').subscribe(() => { - const scrolling = this.container.nativeElement.scrollHeight > this.container.nativeElement.clientHeight; - if (scrolling !== this.scrolling) { - this.scrolling = scrolling; - this.cdr.detectChanges(); - } - this.scrolling = scrolling; - }); - } - - ngAfterViewInit(): void { - this.scrolling = this.container.nativeElement.scrollHeight > this.container.nativeElement.clientHeight; - } +export class SideNavComponent { + public store = inject(Store); + private configService = inject(ConfigurationService); + + private container = viewChild>('container'); + protected baseRouteConfig = this.store.selectSignal(selectFirstRouterConfig); + protected environment = this.configService.configuration; + protected defaultNestedModeForFeature = this.store.selectSignal(selectDefaultNestedModeForFeature); + protected currentUser = this.store.selectSignal(selectCurrentUser); + private resize = toSignal(fromEvent(window, 'resize')); + protected scrolling = computed(() => { + this.resize(); + return this.container()?.nativeElement.scrollHeight > this.container()?.nativeElement.clientHeight + }); public resetSearch() { this.store.dispatch(searchDeactivate()); } - - get guestUser(): boolean { - return this.currentUser && this.currentUser?.role === 'guest'; - } } diff --git a/src/app/shared/constants/non-common-consts.ts b/src/app/shared/constants/non-common-consts.ts index 4ab6e395..3206fc34 100644 --- a/src/app/shared/constants/non-common-consts.ts +++ b/src/app/shared/constants/non-common-consts.ts @@ -10,6 +10,8 @@ export enum EntityTypeEnum { dataset = 'version', simpleDataset = 'dataset', report = 'report', + endpoint = 'endpoint', + endpointsContainer = 'endpoints container' } export enum CircleTypeEnum { diff --git a/src/app/webapp-common/angular-notifier/src/notifier.module.ts b/src/app/webapp-common/angular-notifier/src/notifier.module.ts index cef8529c..dadc5f14 100644 --- a/src/app/webapp-common/angular-notifier/src/notifier.module.ts +++ b/src/app/webapp-common/angular-notifier/src/notifier.module.ts @@ -9,6 +9,7 @@ import {NotifierQueueService} from './services/notifier-queue.service'; import {NotifierConfigToken, NotifierService} from './services/notifier.service'; + /** * Injection Token for notifier options */ @@ -49,7 +50,7 @@ export const notifierDefaultConfigFactory = (): NotifierConfig => new NotifierCo NotifierContainerComponent ], imports: [ - CommonModule + CommonModule, ], providers: [ NotifierAnimationService, diff --git a/src/app/webapp-common/assets/fonts/trains-icons.scss b/src/app/webapp-common/assets/fonts/trains-icons.scss index 6efcb1a0..324c1b60 100644 --- a/src/app/webapp-common/assets/fonts/trains-icons.scss +++ b/src/app/webapp-common/assets/fonts/trains-icons.scss @@ -3,7 +3,7 @@ @font-face { font-family: '#{$icomoon-font-family}'; - src: url('./#{$icomoon-font-family}.ttf?luezm6') format('truetype'); + src: url('./#{$icomoon-font-family}.ttf?h2mp1v') format('truetype'); font-weight: normal; font-style: normal; font-display: block; @@ -23,9 +23,41 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } + +.al-ico-close-circle { + &:before { + content: $al-ico-close-circle; + } +} +.al-ico-bullhorn { + &:before { + content: $al-ico-bullhorn; + } +} +.al-ico-view-horizontal { + &:before { + content: $al-ico-view-horizontal; + } +} + +.al-ico-model-endpoints { + &:before { + content: $al-ico-model-endpoints; + } +} +.al-ico-vm { + &:before { + content: $al-ico-vm; + } +} +.al-ico-retry { + &:before { + content: $al-ico-retry; + } +} .al-ico-link-off { &:before { - content: $al-ico-link-off; + content: $al-ico-link-off; } } .al-ico-policy { diff --git a/src/app/webapp-common/assets/fonts/trains.ttf b/src/app/webapp-common/assets/fonts/trains.ttf index 2d3bf8b5..82c125e2 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 c1e0f476..4e3e02e0 100755 --- a/src/app/webapp-common/assets/fonts/variables.scss +++ b/src/app/webapp-common/assets/fonts/variables.scss @@ -1,6 +1,12 @@ $icomoon-font-family: "trains" !default; $icomoon-font-path: "fonts" !default; +$al-ico-close-circle: "\ea13"; +$al-ico-bullhorn: "\ea12"; +$al-ico-view-horizontal: "\ea11"; +$al-ico-model-endpoints: "\ea08"; +$al-ico-vm: "\ea0c"; +$al-ico-retry: "\ea07"; $al-ico-link-off: "\ea05"; $al-ico-policy: "\e9d5"; $al-ico-info-group: "\e944"; diff --git a/src/app/webapp-common/assets/icons/ico-aws-S3-storage.svg b/src/app/webapp-common/assets/icons/ico-aws-S3-storage.svg new file mode 100644 index 00000000..116e44b0 --- /dev/null +++ b/src/app/webapp-common/assets/icons/ico-aws-S3-storage.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/webapp-common/assets/icons/ico-aws.svg b/src/app/webapp-common/assets/icons/ico-aws.svg new file mode 100644 index 00000000..8617a295 --- /dev/null +++ b/src/app/webapp-common/assets/icons/ico-aws.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/app/webapp-common/assets/icons/ico-azure-blob-storage.svg b/src/app/webapp-common/assets/icons/ico-azure-blob-storage.svg new file mode 100644 index 00000000..95c59e04 --- /dev/null +++ b/src/app/webapp-common/assets/icons/ico-azure-blob-storage.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/app/webapp-common/assets/icons/ico-azure.svg b/src/app/webapp-common/assets/icons/ico-azure.svg new file mode 100644 index 00000000..02023028 --- /dev/null +++ b/src/app/webapp-common/assets/icons/ico-azure.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/app/webapp-common/assets/icons/ico-google-cloud-storage.svg b/src/app/webapp-common/assets/icons/ico-google-cloud-storage.svg new file mode 100644 index 00000000..ff5406c7 --- /dev/null +++ b/src/app/webapp-common/assets/icons/ico-google-cloud-storage.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/webapp-common/assets/icons/logo_minio.svg b/src/app/webapp-common/assets/icons/logo_minio.svg new file mode 100644 index 00000000..ed138e47 --- /dev/null +++ b/src/app/webapp-common/assets/icons/logo_minio.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file 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 c367edf7..fc33b933 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 @@ -22,7 +22,7 @@ [identifier]="'report-widget'" [width]="400" [xAxisType]="xaxis" - [isCompare]="true" + [isCompare]="$any(plotData)?.plotParsed?.data?.[0]?.type !== 'parcoords'" [noMargins]="true" [hideMaximize]="hideMaximize" (maximizeClicked)="maximize()"> 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 e28852b9..235ab376 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 @@ -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, convertMultiPlots, createMultiSingleValuesChart, mergeMultiMetricsGroupedVariant, prepareGraph, prepareMultiPlots, tryParseJson} from '@common/tasks/tasks.utils'; +import {_mergeVariants, allowedMergedTypes, 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'; @@ -26,7 +26,6 @@ import {MetricsPlotEvent} from '~/business-logic/model/events/metricsPlotEvent'; import {SingleGraphComponent} from '@common/shared/single-graph/single-graph.component'; import {setCurrentDebugImage} from '@common/shared/debug-sample/debug-sample.actions'; import {isFileserverUrl} from '~/shared/utils/url'; -import {MetricValueType, SelectedMetric} from '@common/experiments-compare/experiments-compare.constants'; import { ExtraTask, ParallelCoordinatesGraphComponent @@ -60,7 +59,7 @@ export interface SelectedMetricVariant extends MetricVariantResult { SingleGraphModule, DebugSampleModule, ParallelCoordinatesGraphComponent, - SingleValueSummaryTableComponent + SingleValueSummaryTableComponent, ] }) export class AppComponent implements OnInit { @@ -73,7 +72,7 @@ export class AppComponent implements OnInit { public frame: DebugSample; public plotLoaded: boolean; private environment: Environment; - public activated: boolean = false; + public activated = false; private searchParams: URLSearchParams; private otherSearchParams: URLSearchParams; public type: WidgetTypes; @@ -82,7 +81,7 @@ export class AppComponent implements OnInit { protected signIsNeeded$ = this.store.selectSignal(appFeature.selectSignIsNeeded); protected noPermissions$ = this.store.selectSignal(appFeature.selectNoPermissions); public isDarkTheme: boolean; - public externalTool: boolean = false; + public externalTool = false; public parcoordsData: { experiments: ExtraTask[]; params: string[]; metrics: SelectedMetricVariant[] }; @ViewChild(SingleGraphComponent) 'singleGraph': SingleGraphComponent; public singleValueData: EventsGetTaskSingleValueMetricsResponseValues[]; @@ -176,12 +175,12 @@ export class AppComponent implements OnInit { if (plotParsed.data[0] && !plotParsed.data[0].name) { plotParsed.data[0].name = plot.variant; } - if (groupedPlots[metric] && ['scatter', 'bar'].includes(plotParsed?.data?.[0]?.type) && previousPlotIsMergable) { + if (groupedPlots[metric] && allowedMergedTypes.includes(plotParsed?.data?.[0]?.type) && previousPlotIsMergable) { groupedPlots[metric].plotParsed = {...groupedPlots[metric].plotParsed, data: _mergeVariants(groupedPlots[metric].plotParsed.data, plotParsed.data)}; } else { groupedPlots[metric] = {...plot, plotParsed}; } - previousPlotIsMergable = index > -1 || (index === -1 && ['scatter', 'bar'].includes(plotParsed.data[0]?.type)); + previousPlotIsMergable = index > -1 || (index === -1 && allowedMergedTypes.includes(plotParsed.data[0]?.type)); }); }); return groupedPlots; @@ -295,8 +294,9 @@ export class AppComponent implements OnInit { if (isFileserverUrl(sample.url) && this.searchParams.get('company')) { url.searchParams.append('tenant', this.searchParams.get('company')); } - this.store.dispatch(getSignedUrl({url: url.toString()})); - this.store.select(selectSignedUrl(url.toString())) + const urlDecoded = decodeURI(url.toString()); // decodeURI and not decodeURIComponent + this.store.dispatch(getSignedUrl({url: urlDecoded})); + this.store.select(selectSignedUrl(urlDecoded)) .pipe( filter(signed => !!signed?.signed), map(({signed: signedUrl}) => signedUrl), diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.config.ts b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.config.ts index 1f232fe3..6ee72d51 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.config.ts +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.config.ts @@ -1,16 +1,16 @@ -import {ApplicationConfig, importProvidersFrom} from '@angular/core'; +import {ApplicationConfig, importProvidersFrom, provideExperimentalZonelessChangeDetection} from '@angular/core'; import {StoreModule} from '@ngrx/store'; import {EffectsModule} from '@ngrx/effects'; import {appFeature} from '@common/clearml-applications/report-widgets/src/app/app.reducer'; -import {authReducer} from '~/features/settings/containers/admin/auth.reducers'; +import {authReducer} from '~/core/reducers/auth.reducers'; import {AppEffects} from '@common/clearml-applications/report-widgets/src/app/app.effects'; import {extCoreConfig} from '@common/clearml-applications/report-widgets/src/build'; import {provideHttpClient} from '@angular/common/http'; -import {BaseAdminService} from '@common/settings/admin/base-admin.service'; import {ApiEventsService} from '~/business-logic/api-services/events.service'; import {SmApiRequestsService} from '~/business-logic/api-services/api-requests.service'; import {ColorHashService} from '@common/shared/services/color-hash/color-hash.service'; import {provideAnimations} from '@angular/platform-browser/animations'; +import {BaseAdminService} from '@common/settings/admin/base-admin.service'; export const appConfig: ApplicationConfig = { providers: [ @@ -18,11 +18,13 @@ export const appConfig: ApplicationConfig = { StoreModule.forRoot({}), StoreModule.forFeature(appFeature), StoreModule.forFeature({name: 'auth', reducer: authReducer}), + // StoreModule.forFeature({name: 'users', reducer: usersReducer}), EffectsModule.forRoot([AppEffects]) ), ...extCoreConfig, provideAnimations(), provideHttpClient(), + provideExperimentalZonelessChangeDetection(), BaseAdminService, ApiEventsService, SmApiRequestsService, 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 b403bebe..24fac04e 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 @@ -1,6 +1,7 @@ import {Injectable} from '@angular/core'; import {selectSignedUrl} from '@common/core/reducers/common-auth-reducer'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import { getParcoords, getPlot, @@ -14,7 +15,6 @@ import { import {EMPTY, mergeMap, of, switchMap} from 'rxjs'; import {Store} from '@ngrx/store'; import {catchError, filter} from 'rxjs/operators'; -import {BaseAdminService} from '@common/settings/admin/base-admin.service'; import {ReportsGetTaskDataResponse} from '~/business-logic/model/reports/reportsGetTaskDataResponse'; import {getSignedUrl, setSignedUrl} from '@common/core/actions/common-auth.actions'; import {SignResponse} from '@common/settings/admin/base-admin-utils'; @@ -25,6 +25,7 @@ import {requestFailed} from '@common/core/actions/http.actions'; import {Task} from '~/business-logic/model/tasks/task'; import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {ReportsApiMultiplotsResponse} from '@common/constants'; +import {BaseAdminService} from '@common/settings/admin/base-admin.service'; @Injectable() diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/styles.scss b/src/app/webapp-common/clearml-applications/report-widgets/src/styles.scss index d387edff..2fc2cd7b 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/styles.scss +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/styles.scss @@ -79,23 +79,23 @@ $sm-neon: ( // Define the palettes for your theme using the Material Design palettes available in palette.scss // (imported above). For each palette, you can optionally specify a default, lighter, and darker // hue. Available color palettes: https://material.io/design/color/ -$theme-primary: mat.define-palette(mat.$indigo-palette); -$theme-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400); +$theme-primary: mat.m2-define-palette(mat.$m2-indigo-palette); +$theme-accent: mat.m2-define-palette(mat.$m2-pink-palette, A200, A100, A400); -$sm-dark-palette-primary: mat.define-palette($sm-purple); -$sm-dark-palette-accent: mat.define-palette($sm-purple, A200, A100, A400); +$sm-dark-palette-primary: mat.m2-define-palette($sm-purple); +$sm-dark-palette-accent: mat.m2-define-palette($sm-purple, A200, A100, A400); -$sm-neon-palette-primary: mat.define-palette($sm-neon); -$sm-neon-palette-accent: mat.define-palette($sm-neon, A200, A100, A400); +$sm-neon-palette-primary: mat.m2-define-palette($sm-neon); +$sm-neon-palette-accent: mat.m2-define-palette($sm-neon, A200, A100, A400); // The warn palette is optional (defaults to red). -$theme-warn: mat.define-palette(mat.$red-palette); +$theme-warn: mat.m2-define-palette(mat.$m2-red-palette); $font-family-base: 'Heebo', sans-serif; // Assumes the browser default, typically `16px` -$custom-typography: mat.define-typography-config( +$custom-typography: mat.m2-define-typography-config( $font-family: $font-family-base ); // Create the theme object. A theme consists of configurations for individual // theming systems such as "color" or "typography". -$theme: mat.define-light-theme(( +$theme: mat.m2-define-light-theme(( color: ( primary: $theme-primary, accent: $theme-accent, @@ -105,7 +105,7 @@ $theme: mat.define-light-theme(( density: -2 )); -$sm-neon-theme: mat.define-dark-theme(( +$sm-neon-theme: mat.m2-define-dark-theme(( color: ( primary: $sm-neon-palette-primary, accent: $sm-neon-palette-accent, @@ -114,7 +114,7 @@ $sm-neon-theme: mat.define-dark-theme(( density: -2 )); -$sm-dark-theme: mat.define-dark-theme(( +$sm-dark-theme: mat.m2-define-dark-theme(( color: ( primary: $sm-dark-palette-primary, accent: $sm-dark-palette-accent, @@ -549,3 +549,16 @@ input[type=number] { margin: 6px auto 6px -74px; } } + +.dark-theme .axis { + .domain { + stroke: $dark-grey-blue; + fill: $dark-grey-blue; + } + + .tick line{ + stroke: $dark-grey-blue; + fill: $dark-grey-blue; + stroke-opacity: 1; + } +} diff --git a/src/app/webapp-common/common-search/common-search.module.ts b/src/app/webapp-common/common-search/common-search.module.ts index 4cac0f05..278b89e4 100644 --- a/src/app/webapp-common/common-search/common-search.module.ts +++ b/src/app/webapp-common/common-search/common-search.module.ts @@ -6,6 +6,8 @@ import {searchReducer} from './common-search.reducer'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; import {SearchComponent} from '@common/shared/ui-components/inputs/search/search.component'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {PushPipe} from '@ngrx/component'; + @NgModule({ imports: [ @@ -14,6 +16,7 @@ import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/ ClickStopPropagationDirective, SearchComponent, TooltipDirective, + PushPipe, ], declarations: [CommonSearchComponent], exports : [CommonSearchComponent] 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 65d4ea56..f2b862a2 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,10 @@ - + - + diff --git a/src/app/webapp-common/common-styles.scss b/src/app/webapp-common/common-styles.scss index da91ad12..87d189b4 100644 --- a/src/app/webapp-common/common-styles.scss +++ b/src/app/webapp-common/common-styles.scss @@ -25,24 +25,24 @@ // your theme to them. This will ensure the correct values for your app are included. //@include mat.all-component-bases(/* TODO(v17): pass $your-theme here */); -$custom-typography: mat.define-typography-config( +$custom-typography: mat.m2-define-typography-config( $font-family: $font-family-base ); @include mat.typography-hierarchy($custom-typography); @include mat.all-component-typographies($custom-typography); -$allegro-palette-primary: mat.define-palette($mat-allegro); -$allegro-palette-accent: mat.define-palette($mat-allegro, A400, A100, A400); +$allegro-palette-primary: mat.m2-define-palette($mat-allegro); +$allegro-palette-accent: mat.m2-define-palette($mat-allegro, A400, A100, A400); -$sm-palette-primary: mat.define-palette($sm-purple); -$sm-palette-accent: mat.define-palette($sm-purple, A100, A200, A400); -$sm-palette-warn: mat.define-palette(mat.$purple-palette); +$sm-palette-primary: mat.m2-define-palette($sm-purple); +$sm-palette-accent: mat.m2-define-palette($sm-purple, A100, A200, A400); +$sm-palette-warn: mat.m2-define-palette(mat.$m2-purple-palette); -$sm-neon-palette-primary: mat.define-palette($sm-neon); -$sm-neon-palette-accent: mat.define-palette($sm-neon, A200, A100, A400); +$sm-neon-palette-primary: mat.m2-define-palette($sm-neon); +$sm-neon-palette-accent: mat.m2-define-palette($sm-neon, A200, A100, A400); -$dark-theme: mat.define-dark-theme(( +$dark-theme: mat.m2-define-dark-theme(( color: ( primary: $allegro-palette-primary, accent: $allegro-palette-accent @@ -51,7 +51,7 @@ $dark-theme: mat.define-dark-theme(( density: -2 )); -$light-theme: mat.define-light-theme(( +$light-theme: mat.m2-define-light-theme(( color: ( primary: $allegro-palette-primary, accent: $allegro-palette-accent @@ -59,7 +59,7 @@ $light-theme: mat.define-light-theme(( typography: $custom-typography, )); -$sm-theme: mat.define-light-theme(( +$sm-theme: mat.m2-define-light-theme(( color: ( primary: $sm-palette-primary, accent: $sm-palette-accent, @@ -68,7 +68,7 @@ $sm-theme: mat.define-light-theme(( typography: $custom-typography )); -$sm-neon-theme: mat.define-dark-theme(( +$sm-neon-theme: mat.m2-define-dark-theme(( color: ( primary: $sm-neon-palette-primary, accent: $sm-neon-palette-accent, @@ -108,6 +108,7 @@ $sm-neon-theme: mat.define-dark-theme(( @include mat.checkbox-theme($dark-theme); @include mat.list-theme($dark-theme); @include mat.stepper-theme($dark-theme); + @include mat.tabs-theme($sm-neon-theme); --mdc-typography-body1-letter-spacing: 0; --mdc-typography-button-letter-spacing: 0; @@ -149,6 +150,7 @@ $sm-neon-theme: mat.define-dark-theme(( @include mat.checkbox-color($sm-theme); @include mat.list-color($light-theme); @include mat.stepper-color($sm-theme); + @include mat.tabs-color($sm-theme); --mdc-typography-body1-letter-spacing: 0; --mdc-typography-button-letter-spacing: 0; @@ -163,10 +165,10 @@ $sm-neon-theme: mat.define-dark-theme(( --mdc-linear-progress-track-height: 12px; } - .mat-mdc-radio-button, .mat-mdc-radio-button.mat-accent { - --mdc-radio-disabled-selected-icon-color: #{$blue-300}; - --mdc-radio-disabled-unselected-icon-color: #{$blue-300}; - } + //.mat-mdc-radio-button, .mat-mdc-radio-button.mat-accent { + // --mdc-radio-disabled-selected-icon-color: #{$blue-300}; + // --mdc-radio-disabled-unselected-icon-color: #{$blue-300}; + //} .mat-drawer { border-right: solid 1px $blue-100; @@ -401,9 +403,9 @@ mat-expansion-panel { width: 16px; height: 16px; - .mdc-radio__inner-circle { - border-width: 8px; - } + //.mdc-radio__inner-circle { + // border-width: 8px; + //} } .mat-ripple.mat-radio-ripple { @@ -509,6 +511,11 @@ button { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + + &.inline { + display: inline-block; + vertical-align: middle; + } } body .ui-state-highlight .card { @@ -1042,8 +1049,7 @@ button.btn.button-outline-dark { } .cdk-drag-preview.form-group-drag { - padding: 8px 16px 32px 16px; - border-radius: 4px; + overflow: hidden; border: solid 1px $cloudy-blue; background-color: white; } diff --git a/src/app/webapp-common/constants.ts b/src/app/webapp-common/constants.ts index c917a410..35175c4e 100644 --- a/src/app/webapp-common/constants.ts +++ b/src/app/webapp-common/constants.ts @@ -16,6 +16,7 @@ export const ICONS = { MINUS: 'fa-minus', CHART: 'al-ico-info-max', QUEUED: 'al-ico-manage-queue', + RETRY: 'al-ico-retry', ENQUEUE: 'al-ico-enqueue', DEQUEUE: 'al-ico-dequeue', IN_PROGRESS: 'fa-hourglass-half', diff --git a/src/app/webapp-common/core/actions/common-auth.actions.ts b/src/app/webapp-common/core/actions/common-auth.actions.ts index 2dd7a81e..4ed86072 100755 --- a/src/app/webapp-common/core/actions/common-auth.actions.ts +++ b/src/app/webapp-common/core/actions/common-auth.actions.ts @@ -1,6 +1,7 @@ import {createAction, props} from '@ngrx/store'; import {CredentialKeyExt, Credentials} from '../reducers/common-auth-reducer'; import {GetCurrentUserResponseUserObjectCompany} from '~/business-logic/model/users/getCurrentUserResponseUserObjectCompany'; +import {SettingsUser} from '~/features/settings/settings.util'; export const AUTH_PREFIX = 'AUTH_'; @@ -16,7 +17,12 @@ export const updateS3Credential = createAction( ); export const createCredential = createAction( AUTH_PREFIX + 'CREATE_CREDENTIAL (API)', - props<{workspace: GetCurrentUserResponseUserObjectCompany; openCredentialsPopup?: boolean; label?: string; userId?: string}>() + props<{workspace: GetCurrentUserResponseUserObjectCompany; openCredentialsPopup?: boolean; label?: string; user?: SettingsUser}>() +); + +export const createCredentialPopup = createAction( + AUTH_PREFIX + 'CREATE_CREDENTIAL POPUP', + props<{workspace: GetCurrentUserResponseUserObjectCompany; openCredentialsPopup?: boolean; label?: string; user?: SettingsUser}>() ); export const updateCredentialLabel = createAction( diff --git a/src/app/webapp-common/core/actions/layout.actions.ts b/src/app/webapp-common/core/actions/layout.actions.ts index e1a14cda..d79444e5 100755 --- a/src/app/webapp-common/core/actions/layout.actions.ts +++ b/src/app/webapp-common/core/actions/layout.actions.ts @@ -95,6 +95,7 @@ export const firstLogin = createAction( ); export const neverShowPopupAgain = createAction(VIEW_PREFIX + 'NEVER_SHOW_POPUP_AGAIN', props<{ popupId: string; reset?: boolean }>()); +export const neverShowChangesAgain = createAction(VIEW_PREFIX + 'NEVER_SHOW_CHANGES_AGAIN', props<{ version: string }>()); export const setRedactedArguments = createAction(VIEW_PREFIX + 'SET_REDACTED_ARGUMENTS', props<{ redactedArguments: { key: string } [] }>()); export const setHideRedactedArguments = createAction(VIEW_PREFIX + 'SET_SHOW_REDACTED_ARGUMENTS', props<{ hide: boolean }>()); export const plotlyReady = createAction(VIEW_PREFIX + '[plotly ready]'); diff --git a/src/app/webapp-common/core/actions/router.actions.ts b/src/app/webapp-common/core/actions/router.actions.ts index 1d71ee24..b45154ec 100755 --- a/src/app/webapp-common/core/actions/router.actions.ts +++ b/src/app/webapp-common/core/actions/router.actions.ts @@ -47,7 +47,7 @@ export const setTypeBreadcrumbs = createAction( ); export const setWorkspaceNeutral = createAction( - BREADCRUMBS_PREFIX + 'SET_TYPE_BREADCRUMBS', + BREADCRUMBS_PREFIX + 'set workspace neutral', props<{ neutral: boolean }>() ); 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 994ac67c..b8eb3c54 100644 --- a/src/app/webapp-common/core/effects/common-auth.effects.ts +++ b/src/app/webapp-common/core/effects/common-auth.effects.ts @@ -18,23 +18,30 @@ import { selectSignedUrls } from '@common/core/reducers/common-auth-reducer'; import {EMPTY, forkJoin, of} from 'rxjs'; -import {S3AccessDialogData, S3AccessResolverComponent} from '@common/layout/s3-access-resolver/s3-access-resolver.component'; +import { + S3AccessDialogData, + S3AccessDialogResult, + S3AccessResolverComponent +} from '@common/layout/s3-access-resolver/s3-access-resolver.component'; import {MatDialog} from '@angular/material/dialog'; import {isGoogleCloudUrl, SignResponse} from '@common/settings/admin/base-admin-utils'; 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 {ErrorService} from '@common/shared/services/error.service'; @Injectable() export class CommonAuthEffects { private signAfterPopup: Action[] = []; - private openPopup: { [bucketName: string]: boolean } = {}; + private openPopup: Record = {}; constructor( private actions: Actions, private credentialsApi: ApiAuthService, private store: Store, private adminService: AdminService, + private errorService: ErrorService, private matDialog: MatDialog ) { } @@ -60,7 +67,7 @@ export class CommonAuthEffects { revokeCredential = createEffect(() => this.actions.pipe( ofType(authActions.credentialRevoked), concatLatestFrom(() => [ - this.store.select(selectRouterQueryParams).pipe(map(params => params.userId)), + this.store.select(selectRouterQueryParams).pipe(map(params => params.userId)) ]), mergeMap(([action, userId]) => this.credentialsApi.authRevokeCredentials( {access_key: action.accessKey}, {userId}).pipe( @@ -79,18 +86,18 @@ export class CommonAuthEffects { createCredential = createEffect(() => this.actions.pipe( ofType(authActions.createCredential), concatLatestFrom(() => [ - this.store.select(selectRouterQueryParams).pipe(map(params => params.userId)), + this.store.select(selectRouterQueryParams).pipe(map(params => params.userId)) ]), mergeMap(([action, userId]) => - this.credentialsApi.authCreateCredentials({label: action.label}, - {userId}).pipe( + this.credentialsApi.authCreateCredentials({label: action.label}, {userId}).pipe( mergeMap(({credentials}) => [ authActions.addCredential({newCredential: credentials, workspaceId: action.workspace?.id}), + ...(action.openCredentialsPopup && [authActions.createCredentialPopup({...action})] || []), deactivateLoader(action.type) ]), catchError(error => [ requestFailed(error), - setServerError(error, null, 'Unable to create credentials'), + setServerError(error, null, this.errorService.getErrorMsg(error?.error)), authActions.addCredential({newCredential: {}, workspaceId: action.workspace?.id}), deactivateLoader(action.type)]) )) @@ -99,7 +106,7 @@ export class CommonAuthEffects { updateCredentialLabel = createEffect(() => this.actions.pipe( ofType(authActions.updateCredentialLabel), concatLatestFrom(() => this.store.select(selectRouterQueryParams).pipe(map(params => params.userId))), - // eslint-disable-next-line @typescript-eslint/naming-convention + mergeMap(([action, userId]) => this.credentialsApi.authEditCredentials({access_key: action.credential.access_key, label: action.label}, {userId}).pipe( @@ -124,6 +131,12 @@ export class CommonAuthEffects { signUrl = createEffect(() => this.actions.pipe( ofType(authActions.getSignedUrl), + switchMap(action => this.store.select(selectExtraCredentials) + .pipe( + filter(c => c !== null), + map(() => action) + ) + ), filter(action => !!action.url), mergeMap(action => of(action).pipe( @@ -158,11 +171,25 @@ export class CommonAuthEffects { return this.actions.pipe( ofType(authActions.signUrls), filter(action => action.sign.length > 0), - concatLatestFrom(() => this.store.select(selectSignedUrls)), + switchMap(action => this.store.select(selectExtraCredentials) + .pipe( + filter(c => c !== null), + map(() => action) + ) + ), + concatLatestFrom(() => [ + this.store.select(selectSignedUrls) + ]), mergeMap(([action, prevSigns]) => forkJoin(action.sign.map(req => of(action).pipe( - switchMap(() => this.adminService.signUrlIfNeeded(req.url, req.config, prevSigns[req.url])), + 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'})), map(res => ({res, orgUrl: req.url})) ) )).pipe( @@ -189,8 +216,10 @@ export class CommonAuthEffects { })]; } case 'sign': - return setSignedUrls({signed: groups['sign'].map((res: {res: SignResponse, orgUrl: string}) => - ({url: res.orgUrl, signed: res.res.signed, expires: res.res.expires}))}); + return setSignedUrls({ + signed: groups['sign'].map((res: { res: SignResponse, orgUrl: string }) => + ({url: res.orgUrl, signed: res.res.signed, expires: res.res.expires})) + }); default: return null; } @@ -199,8 +228,8 @@ export class CommonAuthEffects { .flat(); }) ) - ), - ) + ) + ); }); s3popup = createEffect(() => this.actions.pipe( @@ -215,23 +244,26 @@ export class CommonAuthEffects { if (action?.credentials?.Bucket) { this.openPopup[action.credentials.Bucket] = true; } - return this.matDialog.open(S3AccessResolverComponent, {data: action as S3AccessDialogData, maxWidth: 700}).afterClosed().pipe( - concatLatestFrom(() => this.store.select(selectS3BucketCredentialsBucketCredentials)), - switchMap(([data, bucketCredentials]) => { - const actions = [...this.signAfterPopup]; - this.signAfterPopup = []; - if (data) { - if (!data.success) { - const emptyCredentials = bucketCredentials.find((cred => cred?.Bucket === data.bucket)) === undefined; - const dontAskAgainForBucketName = emptyCredentials ? '' : data.bucket + data.endpoint; - return [authActions.cancelS3Credentials({dontAskAgainForBucketName})]; + return this.matDialog.open( + S3AccessResolverComponent, {data: action, maxWidth: 700} + ).afterClosed() + .pipe( + concatLatestFrom(() => this.store.select(selectS3BucketCredentialsBucketCredentials)), + switchMap(([data, bucketCredentials]) => { + const actions = [...this.signAfterPopup]; + this.signAfterPopup = []; + if (data) { + if (!data.success) { + const emptyCredentials = bucketCredentials.find((cred => cred?.Bucket === data.Bucket)) === undefined; + const dontAskAgainForBucketName = emptyCredentials ? '' : data.Bucket + data.Endpoint; + return [authActions.cancelS3Credentials({dontAskAgainForBucketName})]; + } + return [authActions.saveS3Credentials({newCredential: data}), ...actions]; } - return [authActions.saveS3Credentials({newCredential: data}), ...actions]; - } - return actions; - }), - finalize(() => action?.credentials?.Bucket && delete this.openPopup[action.credentials.Bucket]) - ); + return actions; + }), + finalize(() => action?.credentials?.Bucket && delete this.openPopup[action.credentials.Bucket]) + ); }) )); } diff --git a/src/app/webapp-common/core/effects/projects.effects.ts b/src/app/webapp-common/core/effects/projects.effects.ts index 810ebc2b..aaaf3673 100755 --- a/src/app/webapp-common/core/effects/projects.effects.ts +++ b/src/app/webapp-common/core/effects/projects.effects.ts @@ -1,7 +1,9 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {ApiProjectsService} from '~/business-logic/api-services/projects.service'; +import {ProjectsGetAllExResponse} from '~/business-logic/model/projects/projectsGetAllExResponse'; import * as actions from '../actions/projects.actions'; import { downloadForGetAll, @@ -112,17 +114,19 @@ export class ProjectsEffects { order_by: ['name'], only_fields: ['name', 'company'], search_hidden: showHidden, - _any_: {pattern: escapeRegex(action.searchString), fields: ['name']}, + _any_: {pattern: escapeRegex(action.searchString), fields: ['name', 'id']}, scroll_id: !!action.loadMore && scrollId ? scrollId : null } as ProjectsGetAllExRequest), !action.loadMore && action.searchString?.length > 2 ? this.projectsApi.projectsGetAllEx({ - page_size: 1, only_fields: ['name', 'company'], search_hidden: showHidden, _any_: {pattern: `^${escapeRegex(action.searchString)}$`, fields: ['name', 'id']}, /* eslint-enable @typescript-eslint/naming-convention */ - } as ProjectsGetAllExRequest).pipe(map(res => res.projects)) : + } as ProjectsGetAllExRequest) + .pipe( + map((res: ProjectsGetAllExResponse) => res.projects.filter(project => project.name === action.searchString)), + ) : of([]), !action.loadMore && filters['project.name']?.value.length ? this.projectsApi.projectsGetAllEx({ diff --git a/src/app/webapp-common/core/reducers/common-auth-reducer.ts b/src/app/webapp-common/core/reducers/common-auth-reducer.ts index 2ca788ee..78f09f6b 100755 --- a/src/app/webapp-common/core/reducers/common-auth-reducer.ts +++ b/src/app/webapp-common/core/reducers/common-auth-reducer.ts @@ -50,7 +50,7 @@ export const initAuth: AuthState = { s3BucketCredentials: { bucketCredentials: [] }, - signedUrls: {} + signedUrls: {}, }; export const selectAuth = state => state.auth as AuthState; diff --git a/src/app/webapp-common/core/reducers/projects.reducer.ts b/src/app/webapp-common/core/reducers/projects.reducer.ts index 41fad8ae..70821944 100755 --- a/src/app/webapp-common/core/reducers/projects.reducer.ts +++ b/src/app/webapp-common/core/reducers/projects.reducer.ts @@ -12,6 +12,7 @@ import {uniqBy} from 'lodash-es'; import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {isReadOnly} from '@common/shared/utils/is-read-only'; import {selectProjectType} from '@common/core/reducers/view.reducer'; +import {ConfigurationService} from '@common/shared/services/configuration.service' export interface ScatterPlotPoint { @@ -263,6 +264,6 @@ export const selectShowHidden = createSelector(projects, selectSelectedProject, (state, selectedProject) => (state?.showHidden || selectedProject?.system_tags?.includes('hidden'))); export const selectHideExamples = createSelector(projects, state => state?.hideExamples); -export const selectBlockUserScript = createSelector(projects, state => state?.blockUserScript); +export const selectBlockUserScript = createSelector(projects, state => ConfigurationService.globalEnvironment?.blockUserScript || state?.blockUserScript); export const selectDefaultNestedModeForFeature = createSelector(projects, state => state?.defaultNestedModeForFeature); export const selectProjectsOptionsScrollId = createSelector(projects, state => state?.projectsOptionsScrollId); diff --git a/src/app/webapp-common/core/reducers/router-reducer.ts b/src/app/webapp-common/core/reducers/router-reducer.ts index 619f906c..d49aea5e 100755 --- a/src/app/webapp-common/core/reducers/router-reducer.ts +++ b/src/app/webapp-common/core/reducers/router-reducer.ts @@ -26,6 +26,8 @@ export const selectRouterParams = createSelector(selectRouter, router => router export const selectRouterQueryParams = createSelector(selectRouter, router => router && router.queryParams); export const selectRouterConfig = createSelector(selectRouter, router => router && router.config); export const selectRouterData = createSelector(selectRouter, router => router && router.data); +export const selectFirstRouterConfig = createSelector(selectRouterConfig, config => config?.[0]); + export const routerReducer = createReducer(initRouter, on(setRouterSegments, (state, action): RouterState => ({ diff --git a/src/app/webapp-common/core/reducers/users-reducer.ts b/src/app/webapp-common/core/reducers/users-reducer.ts index 9c350f2d..ec04df77 100755 --- a/src/app/webapp-common/core/reducers/users-reducer.ts +++ b/src/app/webapp-common/core/reducers/users-reducer.ts @@ -35,14 +35,14 @@ export const initUsers: UsersState = { showOnlyUserWork: {}, serverVersions: null, gettingStarted: null, - settings: null, + settings: null }; export const users = state => state.users as UsersState; export const selectSettings = createSelector(users, (state) => state?.settings); export const selectMaxDownloadItems = createSelector(selectSettings, (state): number => state?.max_download_items ?? 1000); export const selectCurrentUser = createSelector(users, state => state.currentUser); -export const selectIsAdmin = createSelector(users, state => state.currentUser.role === RoleEnum.Admin); +export const selectIsAdmin = createSelector(users, state => state.currentUser?.role === RoleEnum.Admin); export const selectActiveWorkspace = createSelector(users, state => state.activeWorkspace); export const selectActiveWorkspaceTier = createSelector(selectActiveWorkspace, workspace => workspace?.tier); export const selectUserWorkspaces = createSelector(users, state => state.userWorkspaces); @@ -57,7 +57,19 @@ export const selectWorkspaceOwner = createSelector(selectActiveWorkspace, select } return null; }); -export const selectShowOnlyUserWork = createSelector(users, selectProjectType, (state, projectType) => projectType? state.showOnlyUserWork[projectType]: false); +export const selectIsAdminInActiveWorkspace = createSelector(selectCurrentUser, selectIsAdmin, selectActiveWorkspace, selectUserWorkspaces, + (user, isAdmin, active, workspaces) => { + if (active) { + if (workspaces?.length > 1) { + const activeWs = workspaces?.find(ws => ws.id === active.id); + return activeWs?.owners?.some(owner => owner.id === user.id); + } else { + return isAdmin; + } + } + return false; + }); +export const selectShowOnlyUserWork = createSelector(users, selectProjectType, (state, projectType) => projectType ? state.showOnlyUserWork[projectType] : false); export const usersReducerFunctions = [ on(fetchCurrentUser, state => ({...state})), diff --git a/src/app/webapp-common/core/reducers/view.reducer.ts b/src/app/webapp-common/core/reducers/view.reducer.ts index c5c82df3..62fc608d 100644 --- a/src/app/webapp-common/core/reducers/view.reducer.ts +++ b/src/app/webapp-common/core/reducers/view.reducer.ts @@ -26,6 +26,7 @@ export interface ViewState { firstLogin: boolean; firstLoginAt: number; neverShowPopupAgain: string[]; + neverShowChangesAgain: string; plotlyReady: boolean; aceReady: boolean; aceCaretPosition: { [key: string]: Ace.Point }; @@ -54,6 +55,7 @@ export const initViewState: ViewState = { firstLogin: false, firstLoginAt: +(window?.localStorage?.getItem('firstLogin') || 0), neverShowPopupAgain: [], + neverShowChangesAgain: null, plotlyReady: false, aceReady: false, aceCaretPosition: {}, @@ -92,6 +94,7 @@ export const selectPlotlyReady = createSelector(views, state => state.plotlyRead export const selectAceReady = createSelector(views, state => state.aceReady); export const selectAceCaretPosition = createSelector(views, state => state.aceCaretPosition); export const selectNeverShowPopups = createSelector(views, (state): string[] => state.neverShowPopupAgain); +export const selectNeverShowAppChanges = createSelector(views, (state): string => state.neverShowChangesAgain); export const selectRedactedArguments = createSelector(views, (state): { key: string }[] => state.redactedArguments); export const selectHideRedactedArguments = createSelector(views, (state): { key: string @@ -160,6 +163,10 @@ export const viewReducers = [ ...state, neverShowPopupAgain: action.reset ? state.neverShowPopupAgain.filter(popups => popups !== action.popupId) : Array.from(new Set([...state.neverShowPopupAgain, action.popupId])) })), + on(layoutActions.neverShowChangesAgain, (state, action) => ({ + ...state, + neverShowChangesAgain: action.version + })), on(setBreadcrumbs, (state, action): ViewState => ({ ...state, breadcrumbs: action.breadcrumbs, ...(action.workspaceNeutral !== undefined && {workspaceNeutral: action.workspaceNeutral}) })), diff --git a/src/app/webapp-common/core/services/auth.service.ts b/src/app/webapp-common/core/services/auth.service.ts deleted file mode 100755 index 57dc5e24..00000000 --- a/src/app/webapp-common/core/services/auth.service.ts +++ /dev/null @@ -1,27 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Observable, of} from 'rxjs'; -import {SmApiRequestsService} from '../../../business-logic/api-services/api-requests.service'; -import {catchError, map} from 'rxjs/operators'; -import {ConfigurationService} from '../../shared/services/configuration.service'; - - -@Injectable() -export class AuthService { - - constructor(private apiRequest: SmApiRequestsService) { - } - - public isAuthenticated(): Observable { - // for localhost... - const environment = ConfigurationService.globalEnvironment; - if (!environment.production) { - return of(true); - } - - return this.apiRequest.createRequest({meta: {method: 'GET', endpoint: 'debug.ping_auth'}}) - .pipe( - map(res => res.meta.result_code !== 401), - catchError(err => of(err.status !== 401)) - ); - } -} 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 e730488a..63ad804c 100644 --- a/src/app/webapp-common/dashboard-search/dashboard-search.effects.ts +++ b/src/app/webapp-common/dashboard-search/dashboard-search.effects.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {activeLoader, deactivateLoader} from '../core/actions/layout.actions'; import { getCurrentPageResults, diff --git a/src/app/webapp-common/dashboard/common-dashboard.effects.ts b/src/app/webapp-common/dashboard/common-dashboard.effects.ts index e48d312c..b1eea665 100755 --- a/src/app/webapp-common/dashboard/common-dashboard.effects.ts +++ b/src/app/webapp-common/dashboard/common-dashboard.effects.ts @@ -1,6 +1,7 @@ import {Injectable} from '@angular/core'; import {ApiProjectsService} from '~/business-logic/api-services/projects.service'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {requestFailed} from '../core/actions/http.actions'; import {activeLoader, deactivateLoader} from '../core/actions/layout.actions'; import { @@ -12,7 +13,7 @@ import { import {CARDS_IN_ROW} from './common-dashboard.const'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; import {ProjectsGetAllExRequest} from '~/business-logic/model/projects/projectsGetAllExRequest'; -import {catchError, mergeMap, map, switchMap} from 'rxjs/operators'; +import {catchError, mergeMap, map, switchMap, debounceTime} from 'rxjs/operators'; import {ApiLoginService} from '~/business-logic/api-services/login.service'; import {Store} from '@ngrx/store'; import {ErrorService} from '../shared/services/error.service'; @@ -29,7 +30,7 @@ export class CommonDashboardEffects { ) {} /* eslint-disable @typescript-eslint/naming-convention */ activeLoader = createEffect(() => this.actions.pipe( - ofType(getRecentProjects, getRecentExperiments), + ofType(getRecentExperiments), map(action => activeLoader(action.type)) )); diff --git a/src/app/webapp-common/dashboard/common-dashboard.module.ts b/src/app/webapp-common/dashboard/common-dashboard.module.ts index e09e8d6f..9990b70a 100644 --- a/src/app/webapp-common/dashboard/common-dashboard.module.ts +++ b/src/app/webapp-common/dashboard/common-dashboard.module.ts @@ -22,6 +22,7 @@ import {OverflowsDirective} from '@common/shared/ui-components/directives/overfl import {TableModule} from 'primeng/table'; import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; + @NgModule({ declarations: [DashboardProjectsComponent, DashboardExperimentsComponent, RecentExperimentTableComponent], exports: [DashboardProjectsComponent, DashboardExperimentsComponent], @@ -41,7 +42,7 @@ import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indic TableComponent, OverflowsDirective, TableModule, - ShowTooltipIfEllipsisDirective + ShowTooltipIfEllipsisDirective, ] }) export class CommonDashboardModule { 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 5955cc12..2aa2ddcd 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 @@ -1,28 +1,18 @@ -import {Component, inject, Input} from '@angular/core'; -import { Router } from '@angular/router'; -import { Store } from '@ngrx/store'; -import { IRecentTask} from '../../common-dashboard.reducer'; -import {getRecentExperiments} from '../../common-dashboard.actions'; -import { ITask } from '~/business-logic/model/al-task'; -import {selectCurrentUser} from '@common/core/reducers/users-reducer'; -import {filter, take} from 'rxjs/operators'; +import {ChangeDetectionStrategy, Component, inject, Input} from '@angular/core'; +import {Router} from '@angular/router'; +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'] + styleUrls: ['./dashboard-experiments.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush }) export class DashboardExperimentsComponent { - private store = inject(Store); private router = inject(Router); @Input() recentTasks: IRecentTask[]; - constructor() { - this.store.select(selectCurrentUser) - .pipe(filter(user => !!user), take(1)) - .subscribe(() => this.store.dispatch((getRecentExperiments()))); - } - public taskSelected(task: IRecentTask | ITask) { const projectId = task.project ? task.project.id : '*'; return this.router.navigate(['projects', projectId, 'experiments', task.id]); 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 a80eab6b..94fba8a0 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 @@ -1,10 +1,4 @@ -import { - Component, - Output, - EventEmitter, - ElementRef, - inject, viewChild, effect -} from '@angular/core'; +import {Component, effect, ElementRef, EventEmitter, inject, Output, viewChild} from '@angular/core'; import {Router} from '@angular/router'; import {MatDialog, MatDialogRef} from '@angular/material/dialog'; import {fromEvent} from 'rxjs'; @@ -14,10 +8,9 @@ import {selectRecentProjects, selectRecentProjectsCount} from '../../common-dash import {getRecentProjects} from '../../common-dashboard.actions'; import {ProjectDialogComponent} from '@common/shared/project-dialog/project-dialog.component'; import {resetSelectedProject, setSelectedProjectId} from '@common/core/actions/projects.actions'; -import {selectCurrentUser} from '@common/core/reducers/users-reducer'; -import {filter, take, throttleTime} from 'rxjs/operators'; +import {throttleTime} from 'rxjs/operators'; import {isExample} from '@common/shared/utils/shared-utils'; -import { CARDS_IN_ROW } from '../../common-dashboard.const'; +import {CARDS_IN_ROW} from '../../common-dashboard.const'; import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; @Component({ @@ -40,9 +33,6 @@ export class DashboardProjectsComponent { constructor() { this.store.dispatch(resetSelectedProject()); - this.store.select(selectCurrentUser) - .pipe(filter(user => !!user), take(1)) - .subscribe(() => this.store.dispatch(getRecentProjects())); effect(() => { if (this.header()) { diff --git a/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.html b/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.html index 3edbcf2c..0da1f9ee 100644 --- a/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.html +++ b/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.html @@ -1,18 +1,24 @@
+ [class.selected]="selected()" data-id="processSteps">
{{step?.data?.name ?? step.name}} v{{step.data.version}}
+ >{{step?.data?.name ?? step.name}}@if (step?.data?.version) { + v{{step.data.version}} + }
-
{{step.data.job_size | filesize: fileSizeConfigStorage}}
-
- {{step.data.last_update * 1000 | timeAgo}} -
+ @if (step?.data?.job_size) { +
{{step.data.job_size | filesize: fileSizeConfigStorage}}
+ } + @if (step?.data?.last_update) { +
+ {{step.data.last_update * 1000 | timeAgo}} +
+ }
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 39d41030..2be9d47b 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 @@ -1,7 +1,7 @@ -import {ChangeDetectorRef, Component, EventEmitter, Input, Output} from '@angular/core'; +import {Component, Input, input, output } from '@angular/core'; import {DagModelItem} from '@ngneat/dag'; -import {StepStatusEnum} from '@common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component'; import {fileSizeConfigStorage} from '@common/shared/pipes/filesize.pipe'; +import {StepStatusEnum} from '@common/experiments/actions/common-experiments-info.actions'; export interface TreeVersion { name: string; @@ -28,8 +28,6 @@ export class DatasetVersionStepComponent { protected _step: VersionItem; protected readonly fileSizeConfigStorage = fileSizeConfigStorage; - constructor(private cdr: ChangeDetectorRef) { } - @Input() set step(step: VersionItem) { this._step = {...step, data: {...step.data, status: step.data?.status || StepStatusEnum.pending}}; } @@ -37,7 +35,6 @@ export class DatasetVersionStepComponent { get step() { return this._step; } - @Input() selected: boolean; - @Output() openConsole = new EventEmitter(); - + selected = input(); + openConsole = output(); } 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 198fcaee..3ce88db8 100644 --- a/src/app/webapp-common/dataset-version/dataset-version.module.ts +++ b/src/app/webapp-common/dataset-version/dataset-version.module.ts @@ -43,6 +43,9 @@ import {ButtonToggleComponent} from '@common/shared/ui-components/inputs/button- import {OverlayComponent} from '@common/shared/ui-components/overlay/overlay/overlay.component'; import {TableModule} from 'primeng/table'; import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; +import {PushPipe} from '@ngrx/component'; +import {ExperimentHeaderComponent} from '@common/experiments/dumb/experiment-header/experiment-header.component'; + @@ -94,7 +97,9 @@ export const routes: Routes = [ ButtonToggleComponent, OverlayComponent, TableModule, - ShowTooltipIfEllipsisDirective + ShowTooltipIfEllipsisDirective, + PushPipe, + ExperimentHeaderComponent ], exports: [ SimpleDatasetVersionPreviewComponent, diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.html b/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.html index 827f1f74..3862afa0 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.html +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.html @@ -5,51 +5,56 @@ [delay]="1000" [action]="'leave'" (smHesitate)="menu.closed.emit();" - > + >

{{command}}

-
Copy command
+ >Copy command
- - - - - -
- - {{line.name}} - -
{{line[col.id]}}
-
- - +@if (command) { + + + + } + + +
+ @switch (col.id) { + @case ('name') { + {{line.name}} + } + @default { +
{{line[col.id]}}
+ } + } +
+ + diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.ts b/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.ts index 55a4058d..661bc245 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.ts +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, ElementRef, Input, ViewChild} from '@angular/core'; +import {ChangeDetectionStrategy, Component, ElementRef, Input, ViewChild, inject } from '@angular/core'; import {MatMenuTrigger} from '@angular/material/menu'; import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {fileSizeConfigStorage, FileSizePipe} from '@common/shared/pipes/filesize.pipe'; @@ -19,6 +19,7 @@ interface RowData extends Row { changeDetection: ChangeDetectionStrategy.OnPush }) export class SimpleDatasetVersionContentComponent { + private readonly ref = inject(ElementRef); public columns: ISmCol[]; public tableData: RowData[]; public command: string; @@ -26,7 +27,7 @@ export class SimpleDatasetVersionContentComponent { @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger; copySuccess: boolean; - private colSizes = {} as { [colId: string]: number }; + private colSizes = {} as Record; @Input() set id(id: string) { this.command = `clearml-data get --id ${id}`; @@ -69,8 +70,6 @@ export class SimpleDatasetVersionContentComponent { } - constructor(private readonly ref: ElementRef){} - openMenu() { this.trigger.openMenu(); } diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.html b/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.html index 3ba0082f..efcb86e1 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.html +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.html @@ -2,93 +2,104 @@
VERSION INFO
 -
-
-
{{entity.name}} v{{entity.runtime.version}}
- {{entity.status | replaceViaMapPipe:convertStatusMap | replaceViaMapPipe:convertStatusMapBase}} -
-
-
-
ID
-
- {{entity.id?.slice(0, 8)}}... - -
+ @if (entity()) { +
+
+
{{entity().name}}@if (entity()?.runtime?.version) { + v{{entity().runtime.version}} + }
+ {{entity().status | replaceViaMapPipe:convertStatusMap | replaceViaMapPipe:convertStatusMapBase}}
-
-
Parent
-
- -
- {{entity?.parent?.name}} -
- - - +
+
+
ID
+
+ {{entity().id?.slice(0, 8)}}... + +
+
+
+
Parent
+
+ @if (entity()?.parent?.id) { + +
+ {{entity()?.parent?.name}}@if (entity()?.parent?.id) { + + } +
+ + } @else { + - + }
Size
-
{{($any(entity?.runtime?.ds_total_size) | filesize : fileSizeConfigStorage) || '-'}}(original)
+
{{($any(entity()?.runtime?.ds_total_size) | filesize : fileSizeConfigStorage) || '-'}}(original)
-
{{($any(entity?.runtime?.ds_total_size_compressed) | filesize : fileSizeConfigStorage) || '-'}}(compressed)
+
{{($any(entity()?.runtime?.ds_total_size_compressed) | filesize : fileSizeConfigStorage) || '-'}}(compressed)
File count
-
{{entity?.runtime?.ds_file_count ?? '-'}}
+
{{entity()?.runtime?.ds_file_count ?? '-'}}
Link count
-
{{entity?.runtime?.ds_link_count ?? '-'}}
+
{{entity()?.runtime?.ds_link_count ?? '-'}}
FILES CHANGED
Added
-
{{entity?.runtime?.ds_change_add ?? '-'}}
+
{{entity()?.runtime?.ds_change_add ?? '-'}}
Modified
-
{{entity?.runtime?.ds_change_modify ?? '-'}}
+
{{entity()?.runtime?.ds_change_modify ?? '-'}}
Removed
-
{{entity?.runtime?.ds_change_remove ?? '-'}}
+
{{entity()?.runtime?.ds_change_remove ?? '-'}}
Size
-
{{$any(entity?.runtime?.ds_change_size) | filesize: fileSizeConfigStorage}}
+ @if (entity()?.runtime?.ds_change_size) { +
{{$any(entity()?.runtime?.ds_change_size) | filesize: fileSizeConfigStorage}}
+ }
-
DESCRIPTION
+
DESCRIPTION
-
{{entity?.comment}}
+
{{entity()?.comment}}
-
+} +@if (entity()?.id) { + +} diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.ts b/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.ts index af33fd79..542cadd1 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.ts +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.ts @@ -1,4 +1,4 @@ -import {Component, EventEmitter, Output} from '@angular/core'; +import {Component, output } from '@angular/core'; import {PipelineInfoComponent} from '@common/pipelines-controller/pipeline-details/pipeline-info.component'; import { fileSizeConfigStorage } from '@common/shared/pipes/filesize.pipe'; import {DATASETS_STATUS_LABEL, EXPERIMENTS_STATUS_LABELS} from '~/features/experiments/shared/experiments.const'; @@ -15,5 +15,5 @@ export class SimpleDatasetVersionDetailsComponent extends PipelineInfoComponent public convertStatusMap = DATASETS_STATUS_LABEL; public convertStatusMapBase = EXPERIMENTS_STATUS_LABELS; - @Output() editDescription = new EventEmitter(); + editDescription = output(); } diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-info/simple-dataset-version-info.component.html b/src/app/webapp-common/dataset-version/simple-dataset-version-info/simple-dataset-version-info.component.html index 28f9b1a5..c3735127 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-info/simple-dataset-version-info.component.html +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-info/simple-dataset-version-info.component.html @@ -1,6 +1,6 @@ @@ -14,74 +14,90 @@ class="pipeline-container" [class.extend]="showLog" (click)="selectStep()" -> - -
- -
- - - - - - - + > + @if (dagModel$ | ngrxPush; as dagModel) { + @for (row of dagModel | reverse; track row) { +
+ @for (step of row | uniqueBy: 'stepId'; track step.id) { + + } +
+ } + @if (chartWidth) { + + @for (arrow of arrows; track arrow.path) { + + + + + } + + } + }
- + @if (showLog) {
- - {{selected?.name}} v{{selected.runtime.version}} + @if ((selected$ | ngrxPush); as selected) { + + {{selected?.name}}@if (selected?.runtime?.version) { + v{{selected.runtime.version}} + } -
- + -
- - -
-
-
- - - - + (valueChanged)="detailsPanelMode = $event" + > +
+ +
- +
+
+ @switch (detailsPanelMode) { + @case (statusOption.log) { + + } + @case (statusOption.preview) { + + + } + @case (statusOption.content) { + + } + } +
+}
diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-info/simple-dataset-version-info.component.ts b/src/app/webapp-common/dataset-version/simple-dataset-version-info/simple-dataset-version-info.component.ts index 3f377a3f..86f4a4af 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-info/simple-dataset-version-info.component.ts +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-info/simple-dataset-version-info.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {Component, inject } from '@angular/core'; import {PipelineControllerInfoComponent, PipelineItem, StatusOption} from '@common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component'; import {DagManagerUnsortedService} from '@common/shared/services/dag-manager-unsorted.service'; import {experimentDetailsUpdated, getSelectedPipelineStep, setSelectedPipelineStep} from '@common/experiments/actions/common-experiments-info.actions'; @@ -20,11 +20,11 @@ import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.mod providers: [DagManagerUnsortedService] }) export class SimpleDatasetVersionInfoComponent extends PipelineControllerInfoComponent { + private dialog = inject(MatDialog); + private commonExperimentsInfoEffects = inject(CommonExperimentsInfoEffects); constructor( - private dialog: MatDialog, - private commonExperimentsInfoEffects: CommonExperimentsInfoEffects - ) { +) { super(); this.detailsPanelMode = StatusOption.content; this.defaultDetailsMode = StatusOption.content; diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-menu/simple-dataset-version-menu.component.html b/src/app/webapp-common/dataset-version/simple-dataset-version-menu/simple-dataset-version-menu.component.html index 612956b9..3b3db5a6 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-menu/simple-dataset-version-menu.component.html +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-menu/simple-dataset-version-menu.component.html @@ -1,44 +1,51 @@ -
-
-
+@if (activateFromMenuButton()) { +
+} @else { +
+
+} - -
+ @if (tableMode()) { + +
+ } - + @if (isArchive()) { + + } - - + + diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-preview/simple-dataset-version-preview.component.html b/src/app/webapp-common/dataset-version/simple-dataset-version-preview/simple-dataset-version-preview.component.html index 15c78628..a4b47ae1 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-preview/simple-dataset-version-preview.component.html +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-preview/simple-dataset-version-preview.component.html @@ -1,17 +1,21 @@ -
- - +@if (selected()?.id) { +
+ + + class="dataset-version-preview" + [class.hidden]="!debugImages.debugImages?.[selected().id]?.data" + [isDarkTheme]="true" + [disableStatusRefreshFilter]="true" + [selected]="selected()" > -
No preview to show
-
+ @if (plots.plotsList !== undefined && plots.plotsList.length < 1 && debugImages.debugImages !== null && !debugImages.debugImages?.[selected().id]?.data) { +
No preview to show
+ } +
+} diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-preview/simple-dataset-version-preview.component.ts b/src/app/webapp-common/dataset-version/simple-dataset-version-preview/simple-dataset-version-preview.component.ts index e1d48860..f97854c5 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-preview/simple-dataset-version-preview.component.ts +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-preview/simple-dataset-version-preview.component.ts @@ -1,5 +1,4 @@ -import {NgIf} from '@angular/common'; -import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; +import {ChangeDetectionStrategy, Component, input } from '@angular/core'; import {DebugImagesModule} from '@common/debug-images/debug-images.module'; import {ExperimentSharedModule} from '~/features/experiments/shared/experiment-shared.module'; @@ -10,11 +9,10 @@ import {ExperimentSharedModule} from '~/features/experiments/shared/experiment-s changeDetection: ChangeDetectionStrategy.OnPush, imports: [ ExperimentSharedModule, - DebugImagesModule, - NgIf - ], + DebugImagesModule +], standalone: true }) export class SimpleDatasetVersionPreviewComponent { - @Input() selected: {id: string}; + selected = input.required<{id: string}>(); } diff --git a/src/app/webapp-common/dataset-version/simple-dataset-versions/simple-dataset-versions.component.html b/src/app/webapp-common/dataset-version/simple-dataset-versions/simple-dataset-versions.component.html index 4e7bc1c9..f961803d 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-versions/simple-dataset-versions.component.html +++ b/src/app/webapp-common/dataset-version/simple-dataset-versions/simple-dataset-versions.component.html @@ -1,15 +1,15 @@ - +
+ [class.footer-visible]="((selectedExperiments$ | ngrxPush) && (selectedExperiments$ | ngrxPush)?.length > 1) || (showAllSelectedIsActive$ |ngrxPush)"> @@ -101,7 +102,7 @@
>; + selected$: Observable; showAllSelectedIsActive$: Observable; tags$: Observable; data$?: Observable>; @@ -70,7 +74,7 @@ export class SimpleDatasetVersionsComponent extends ControllersComponent impleme } override downloadTableAsCSV() { - this.table.table.downloadTableAsCSV(`ClearML ${this.selectedProject.id === '*'? 'All': this.selectedProject?.basename?.substring(0,60)} Datasets`); + this.table().table.downloadTableAsCSV(`ClearML ${this.selectedProject.id === '*'? 'All': this.selectedProject?.basename?.substring(0,60)} Datasets`); } override setupBreadcrumbsOptions() { this.sub.add(this.selectedProject$.pipe( diff --git a/src/app/webapp-common/datasets/nested-simple-datasets-page/nested-simple-datasets-page.component.html b/src/app/webapp-common/datasets/nested-simple-datasets-page/nested-simple-datasets-page.component.html index fea98ecf..dca4bba1 100644 --- a/src/app/webapp-common/datasets/nested-simple-datasets-page/nested-simple-datasets-page.component.html +++ b/src/app/webapp-common/datasets/nested-simple-datasets-page/nested-simple-datasets-page.component.html @@ -1,12 +1,12 @@ + [class.in-empty-state]="!(((projectsList$ | ngrxPush)?.length !== 0 && (!allExamples || (showExamples$ | ngrxPush)))|| searching)"> - + -
- +
+
diff --git a/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.ts b/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.ts index 0b987c1f..631f14d0 100644 --- a/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.ts +++ b/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.ts @@ -83,4 +83,6 @@ export class SimpleDatasetsComponent extends PipelinesPageComponent implements O })); })); } + + } diff --git a/src/app/webapp-common/debug-images/debug-images-actions.ts b/src/app/webapp-common/debug-images/debug-images-actions.ts index f592324d..98680393 100644 --- a/src/app/webapp-common/debug-images/debug-images-actions.ts +++ b/src/app/webapp-common/debug-images/debug-images-actions.ts @@ -14,7 +14,7 @@ export const setDebugImages = createAction( ); export const getDebugImagesMetrics = createAction( DEBUG_IMAGES_PREFIX + 'get debug images metrics', - props<{ tasks: string[] }>() + props<{ tasks: string[]; autoRefresh?: boolean }>() ); export const refreshDebugImagesMetrics = createAction( 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 b4b672a7..52a4fc45 100644 --- a/src/app/webapp-common/debug-images/debug-images-effects.ts +++ b/src/app/webapp-common/debug-images/debug-images-effects.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +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'; diff --git a/src/app/webapp-common/debug-images/debug-images-reducer.ts b/src/app/webapp-common/debug-images/debug-images-reducer.ts index 80c5e211..c7ca892b 100644 --- a/src/app/webapp-common/debug-images/debug-images-reducer.ts +++ b/src/app/webapp-common/debug-images/debug-images-reducer.ts @@ -11,18 +11,18 @@ import {Task} from '~/business-logic/model/tasks/task'; import {createFeatureSelector, createReducer, createSelector, on} from '@ngrx/store'; import {EventsDebugImagesResponse} from '~/business-logic/model/events/eventsDebugImagesResponse'; +type taskId = string; -export interface IDebugImagesState { - debugImages: { [taskId: string]: EventsDebugImagesResponse }; - settingsList: Array; - tasks: Array>; - optionalMetrics: Array; - selectedMetricsForTask: { [taskId: string]: string }; +export interface DebugImagesState { + debugImages: Record; + settingsList: IDebugImagesSettings[]; + tasks: Partial[]; + optionalMetrics: ITaskOptionalMetrics[]; + selectedMetricsForTask: Record; searchTerm: string; - scrollId: any; + scrollId: Record; noMore: boolean; - timeIsNow: any; - + timeIsNow: Record; } export interface IDebugImagesSettings { @@ -32,10 +32,10 @@ export interface IDebugImagesSettings { export interface ITaskOptionalMetrics { task: string; - metrics: Array; + metrics: string[]; } -export const initialState: IDebugImagesState = { +export const initialState: DebugImagesState = { debugImages: null, settingsList: [], searchTerm: '', @@ -48,7 +48,7 @@ export const initialState: IDebugImagesState = { } ; -export const debugImages = createFeatureSelector('debugImages'); +export const debugImages = createFeatureSelector('debugImages'); export const selectDebugImages = createSelector(debugImages, (state) => state.debugImages); export const selectTaskNames = createSelector(debugImages, (state) => state.tasks); export const selectNoMore = createSelector(debugImages, (state) => state.noMore); @@ -65,13 +65,13 @@ export const debugSamplesReducer = createReducer( scrollId: initialState.scrollId, noMore: initialState.noMore })), - on(setDebugImages, (state, action) => ({...state, debugImages: {...state.debugImages, [action.task]: action.res}})), - on(setExperimentsNames, (state, action) => ({...state, tasks: action.tasks})), - on(setMetrics, (state, action) => ({...state, optionalMetrics: action.metrics})), - on(setSelectedMetric, (state, action) => ({...state, selectedMetricsForTask: {...state.selectedMetricsForTask, [action.payload.task]: action.payload.metric}})), - on(getDebugImagesMetrics, state => ({...state, optionalMetrics: initialState.optionalMetrics, debugImages: initialState.debugImages})), - on(setTimeIsNow, (state, action) => ({...state, timeIsNow: {...state.timeIsNow, [action.task]: action.timeIsNow}})), - on(fetchExperiments, () => ({...initialState})), - // eslint-disable-next-line @typescript-eslint/naming-convention + on(setDebugImages, (state, action): DebugImagesState => ({...state, debugImages: {...state.debugImages, [action.task]: action.res}})), + on(setExperimentsNames, (state, action): DebugImagesState => ({...state, tasks: action.tasks})), + on(setMetrics, (state, action): DebugImagesState => ({...state, optionalMetrics: action.metrics})), + on(setSelectedMetric, (state, action): DebugImagesState => ({...state, selectedMetricsForTask: {...state.selectedMetricsForTask, [action.payload.task]: action.payload.metric}})), + on(getDebugImagesMetrics, (state, action): DebugImagesState => ({...state, ...(!action.autoRefresh && {optionalMetrics: initialState.optionalMetrics, debugImages: initialState.debugImages})})), + on(setTimeIsNow, (state, action): DebugImagesState => ({...state, timeIsNow: {...state.timeIsNow, [action.task]: action.timeIsNow}})), + on(fetchExperiments, (): DebugImagesState => ({...initialState})), + ); 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 c3167bbb..6d74e115 100755 --- 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 @@ -5,6 +5,7 @@ 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 67bb2a7d..dc52ee83 100755 --- 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 @@ -50,7 +50,6 @@ background:transparent; } - ::ng-deep .mat-expansion-panel-content { .mat-expansion-panel-body { height: 400px; @@ -58,6 +57,14 @@ } } + &.short-list { + ::ng-deep .mat-expansion-panel-content { + .mat-expansion-panel-body { + height: 220px; + } + } + } + .mat-expansion-panel-header { margin-bottom: 0; } 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 42541a59..875f577f 100755 --- 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,4 +1,4 @@ -import {Component, Input, Output, viewChildren} from '@angular/core'; +import {Component, ElementRef, inject, Input, Output, viewChildren} from '@angular/core'; import {EventEmitter} from '@angular/core'; import {ThemeEnum} from '@common/constants'; import {DebugSampleEvent, Iteration} from '@common/debug-images/debug-images-types'; @@ -10,6 +10,7 @@ import {VirtualGridComponent} from '@common/shared/components/virtual-grid/virtu styleUrls: ['./debug-images-view.component.scss'] }) export class DebugImagesViewComponent { + protected ref = inject>(ElementRef); public themeEnum = ThemeEnum; public trackFrame = item => `${item?.key} ${item?.timestamp}`; 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 8cb143f7..c466b250 100644 --- a/src/app/webapp-common/debug-images/debug-images.component.html +++ b/src/app/webapp-common/debug-images/debug-images.component.html @@ -1,56 +1,55 @@
- @for (experimentId of experimentIds | slice : 0 : LIMITED_VIEW_LIMIT; track experimentId) { -
- @if (experimentIds?.length > 1) { + @for (experimentId of experimentIds() | slice : 0 : LIMITED_VIEW_LIMIT; track experimentId) { +
+ @if (experimentIds()?.length > 1) {
- @if ((experiments | itemById: experimentId).name) { + @if ((tasks() | itemById: experimentId)?.name) { }
} -
+
- + [class.active]="bindNavigationMode()" [class.hidden]="$last" (click)="toggleConnectNavigation()"> +
- @if (!thereAreNoMetrics(experimentId) && !disableStatusRefreshFilter) { -
- + - @if (selectedMetrics[experimentId]) { + @if (selectedMetrics()[experimentId]) { {{allImages}} } - @for (metric of optionalMetrics[experimentId]; track metric) { + @for (metric of optionalMetricsDic()[experimentId]; track metric) { {{metric}} } -
{{debugImages?.[experimentId]?.data?.slice(-1)[0].iter}}
{{debugImages?.[experimentId]?.data?.[0].iter}} -
-
@@ -58,7 +57,7 @@ }
@if (shouldShowNoImagesForExperiment(experimentId)) { -
+
@@ -70,10 +69,10 @@

NO DEBUG SAMPLES

NO DEBUG SAMPLES }
} - @if (experimentIds?.length>LIMITED_VIEW_LIMIT) { + @if (experimentIds()?.length>LIMITED_VIEW_LIMIT) {
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 ae42737b..93d2a7ec 100644 --- a/src/app/webapp-common/debug-images/debug-images.component.ts +++ b/src/app/webapp-common/debug-images/debug-images.component.ts @@ -3,26 +3,18 @@ import { ChangeDetectorRef, Component, DestroyRef, ElementRef, - EventEmitter, - Input, - OnChanges, - OnDestroy, - OnInit, - Output, - SimpleChanges, viewChildren + viewChildren, inject, input, output, effect, computed, signal } from '@angular/core'; import {MatDialog} from '@angular/material/dialog'; -import {ActivatedRoute, Params} from '@angular/router'; import {RefreshService} from '@common/core/services/refresh.service'; import {DebugSampleEvent, DebugSamples} from '@common/debug-images/debug-images-types'; import {LIMITED_VIEW_LIMIT} from '@common/experiments-compare/experiments-compare.constants'; import {isGoogleCloudUrl} from '@common/settings/admin/base-admin-utils'; import {selectBeginningOfTime} from '@common/shared/debug-sample/debug-sample.reducer'; -import {concatLatestFrom} from '@ngrx/effects'; import {Store} from '@ngrx/store'; import {isEqual} from 'lodash-es'; -import {combineLatest, Observable, Subscription} from 'rxjs'; -import {distinctUntilChanged, filter, map, take, withLatestFrom} from 'rxjs/operators'; +import {combineLatest} from 'rxjs'; +import {debounceTime, filter, map} from 'rxjs/operators'; import {EventsDebugImagesResponse} from '~/business-logic/model/events/eventsDebugImagesResponse'; import {TaskMetric} from '~/business-logic/model/events/taskMetric'; import {Task} from '~/business-logic/model/tasks/task'; @@ -38,9 +30,7 @@ import * as debugActions from './debug-images-actions'; import {fetchExperiments, getDebugImagesMetrics, resetDebugImages} from './debug-images-actions'; import {ALL_IMAGES} from './debug-images-effects'; import { - ITaskOptionalMetrics, selectDebugImages, - selectNoMore, selectOptionalMetrics, selectSelectedMetricForTask, selectTaskNames, @@ -51,6 +41,7 @@ import {DebugImagesViewComponent} from '@common/debug-images/debug-images-view/d 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'; @Component({ selector: 'sm-debug-images', @@ -58,69 +49,125 @@ import {MetricsImageEvent} from '~/business-logic/model/events/metricsImageEvent styleUrls: ['./debug-images.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { - - @Input() isDarkTheme = false; - @Input() disableStatusRefreshFilter = false; - @Input() selected: Task; - @Output() copyIdClicked = new EventEmitter(); +export class DebugImagesComponent { + private store = inject(Store); + private dialog = inject(MatDialog); + private changeDetection = inject(ChangeDetectorRef); + private elRef = inject(ElementRef); + private refresh = inject(RefreshService); + private reportEmbed = inject(ReportCodeEmbedService); + private destroyRef = inject(DestroyRef); + + isDarkTheme = input(false); + disableStatusRefreshFilter = input(false); + selected = input(); + copyIdClicked = output(); private sampleViews = viewChildren(DebugImagesViewComponent); - private debugImagesSubscription: Subscription; - private taskNamesSubscription: Subscription; - private selectedExperimentSubscription: Subscription; - private routerParamsSubscription: Subscription; - private refreshingSubscription: Subscription; - private optionalMetricsSubscription: Subscription; + protected mergeIterations = injectRouteData('mergeIterations'); + protected multipleExperiments = injectRouteData('multiple'); + protected minimized = injectRouteData('minimized'); + private routerParams = this.store.selectSignal(selectRouterParams); + private ids = computed(() => { + if (this.routerParams().ids || this.routerParams().experimentId) { + return this.routerParams().ids?.split(',') ?? this.routerParams().experimentId?.split(',') + } + }); + protected experimentIds = computed(() => this.selected() ? + [this.selected().id] : + this.multipleExperiments() ? + this.ids() : + [this.selectedExperiment()?.id] + ); + protected experimentNames = computed(() => this.selected() ? + {[this.selected().id]: this.selected().name} : + this.multipleExperiments() ? + this.tasks().reduce((acc, task) => ({ + ...acc, + [task.id]: task.name + }), {}) as Record : + {[this.selectedExperiment()?.id]: this.selectedExperiment()?.name} + ); + + + protected selectedExperiment = this.store.selectSignal(selectSelectedExperiment); + protected tasks = this.store.selectSignal(selectTaskNames); + protected timeIsNow = this.store.selectSignal(selectTimeIsNow); + protected beginningOfTime = this.store.selectSignal(selectBeginningOfTime); + protected optionalMetrics = this.store.selectSignal(selectOptionalMetrics); + protected metricForTask = this.store.selectSignal(selectSelectedMetricForTask); + + private previousExperimentId: string; + public debugImages: Record = null; + public allowAutorefresh = false; + + public selectedMetrics = signal>({}); + readonly allImages = ALL_IMAGES; + private selectedMetric = signal(null); + protected optionalMetricsDic = computed>(() => this.optionalMetrics().reduce((acc, experimentMetrics) => { + acc[experimentMetrics.task] = experimentMetrics.metrics; + return acc; + }, {})); + public bindNavigationMode = signal(false); - private routerParams$: Observable; - private tasks$: Observable[]>; - public timeIsNow$: Observable; - public beginningOfTime$: Observable; + LIMITED_VIEW_LIMIT = LIMITED_VIEW_LIMIT; + private previousIds: string[]; - public mergeIterations: boolean; - public debugImages: { [experimentId: string]: DebugSamples } = null; - public experimentNames: { [id: string]: string } = {}; - public experimentIds: string[]; - public allowAutorefresh: boolean = false; + constructor() { + this.destroyRef.onDestroy(() => this.store.dispatch(resetDebugImages())); - public noMoreData$: Observable; - public optionalMetrics$: Observable; - public optionalMetrics: { [experimentId: string]: string }; - public selectedMetrics: { [taskId: string]: string } = {}; - minimized: boolean; - readonly allImages = ALL_IMAGES; - private selectedMetric: string; - public modifiedExperimentsNames: { [id: string]: string } = {}; - public experiments: Partial[]; - public bindNavigationMode: boolean = false; - // eslint-disable-next-line @typescript-eslint/naming-convention - LIMITED_VIEW_LIMIT = LIMITED_VIEW_LIMIT; + effect(() => { + if (this.selected() && !isEqual([this.selected().id], this.experimentIds())) { + this.selectMetric({value: this.allImages}, this.selected().id); + } + }, {allowSignalWrites: true}); - constructor( - private store: Store, - private dialog: MatDialog, - private changeDetection: ChangeDetectorRef, - private activeRoute: ActivatedRoute, - private elRef: ElementRef, - private refresh: RefreshService, - private reportEmbed: ReportCodeEmbedService, - private destroyRef: DestroyRef - ) { - this.tasks$ = this.store.select(selectTaskNames); - this.optionalMetrics$ = this.store.select(selectOptionalMetrics); - this.noMoreData$ = this.store.select(selectNoMore); - this.timeIsNow$ = this.store.select(selectTimeIsNow); - this.beginningOfTime$ = this.store.select(selectBeginningOfTime); + if (this.multipleExperiments()) { + effect(() => { + if (this.tasks()?.length > 0) { + if (this.isTaskRunning(this.tasks()) && (Object.keys(this.debugImages || {}).length > 0 || this.beginningOfTime()?.[this.ids[0]])) { + this.store.dispatch(getDebugImagesMetrics({tasks: this.ids()})); + } + } + }, {allowSignalWrites: true}); + + effect(() => { + if (!isEqual(this.ids(),this.previousIds)) { + this.selectedMetric.set(null); + this.store.dispatch(getDebugImagesMetrics({tasks: this.ids().slice(0, LIMITED_VIEW_LIMIT)})); + 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.selectedExperiment()?.id !== this.previousExperimentId) { + const id = this.selectedExperiment().id; + this.previousExperimentId = id; + 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())); + } + } - this.debugImagesSubscription = combineLatest([ - store.select(selectS3BucketCredentials), - store.select(selectDebugImages), - store.select(selectSelectedMetricForTask) + combineLatest([ + this.store.select(selectS3BucketCredentials), + this.store.select(selectDebugImages), + this.store.select(selectSelectedMetricForTask) ]) .pipe( + takeUntilDestroyed(), + debounceTime(50), map(([, debugImages, metricForTask]) => !debugImages ? {} : Object.entries(debugImages).reduce(((acc, val: [string, EventsDebugImagesResponse]) => { const id = val[0]; const iterations: DebugImagesResponseIterations[] = val[1].metrics.find(m => m.task === id).iterations; @@ -135,7 +182,7 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { return { ...event, url: event.url, - variantAndMetric: (this.selectedMetrics[id] === ALL_IMAGES || metricForTask[id] === ALL_IMAGES ) ? `${event.metric}/${event.variant}` : '' + variantAndMetric: (this.selectedMetrics()[id] === ALL_IMAGES || metricForTask[id] === ALL_IMAGES) ? `${event.metric}/${event.variant}` : '' }; }) })), @@ -143,7 +190,8 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { metric: metrics[0], scrollId: val[1].scroll_id, }; - this.store.dispatch(signUrls({sign: iterations.map(iteration => + this.store.dispatch(signUrls({ + sign: iterations.map(iteration => iteration.events.map((event: MetricsImageEvent) => ({url: event.url, config: {disableCache: event.timestamp}}) ) @@ -155,101 +203,25 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { .subscribe(debugImages => { this.debugImages = debugImages; Object.keys(debugImages).forEach(key => { - if (!this.selectedMetrics[key]) { - this.selectedMetrics[key] = debugImages[key]?.metric; + if (!this.selectedMetrics()[key]) { + this.selectedMetrics.update(metrics => ({...metrics, [key]: debugImages[key]?.metric})); } }); this.changeDetection.markForCheck(); }); - this.routerParams$ = this.store.select(selectRouterParams) - .pipe( - filter(params => !!params.ids || !!params.experimentId), - distinctUntilChanged() - ); - } - - ngOnChanges(changes: SimpleChanges): void { - if (changes.selected && !isEqual([changes.selected.currentValue.id], this.experimentIds)) { - this.experimentNames = {[changes.selected.currentValue.id]: changes.selected.currentValue.name}; - this.experimentIds = [changes.selected.currentValue.id]; - this.selectMetric({value: this.allImages}, changes.selected.currentValue.id); - } - } - - ngOnInit() { - this.mergeIterations = this.activeRoute.snapshot.routeConfig?.data?.mergeIterations; - const multipleExperiments = !!this.activeRoute.snapshot.routeConfig?.data?.multiple; - this.minimized = this.activeRoute.snapshot.routeConfig?.data?.minimized; - - if (multipleExperiments) { - this.routerParamsSubscription = this.routerParams$ - .subscribe(params => { - this.selectedMetric = null; - this.experimentIds = (params.ids ? params.ids.split(',') : params.experimentId.split(',')); - this.store.dispatch(getDebugImagesMetrics({tasks: this.experimentIds.slice(0, LIMITED_VIEW_LIMIT)})); - this.store.dispatch(fetchExperiments({tasks: this.experimentIds.slice(0, LIMITED_VIEW_LIMIT)})); - this.changeDetection.markForCheck(); - }); - - this.taskNamesSubscription = this.tasks$ - .pipe( - filter(tasks => tasks?.length > 0), - withLatestFrom(this.beginningOfTime$) - ) - .subscribe(([tasks, beginningOfTime]) => { - if (this.isTaskRunning(tasks) && (Object.keys(this.debugImages || {}).length > 0 || beginningOfTime[this.experimentIds[0]])) { - this.store.dispatch(getDebugImagesMetrics({tasks: this.experimentIds})); - } - this.experiments = tasks; - this.experimentNames = tasks.reduce((acc, task) => ({ - ...acc, - [task.id]: task.name - }), {}) as { [id: string]: string }; - tasks.forEach(task => { - this.modifiedExperimentsNames[task.id] = Object.values(this.experimentNames).filter(name => name === task.name).length > 1 ? `${task.name}.${task.id.slice(0, 6)}` : task.name; - } - ); - this.changeDetection.markForCheck(); - }); - - } else { - this.selectedExperimentSubscription = this.store.select(selectSelectedExperiment) - .pipe( - filter(experiment => !!experiment && !this.disableStatusRefreshFilter), - distinctUntilChanged((previous, current) => previous?.id === current?.id), - withLatestFrom(this.store.select(selectSelectedMetricForTask)) - ).subscribe(([experiment, metricForTask]) => { - this.selectedMetric = null; - this.experimentNames = {[experiment.id]: experiment.name}; - this.experimentIds = [experiment.id]; - this.selectedMetrics[experiment.id] = metricForTask[experiment.id] ; - this.store.dispatch(getDebugImagesMetrics({tasks: this.experimentIds})); - this.changeDetection.markForCheck(); - }); - - if (this.minimized) { - this.store.select(selectSplitSize) - .pipe( - takeUntilDestroyed(this.destroyRef) - ) - .subscribe(() => this.sampleViews().forEach(view => view.resize())) - } - } - - - this.refreshingSubscription = this.refresh.tick + this.refresh.tick .pipe( - filter(auto => auto !== null && !this.disableStatusRefreshFilter), - concatLatestFrom(() => this.store.select(selectTimeIsNow)) + takeUntilDestroyed(), + filter(auto => auto !== null && !this.disableStatusRefreshFilter()), ) - .subscribe(([auto, timeIsNow]) => { - if (multipleExperiments) { - this.store.dispatch(debugActions.refreshDebugImagesMetrics({tasks: this.experimentIds, autoRefresh: auto})); + .subscribe(auto => { + if (this.multipleExperiments()) { + this.store.dispatch(debugActions.refreshDebugImagesMetrics({tasks: this.experimentIds(), autoRefresh: auto})); } - this.store.dispatch(getDebugImagesMetrics({tasks: this.experimentIds})); - this.experimentIds.forEach(experimentId => { - if (experimentId && !(timeIsNow?.[experimentId] === false) && this.elRef.nativeElement.scrollTop < 40) { + this.store.dispatch(debugActions.getDebugImagesMetrics({tasks: this.experimentIds(), autoRefresh: true})); + this.experimentIds().forEach(experimentId => { + if (experimentId && !(this.timeIsNow()?.[experimentId] === false) && this.elRef.nativeElement.scrollTop < 40) { this.store.dispatch(debugActions.refreshMetric({ payload: { task: experimentId, @@ -261,39 +233,24 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { }); }); - this.optionalMetricsSubscription = this.optionalMetrics$ - .pipe(concatLatestFrom(() => [this.store.select(selectSelectedMetricForTask)])) - .subscribe(([optionalMetrics, selectedMetricForTask ]) => { - const optionalMetricsDic = {}; - optionalMetrics.forEach(experimentMetrics => optionalMetricsDic[experimentMetrics.task] = experimentMetrics.metrics); - if ((!isEqual(this.optionalMetrics, optionalMetricsDic)) && optionalMetrics.length > 0) { - this.optionalMetrics = optionalMetricsDic; - if (!this.selectedMetric || !optionalMetrics?.[0].metrics.includes(this.selectedMetric)) { - optionalMetrics.forEach(optionalMetric => { - optionalMetric.metrics[0] && this.store.dispatch(debugActions.setSelectedMetric({ + this.store.select(selectOptionalMetrics) + .pipe(takeUntilDestroyed()) + .subscribe(optionalMetrics => { + if (this.optionalMetrics().length > 0) { + if (!this.selectedMetric() || !optionalMetrics?.[0].metrics.includes(this.selectedMetric())) { + this.optionalMetrics() + .filter(optionalMetric => optionalMetric.metrics[0]) + .forEach(optionalMetric => this.store.dispatch(debugActions.setSelectedMetric({ payload: { task: optionalMetric.task, - metric: selectedMetricForTask[optionalMetric.task] ?? optionalMetric.metrics[0] + metric: this.metricForTask()[optionalMetric.task] ?? optionalMetric.metrics[0] } - })); - }); + }))); } - this.changeDetection.markForCheck(); } }); } - - ngOnDestroy(): void { - this.routerParamsSubscription?.unsubscribe(); - this.taskNamesSubscription?.unsubscribe(); - this.selectedExperimentSubscription?.unsubscribe(); - this.refreshingSubscription?.unsubscribe(); - this.optionalMetricsSubscription?.unsubscribe(); - this.debugImagesSubscription?.unsubscribe(); - this.store.dispatch(resetDebugImages()); - } - public urlError({frame}: { frame: DebugSampleEvent; experimentId: string }) { const url = frame.url; if (isGoogleCloudUrl(url)) { @@ -306,7 +263,7 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { const iterationSnippets = this.debugImages?.[experimentId]?.data.map(iter => iter.events).flat(); const sources = iterationSnippets.map(img => img.url); const index = iterationSnippets.findIndex(img => img.url === frame.url); - const isAllMetrics = this.selectedMetrics[experimentId] === ALL_IMAGES; + const isAllMetrics = this.selectedMetrics()[experimentId] === ALL_IMAGES; this.dialog.open(ImageViewerComponent, { data: { embedFunction: (rect: DOMRect, metric: string, variant: string) => @@ -325,47 +282,43 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { return tasks.some(task => [TaskStatusEnum.InProgress, TaskStatusEnum.Queued].includes(task.status)); } - selectMetric(change: {value: string}, taskId) { - this.selectedMetric = change.value; - if (this.bindNavigationMode) { - this.experimentIds.forEach(experimentId => { - this.selectedMetrics[experimentId] = change.value; + selectMetric(change: { value: string }, taskId) { + this.selectedMetric.set(change.value); + if (this.bindNavigationMode()) { + this.experimentIds().forEach(experimentId => { + this.selectedMetrics.update(metrics => ({...metrics, [experimentId]: change.value})); this.store.dispatch(debugActions.setSelectedMetric({payload: {task: experimentId, metric: change.value}})); }); } else { - this.selectedMetrics[taskId] = change.value; + this.selectedMetrics.update(metrics => ({...metrics, [taskId]: change.value})); this.store.dispatch(debugActions.setSelectedMetric({payload: {task: taskId, metric: change.value}})); } } nextBatch(taskMetric: TaskMetric) { - if (this.bindNavigationMode) { - this.beginningOfTime$ - .pipe(take(1)) - .subscribe(beginningOfTime => { - this.experimentIds.forEach(experimentId => { - if (!beginningOfTime[experimentId]) { - this.store.dispatch(debugActions.getNextBatch({ - payload: { - task: experimentId, - metric: this.selectedMetrics[experimentId] - } - })); + if (this.bindNavigationMode()) { + this.experimentIds().forEach(experimentId => { + if (!this.beginningOfTime()[experimentId]) { + this.store.dispatch(debugActions.getNextBatch({ + payload: { + task: experimentId, + metric: this.selectedMetrics()[experimentId] } - }); - }); + })); + } + }); } else { this.store.dispatch(debugActions.getNextBatch({payload: taskMetric})); } } previousBatch(taskMetric: TaskMetric) { - if (this.bindNavigationMode) { - this.experimentIds.forEach(experimentId => { + if (this.bindNavigationMode()) { + this.experimentIds().forEach(experimentId => { this.store.dispatch(debugActions.getPreviousBatch({ payload: { task: experimentId, - metric: this.selectedMetrics[experimentId] + metric: this.selectedMetrics()[experimentId] } })); }); @@ -375,12 +328,12 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { } backToNow(taskMetric: TaskMetric) { - if (this.bindNavigationMode) { - this.experimentIds.forEach(experimentId => { + if (this.bindNavigationMode()) { + this.experimentIds().forEach(experimentId => { this.store.dispatch(debugActions.setSelectedMetric({ payload: { task: experimentId, - metric: this.selectedMetrics[experimentId] + metric: this.selectedMetrics()[experimentId] } })); }); @@ -391,7 +344,7 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { } thereAreNoMetrics(experiment: string) { - return !(this.optionalMetrics?.[experiment]?.length > 0); + return !(this.optionalMetricsDic()?.[experiment]?.length > 0); } thereAreNoDebugImages(experiment: string) { @@ -407,7 +360,7 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { } toggleConnectNavigation() { - this.bindNavigationMode = !this.bindNavigationMode; + this.bindNavigationMode.update(mode => !mode); } createEmbedCode(event: { metrics?: string[]; variants?: string[]; domRect: DOMRect }, experimentId: string) { diff --git a/src/app/webapp-common/debug-images/debug-images.module.ts b/src/app/webapp-common/debug-images/debug-images.module.ts index 39cea1c6..0acf5aae 100644 --- a/src/app/webapp-common/debug-images/debug-images.module.ts +++ b/src/app/webapp-common/debug-images/debug-images.module.ts @@ -20,6 +20,8 @@ import {MatSelectModule} from '@angular/material/select'; import {MatExpansionModule} from '@angular/material/expansion'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import {VirtualGridComponent} from '@common/shared/components/virtual-grid/virtual-grid.component'; +import {PushPipe} from '@ngrx/component'; + const declarations = [DebugImagesComponent, DebugImagesViewComponent]; @@ -41,7 +43,8 @@ const declarations = [DebugImagesComponent, DebugImagesViewComponent]; MatSelectModule, MatExpansionModule, TooltipDirective, - VirtualGridComponent + VirtualGridComponent, + PushPipe, ] }) export class DebugImagesModule { diff --git a/src/app/webapp-common/experiments-compare/actions/experiments-compare-charts.actions.ts b/src/app/webapp-common/experiments-compare/actions/experiments-compare-charts.actions.ts index 0ad117de..fbfb6491 100644 --- a/src/app/webapp-common/experiments-compare/actions/experiments-compare-charts.actions.ts +++ b/src/app/webapp-common/experiments-compare/actions/experiments-compare-charts.actions.ts @@ -11,7 +11,6 @@ import {MetricVariants} from '~/business-logic/model/events/metricVariants'; export const EXPERIMENTS_COMPARE_METRICS_CHARTS_ = 'EXPERIMENTS_COMPARE_METRICS_CHARTS_'; -export const SET_EXPERIMENT_PLOTS = EXPERIMENTS_COMPARE_METRICS_CHARTS_ + 'SET_EXPERIMENT_PLOTS'; export const getMultiScalarCharts = createAction( EXPERIMENTS_COMPARE_METRICS_CHARTS_ + 'GET_MULTI_SCALAR_CHARTS', @@ -25,7 +24,7 @@ export const getMultiSingleScalars = createAction( export const getMultiPlotCharts = createAction( EXPERIMENTS_COMPARE_METRICS_CHARTS_ + 'GET_MULTI_PLOT_CHARTS', - props<{ taskIds: Array; entity: EntityTypeEnum; metrics: MetricVariants[]; autoRefresh?: boolean }>() + props<{ taskIds: string[]; entity: EntityTypeEnum; metrics: MetricVariants[]; autoRefresh?: boolean }>() ); export const setExperimentMultiScalarSingleValue = createAction( diff --git a/src/app/webapp-common/experiments-compare/containers/compare-scatter-plot/compare-scatter-plot.component.html b/src/app/webapp-common/experiments-compare/containers/compare-scatter-plot/compare-scatter-plot.component.html index b0ef0dee..4479bd58 100644 --- a/src/app/webapp-common/experiments-compare/containers/compare-scatter-plot/compare-scatter-plot.component.html +++ b/src/app/webapp-common/experiments-compare/containers/compare-scatter-plot/compare-scatter-plot.component.html @@ -1,6 +1,8 @@ -
- -
+@if (graphData?.length > 0) { +
+ +
+} @@ -14,13 +14,11 @@
-
- - + @if (experimentsDataControl[experiment.id]) { +
+ + @let dataSource = experimentsDataControl[experiment.id][0]; + @let treeControl = experimentsDataControl[experiment.id][1];
-
-
- - {{(renameMap[node.data.key] || node.data.key) | hideHashTitle}} - + @if (node.hasChildren) { +
+
+ + {{ (renameMap[node.data.key] || node.data.key) | hideHashTitle }} + @if (node.data.tooltip) { + + } +
-
-
-
+
-
- 
{{node.data.key |
-                      hideHash}}{{node.data.value.dataValue}}
-                      {{node.data.key | hideHash}}{{node.data.value}} 
-                      
-
+
@if ((node.data.value !== undefined) || (node.data.existOnOrigin && node.data.existOnCompared)) { + 
@if (!!node.data.value?.dataDictionary && !!node.data.value?.link) {
+                        {{
+                          node.data.key |
+                            hideHash
+                        }}{{ node.data.value.dataValue }}
+                      } @else {
+                        {{ node.data.key | hideHash }}{{ node.data.value }}
+                      }
+                        
+
+ } +
-
+ }
- -
+
+ }
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 4bb00465..3362a885 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 @@ -14,6 +14,7 @@ display: inline-block; position: relative; overflow: visible; + white-space: nowrap; &.with-ellipsis { overflow: hidden; 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 681fd2e3..108d4100 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 @@ -4,7 +4,7 @@
Y-axis
@@ -12,7 +12,7 @@
Coordinates
@@ -35,10 +35,10 @@
Additional data point information
@@ -56,18 +56,18 @@
- @if ((experiments$ | async).length > 1) { + @if ((experiments$ | ngrxPush).length > 1) { @if (scatter && !!selectedMetric && selectedHyperParams?.length > 0) { + [experiments]="experiments$ | ngrxPush" + [extraHoverInfoParams]="selectedParamsHoverInfo$ |ngrxPush" + [extraHoverInfoMetrics]="selectedMetricsHoverInfo$ | ngrxPush"> } @else if (!scatter && selectedMetrics.length > 0 && selectedHyperParams?.length > 0) { - @if (plotlyReady$ | async) { - 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 7944fa78..6282f447 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 @@ -24,7 +24,7 @@ import { getExperimentsHyperParams, setMetricsHoverInfo, setParamsHoverInfo, - setShowIdenticalHyperParams, + setShowIdenticalHyperParams } from '../../actions/experiments-compare-scalars-graph.actions'; import {GroupedHyperParams, MetricOption} from '../../reducers/experiments-compare-charts.reducer'; import {selectPlotlyReady} from '@common/core/reducers/view.reducer'; @@ -40,7 +40,6 @@ import {MetricVariantResult} from '~/business-logic/model/projects/metricVariant import { SelectionEvent } from '@common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component'; -import {MetricResultToSelectedMetricPipe} from '@common/shared/pipes/metric-result-to-selected-metric.pipe'; import {MetricVariantToPathPipe} from '@common/shared/pipes/metric-variant-to-path.pipe'; @@ -59,12 +58,11 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes public experiments$: Observable; public graphs: { [key: string]: ExtFrame }; - public selectedHyperParams: string[] =[]; + public selectedHyperParams: string[] = []; public selectedMetric: SelectedMetricVariant; public hyperParams: { [section: string]: any }; public showIdenticalParamsActive: boolean; public plotlyReady$ = this.store.select(selectPlotlyReady); - public metricResultToSelectedMetricPipe = new MetricResultToSelectedMetricPipe; public metricVariantToPathPipe = new MetricVariantToPathPipe; public metrics: MetricOption[]; public listOpen = true; @@ -106,11 +104,11 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes } constructor(private store: Store, - private route: ActivatedRoute, - private router: Router, - private refresh: RefreshService, - private reportEmbed: ReportCodeEmbedService, - private cdr: ChangeDetectorRef) { + private route: ActivatedRoute, + private router: Router, + private refresh: RefreshService, + private reportEmbed: ReportCodeEmbedService, + private cdr: ChangeDetectorRef) { this.metricsOptions$ = this.store.select(selectScalarsGraphMetrics); this.metricsResults$ = this.store.select(selectScalarsGraphMetricsResults); this.hyperParams$ = this.store.select(selectScalarsGraphHyperParams); @@ -130,7 +128,7 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes this.scatter = this.route.snapshot.data?.scatter; this.subs.add(combineLatest([this.hyperParams$, this.selectHideIdenticalHyperParams$]) .pipe( - filter(([allParams]) => !!allParams), + filter(([allParams]) => !!allParams) ) .subscribe(([allParams, hideIdentical]) => { this.showIdenticalParamsActive = !hideIdentical; @@ -149,55 +147,60 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes } return acc; }, {}); - const selectedHyperParams = this.selectedHyperParams?.filter(selectedParam => has(this.hyperParams, selectedParam.split('.').slice(0,1).join('.'))); + const selectedHyperParams = this.selectedHyperParams?.filter(selectedParam => has(this.hyperParams, selectedParam.split('.').slice(0, 1).join('.'))); selectedHyperParams && this.updateServer(this.selectedMetric, selectedHyperParams); this.cdr.detectChanges(); })); this.subs.add(combineLatest([this.metricsOptions$, this.hyperParams$, this.store.select(selectRouterQueryParams)]).pipe( - debounceTime(0), - filter(([metrics, hyperparams,]) => ((metrics?.length > 0 || Object.keys(hyperparams || {})?.length > 0) && this.settingsLoaded)), - ).subscribe(([metrics, , queryParams]) => { - this.routeWasLoaded = true; - const flatVariants = flatten(metrics.map(m => m.variants)).map(mv => mv.value); - if (queryParams.metricPath) { - if (this.scatter) { - this.selectedMetric = { - metric: queryParams.metricName.split('/')[0], - variant: queryParams.metricName.split('/')[1], - metric_hash: queryParams.metricPath.split('.')[0], - variant_hash: queryParams.metricPath.split('.')[1], - valueType: queryParams.valueType ?? 'value' - }; + debounceTime(0) + ).subscribe(([metrics, hyperparams, queryParams]) => { + if ((metrics?.length > 0 || Object.keys(hyperparams || {})?.length > 0) && this.settingsLoaded) { + this.routeWasLoaded = true; + const flatVariants = flatten(metrics.map(m => m.variants)).map(mv => mv.value); + if (queryParams.metricPath) { + if (this.scatter) { + this.selectedMetric = { + metric: queryParams.metricName.split('/')[0], + variant: queryParams.metricName.split('/')[1], + metric_hash: queryParams.metricPath.split('.')[0], + variant_hash: queryParams.metricPath.split('.')[1], + valueType: queryParams.valueType ?? 'value' + }; + } else { + // backwards compatibility 3.21-> 3.20 + this.selectedMetrics = [{ + metric: queryParams.metricName.split('/')[0], + variant: queryParams.metricName.split('/')[1], + metric_hash: queryParams.metricPath.split('.')[0], + variant_hash: queryParams.metricPath.split('.')[1], + valueType: queryParams.valueType ?? 'value' + }]; + } } else { - // backwards compatibility 3.21-> 3.20 - this.selectedMetrics= [{ - metric: queryParams.metricName.split('/')[0], - variant: queryParams.metricName.split('/')[1], - metric_hash: queryParams.metricPath.split('.')[0], - variant_hash: queryParams.metricPath.split('.')[1], - valueType: queryParams.valueType ?? 'value' - }] + this.selectedMetric = undefined; + } + if (queryParams.metricVariants !== undefined && flatVariants?.length > 0) { + this.selectedMetrics = !queryParams.metricVariants ? [] : queryParams.metricVariants?.split(',').map(path => { + const variant = flatVariants.find(m => path.startsWith(m.path)); + return { + metric: variant.name.split('/')[0], + variant: variant.name.split('/')[1], + metric_hash: variant.path.split('.')[0], + variant_hash: variant.path.split('.')[1], + valueType: path.split('.')[2] ?? 'value' + }; + }); + } else { + this.selectedMetrics = []; } - } - else { - this.selectedMetric = undefined; - } - if (queryParams.metricVariants !== undefined) { - this.selectedMetrics = !queryParams.metricVariants ? [] : queryParams.metricVariants?.split(',').map(path => { - const variant = flatVariants.find(m => path.startsWith(m.path)); - return { - metric: variant.name.split('/')[0], - variant: variant.name.split('/')[1], - metric_hash: variant.path.split('.')[0], - variant_hash: variant.path.split('.')[1], - valueType: path.split('.')[2] ?? 'value' - }; - }); - } - if (queryParams.params) { - this.selectedHyperParams = Array.isArray(queryParams.params) ? queryParams.params.map(this.selectedItemsListMapper) : [queryParams.params].map(this.selectedItemsListMapper); + if (queryParams.params) { + this.selectedHyperParams = Array.isArray(queryParams.params) ? queryParams.params.map(this.selectedItemsListMapper) : [queryParams.params].map(this.selectedItemsListMapper); + } + } else { + this.selectedMetric = null; + this.selectedMetrics = []; } this.cdr.detectChanges(); })); @@ -249,6 +252,7 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes } selectedParamsChanged({param}) { + param = decodeURI(param); if (this.scatter) { this.updateServer(this.selectedMetric, this.selectedHyperParams.includes(param) ? [] : [param]); } else { @@ -272,17 +276,19 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes valueType?: SelectedMetricVariant['valueType'], selectedMetrics?: SelectedMetricVariant[], force?: boolean) { - (this.routeWasLoaded || force) && !skipNavigation && this.router.navigate([], { - queryParams: { - metricPath: selectedMetric ? `${selectedMetric?.metric_hash}.${selectedMetric?.variant_hash}` : undefined, - ...(isArray(selectedMetrics) && {metricVariants: selectedMetrics.map(mv => this.metricVariantToPathPipe.transform(mv, true)).toString()}), - metricName: selectedMetric ? `${selectedMetric?.metric}/${selectedMetric?.variant}` : undefined, - ...(selectedParams && {params: selectedParams}), - valueType: selectedMetric ? selectedMetric?.valueType || valueType || 'value' : undefined - }, - queryParamsHandling: 'merge', - replaceUrl: true - }); + if ((this.routeWasLoaded || force) && !skipNavigation) { + this.router.navigate([], { + queryParams: { + metricPath: selectedMetric ? `${selectedMetric?.metric_hash}.${selectedMetric?.variant_hash}` : undefined, + ...(isArray(selectedMetrics) && {metricVariants: selectedMetrics.map(mv => this.metricVariantToPathPipe.transform(mv, true)).toString()}), + metricName: selectedMetric ? `${selectedMetric?.metric}/${selectedMetric?.variant}` : undefined, + ...(selectedParams && {params: selectedParams}), + valueType: selectedMetric ? selectedMetric?.valueType || valueType || 'value' : undefined + }, + queryParamsHandling: 'merge', + replaceUrl: true + }); + } } @@ -318,11 +324,13 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes clearParamsSelection() { this.updateServer(this.selectedMetric, []); } + clearMetricsSelection() { - this.updateServer(null, undefined,false, undefined, [] ); + this.updateServer(null, undefined, false, undefined, []); } selectedParamsForHoverChanged({param}) { + param = decodeURI(param); const newSelectedParamsList = this.selectedParamsHoverInfo.includes(param) ? this.selectedParamsHoverInfo.filter(i => i !== param) : [...this.selectedParamsHoverInfo, param].map(this.selectedItemsListMapper); this.store.dispatch(setParamsHoverInfo({paramsHoverInfo: newSelectedParamsList})); 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 5ee89a2e..ff32f8dd 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 @@ -1,43 +1,45 @@
- - - + @if (!minimized) { + + } + @if (!minimized) { + + + }
- + > diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.ts index e958e4ab..44a48c5a 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.ts @@ -28,7 +28,7 @@ import {MetricVariantResult} from '~/business-logic/model/projects/metricVariant import {EventTypeEnum} from '~/business-logic/model/events/eventTypeEnum'; import {MatSidenavModule} from '@angular/material/sidenav'; import {ExperimentGraphsModule} from '@common/shared/experiment-graphs/experiment-graphs.module'; -import {AsyncPipe, NgIf} from '@angular/common'; +import {PushPipe} from '@ngrx/component'; @Component({ @@ -39,15 +39,18 @@ import {AsyncPipe, NgIf} from '@angular/common'; MatSidenavModule, ExperimentGraphsModule, SelectableGroupedFilterListComponent, - AsyncPipe, - NgIf + PushPipe ], standalone: true }) export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy { private routerParams$: Observable; - public metrics$: Observable; + public metrics$ = this.store.select(selectCompareTasksScalarCharts) + .pipe( + filter(metrics => !!metrics), + distinctUntilChanged() + ); public searchTerm$: Observable; private subs = new Subscription(); @@ -85,7 +88,7 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy private originalSettings: ExperimentCompareSettings; public minimized = false; public splitSize$: Observable; - public showSettingsBar = false; + public showSettingsBar$ = this.store.select(selectShowCompareScalarSettings); private selectedVariants: MetricVariants[]; private originMetrics: Array; private previousTaskIds: Array; @@ -110,19 +113,10 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy filter(h => !!h), distinctUntilChanged()); this.singleValues$ = this.store.select(selectMultiSingleValues); - this.metrics$ = this.store.select(selectCompareTasksScalarCharts).pipe( - filter(metrics => !!metrics), - distinctUntilChanged() - ); this.routerParams$ = this.store.select(selectRouterParams).pipe( filter(params => params.ids !== undefined), distinctUntilChanged() ); - - this.subs.add(this.store.select(selectShowCompareScalarSettings) - .subscribe((show) => this.showSettingsBar = show) - ); - } ngOnInit() { @@ -215,22 +209,34 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy if (!this.minimized) { let selectedMetricsCols: MetricVariantResult[]; if (this.settings.selectedMetricsScalar?.length > 0) { - selectedMetricsCols = metrics.filter(metric => this.settings.selectedMetricsScalar.includes(metric.metric + metric.variant) || this.settings.selectedMetricsScalar.includes(metric.metric)); + selectedMetricsCols = this.settings.groupBy === groupByCharts.none ? + 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.selectedMetricsScalar = Array.from(new Set([ + ...this.settings.selectedMetricsScalar, + ...selectedMetricsCols.map(metric => metric.metric) + ])); } else { if (this.settings.groupBy === 'metric') { const uniqueMetrics = Array.from(new Set(metrics.map(a => a.metric))); - const FifthMetric = uniqueMetrics[5] ?? uniqueMetrics.at(-1); - selectedMetricsCols = metrics.slice(0, metrics.findIndex(metric => metric.metric === FifthMetric) ?? 5); - + const FifthMetric = uniqueMetrics[8] ?? uniqueMetrics.at(-1); + selectedMetricsCols = metrics.slice(0, metrics.findIndex(metric => metric.metric === FifthMetric) ?? 8); } else { - selectedMetricsCols = metrics.slice(0, 5); + selectedMetricsCols = metrics.slice(0, 8); } - this.settings.selectedMetricsScalar = [...selectedMetricsCols.map(metric => metric.metric + metric.variant), ...Array.from(new Set(selectedMetricsCols.map(metric => metric.metric)))]; + this.settings.selectedMetricsScalar = [ + ...selectedMetricsCols.map(metric => metric.metric + metric.variant), + ...Array.from(new Set(selectedMetricsCols.map(metric => metric.metric))) + ]; } 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})); + this.changeDetection.markForCheck(); })); } @@ -292,21 +298,33 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy this.graphsComponent.scrollToGraph(id); } - selectedListChanged(selectedList) { + selectedListChanged(selectedList: string[]) { if (isEqual(selectedList, this.settings.selectedMetricsScalar)) { return; } this.settings = {...this.settings, selectedMetricsScalar: selectedList ?? []}; if (!this.minimized) { - const selectedMetricsCols = this.originMetrics.filter(metric => this.settings.selectedMetricsScalar.includes(metric.metric + metric.variant) || this.settings.selectedMetricsScalar.includes(metric.metric)); + 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); + 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})); + } else { + this.settings = {...this.settings, selectedMetricsScalar: []}; } } } + cleanVariantsWithoutMetric(selectedMetricsCols: MetricVariantResult[]) { + const allRealVariants = selectedMetricsCols.map(metric => [`${metric.metric}${metric.variant}`, metric.metric]).flat(2); + this.settings.selectedMetricsScalar = this.settings.selectedMetricsScalar.filter(m => allRealVariants.includes(m)); + } + searchTermChanged(searchTerm: string) { this.store.dispatch(setExperimentMetricsSearchTerm({searchTerm})); } @@ -328,11 +346,14 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy this.store.dispatch(getMultiScalarCharts({taskIds: this.taskIds, entity: this.entityType, metrics: this.selectedVariants, xAxisType: this.settings.xAxisType})); } - changeGroupBy($event: GroupByCharts) { - this.settings = {...this.settings, groupBy: $event}; + changeGroupBy(groupBy: GroupByCharts) { + this.settings = {...this.settings, groupBy}; this.prepareGraphsAndUpdate(this.metrics, this.singleValues); 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.store.dispatch(getMultiScalarCharts({ taskIds: this.taskIds, entity: this.entityType, @@ -344,6 +365,20 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy // } } + selectAllChildren(force = false) { + const newVariantsToSelect = []; + Object.entries(this.graphList).forEach(([metric, variant]) => { + if (this.settings.selectedMetricsScalar.includes(metric) && (this.settings.selectedMetricsScalar.filter(a => a.startsWith(metric)).length === 1 || force)) { + Object.keys(variant).map(variantName => metric + variantName).forEach(variantPath => { + if (!this.settings.selectedMetricsScalar.includes(variantPath)) { + newVariantsToSelect.push(variantPath); + } + }); + } + }); + return {...this.settings, selectedMetricsScalar: [...this.settings.selectedMetricsScalar, ...newVariantsToSelect]}; + } + toggleSettingsBar() { this.store.dispatch(toggleCompareScalarSettings()); } 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 91acf035..68d82e76 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 @@ -4,28 +4,32 @@
- - + @if (settings) { + + }
-
- -

NO METRICS

-
- -
- All metrics hidden. Clear filters + @if (dataTable?.length === 0) { +
+ +

NO METRICS

+
+ } -
+ @if (dataTable?.length > 0 && dataTableFiltered?.length === 0) { +
+ All metrics hidden. Clear filters +
+ } NO METRICS
+ name="filter" + [formControl]="variantFilter" + placeholder="Search metric" + matInput + autocomplete="off"> + (click)="variantFilter.value && clear(); filterRef.focus()" + smClickStopPropagation>
- - - {{ exp.name }} - + @for (exp of experiments; track exp.id) { + + + {{ exp.name }} + + } @@ -86,20 +92,28 @@

NO METRICS

{{ metricVariant.variant }} - -
- - -
- {{ metricVariant.values[exp.id]?.[valuesMode.key] }} - - MAX - MIN - + @if (metricVariant.min === metricVariant.max) { + + }
+ @for (exp of experiments; track exp.id) { + +
+ {{ metricVariant.values[exp.id]?.[valuesMode.key] }} + @if ((selectShowRowExtremes$ | ngrxPush) && metricVariant.min !== metricVariant.max) { + @if (metricVariant.values[exp.id]?.[valuesMode.key] === metricVariant.max) { + MAX + } + @if (metricVariant.values[exp.id]?.[valuesMode.key] === metricVariant.min) { + MIN + } + } +
+ + } 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 e3351de8..ca51f3d8 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 @@ -423,7 +423,6 @@ tr.first-row { } } -.empty-state {pointer-events: none;} .no-output { color: $blue-100; z-index: 1; 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 5a13a570..a57c4cba 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 @@ -49,7 +49,7 @@ const VALUE_MODES: ValueModes = { values: { key: 'value', name: 'Last Value' - }, + } }; @@ -97,12 +97,12 @@ export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy private scrollContainer: HTMLDivElement; public scrolled: boolean; public filterValue: string; - public settings: ExperimentCompareSettings = {} as ExperimentCompareSettings; + public settings: ExperimentCompareSettings = null; private initialSettings = { selectedMetricsScalar: [] - } as ExperimentCompareSettings - private originalSettings: string[]; - private selectedMetrics$: Observable; + } as ExperimentCompareSettings; + private originalSelection: string[]; + private selectedExperimentsSettings$: Observable; @HostListener('window:beforeunload', ['$event']) unloadHandler() { this.saveSettingsState(); @@ -118,25 +118,29 @@ export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy this.comparedTasks$ = this.store.select(selectCompareMetricsValuesExperiments); this.selectShowRowExtremes$ = this.store.select(selectShowRowExtremes); this.selectExportTable$ = this.store.select(selectExportTable).pipe(filter(e => !!e)); - this.selectedMetrics$ = this.store.select(selectSelectedExperimentSettings).pipe(distinctUntilChanged(isEqual)); + this.selectedExperimentsSettings$ = this.store.select(selectSelectedExperimentSettings).pipe(distinctUntilChanged(isEqual)); } ngOnInit() { this.entityType = this.route.snapshot.parent.parent.data.entityType; - this.subs.add(this.store.select(selectRouterConfig).pipe( - map(params => params?.at(-1).replace('-', '_')), - distinctUntilChanged() - ).subscribe((valuesMode) => { - this.valuesMode = VALUE_MODES[valuesMode] || VALUE_MODES['values']; - this.changeDetection.detectChanges(); - })); - this.subs.add(this.store.select(selectRouterParams).pipe( - distinctUntilKeyChanged('ids'), - map(params => params?.ids?.split(',')), - tap(taskIds => this.taskIds = taskIds), - filter(taskIds => !!taskIds && taskIds?.join(',') !== this.getExperimentIdsParams(this.experiments)) - ) + this.subs.add(this.store.select(selectRouterConfig) + .pipe( + map(params => params?.at(-1).replace('-', '_')), + distinctUntilChanged() + ) + .subscribe((valuesMode) => { + this.valuesMode = VALUE_MODES[valuesMode] || VALUE_MODES['values']; + this.changeDetection.markForCheck(); + })); + + this.subs.add(this.store.select(selectRouterParams) + .pipe( + distinctUntilKeyChanged('ids'), + map(params => params?.ids?.split(',')), + tap(taskIds => this.taskIds = taskIds), + filter(taskIds => !!taskIds && taskIds?.join(',') !== this.getExperimentIdsParams(this.experiments)) + ) .subscribe((experimentIds: string[]) => { this.store.dispatch(setSelectedExperiments({selectedExperiments: this.taskIds})); this.store.dispatch(metricsValuesActions.getComparedExperimentsMetricsValues({ @@ -173,30 +177,34 @@ export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy metricsValuesActions.getComparedExperimentsMetricsValues({taskIds: this.taskIds, entity: this.entityType, autoRefresh}) ))); - this.selectedMetrics$.pipe(combineLatestWith(this.variantFilter.valueChanges.pipe(startWith('')))).subscribe(([, variantFilter]) => { - this.filterValue = variantFilter; - this.filter(this.filterValue); - }); - - this.subs.add(this.colorHash.getColorsObservable().pipe( - ).subscribe(() => { - this.experimentsColor = this.experiments?.reduce((acc, exp) => { - acc[exp.id] = rgbList2Hex(this.colorHash.initColor(`${exp.orgName ?? exp.name}-${exp.id}`)); - return acc; - }, {} as { [name: string]: string }); - this.changeDetection.detectChanges(); - })); + this.subs.add(this.selectedExperimentsSettings$ + .pipe(combineLatestWith(this.variantFilter.valueChanges.pipe(startWith('')))) + .subscribe(([, variantFilter]) => { + this.filterValue = variantFilter; + this.filter(this.filterValue); + }) + ); + + this.subs.add(this.colorHash.getColorsObservable() + .subscribe(() => { + this.experimentsColor = this.experiments?.reduce((acc, exp) => { + acc[exp.id] = rgbList2Hex(this.colorHash.initColor(`${exp.orgName ?? exp.name}-${exp.id}`)); + return acc; + }, {} as { [name: string]: string }); + this.changeDetection.detectChanges(); + })); - this.subs.add(this.selectExportTable$.subscribe(() => { - this.dataTableFiltered.length && this.exportToCSV(); - this.store.dispatch(setExportTable({export: false})); - })); + this.subs.add(this.selectExportTable$ + .subscribe(() => { + this.dataTableFiltered.length && this.exportToCSV(); + this.store.dispatch(setExportTable({export: false})); + })); - this.subs.add(this.selectedMetrics$.pipe(take(1)).subscribe(settings => { - const selectedScalars = settings?.selectedMetricsScalar; - this.originalSettings = selectedScalars; - this.settings = settings ? {...this.initialSettings, selectedMetricsScalar: selectedScalars} : {...this.initialSettings} as ExperimentCompareSettings; - })); + this.selectedExperimentsSettings$ + .pipe(take(1)) + .subscribe(settings => { + this.originalSelection = settings.selectedMetricsScalar; + }); } private startTableScrollListener() { @@ -248,11 +256,29 @@ export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy 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: { [expId: string]: Task['last_metrics'] } }) + }, {values: {}} as { metric, variant, firstMetricRow: boolean, min: number, max: number, values: { [expId: string]: Task['last_metrics'] } }) }; })).flat(1); + + if (!this.settings) { + this.settings = this.originalSelection ? + {...this.initialSettings, selectedMetricsScalar: this.originalSelection} : + {...this.initialSettings}; + } if (!this.settings.selectedMetricsScalar || this.settings.selectedMetricsScalar?.length === 0) { this.settings.selectedMetricsScalar = this.getFirstMetrics(10); + } else { + const newVariantsToSelect = []; + Object.entries(this.metricVariantList).forEach(([metric, variant]) => { + if (this.settings.selectedMetricsScalar.includes(metric) && this.settings.selectedMetricsScalar.filter(a => a.startsWith(metric)).length === 1) { + Object.keys(variant).map(variantName => metric + variantName).forEach(variantPath => { + if (!this.settings.selectedMetricsScalar.includes(variantPath)) { + newVariantsToSelect.push(variantPath); + } + }); + } + }); + this.settings = {...this.settings, selectedMetricsScalar: [...this.settings.selectedMetricsScalar, ...newVariantsToSelect]}; } this.filter(this.filterValue); } @@ -262,7 +288,7 @@ 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)); + this.dataTableFiltered = this.dataTable.filter(row => this.settings.selectedMetricsScalar?.includes(row.metric + row.variant)).filter(row => row.metric.includes(value) || row.variant.includes(value)); this.showFilterTooltip = true; let previousMetric: string; this.dataTableFiltered.forEach(row => { @@ -300,11 +326,11 @@ export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy return { Metric: row.metric, Variant: row.variant, - ...headers.reduce( (acc, header, i) => { - acc[header] = values[i] + ...headers.reduce((acc, header, i) => { + acc[header] = values[i]; return acc; }, {}) - } + }; })); download(options)(csv); } @@ -315,20 +341,20 @@ export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy showAll() { const firstSelectedMetrics = this.getFirstMetrics(10); - this.settings = {...this.settings, selectedMetricsScalar: this.originalSettings.length > 0 ? this.originalSettings : firstSelectedMetrics}; + this.settings = {...this.settings, selectedMetricsScalar: this.originalSelection.length > 0 ? this.originalSelection : firstSelectedMetrics}; this.filter(this.filterValue); } private getFirstMetrics(number: number) { - const sortedMetrics = Object.entries(this.metricVariantList).sort((a, b) => a[0] > b[0]? -1 : 1); + const sortedMetrics = Object.entries(this.metricVariantList).sort((a, b) => a[0] > b[0] ? -1 : 1); return sortedMetrics.map(([metric, variants]) => { const sortedVariants = Object.keys(variants).sort(); - return sortedVariants.map(variant => metric + variant) + return sortedVariants.map(variant => metric + variant); }).flat().slice(0, number); } private saveSettingsState() { - if (!isEqual(this.settings.selectedMetricsScalar, this.originalSettings)) { + if (!isEqual(this.settings.selectedMetricsScalar, this.originalSelection)) { this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {selectedMetricsScalar: this.settings.selectedMetricsScalar}})); } } diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.html b/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.html index 10f5579f..75e25984 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.html +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.html @@ -1,10 +1,10 @@ + >
-
- - - - -
-
-
- - {{(renameMap[node.data.key] || node.data.key)}} -
-
-
-
+ + @let dataSource = experimentsDataControl[experiment.id][0]; + @let treeControl = experimentsDataControl[experiment.id][1]; + + +
+ @if (node.hasChildren) { +
+
+ + {{(renameMap[node.data.key] || node.data.key)}} +
+
+ } + @if (!node.hasChildren) { +
+
-
- 
{{node.data.key}}
-
- 
{{node.data.value}}
-
- -
+ @if ((node.data.value !== undefined) || (node.data.existOnOrigin && node.data.existOnCompared)) { +
+ 
{{node.data.key}}
+
+ 
{{node.data.value}}
+
+ @if (node.data.tooltip) { + + } +
+ }
-
- - - -
+ } +
+ +
+} +
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 2fdda88d..38a52047 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 @@ -8,6 +8,7 @@ .section { pre { overflow: hidden; + white-space: nowrap; } .node-row { 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 96c72a2d..521430b3 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,17 +1,19 @@
-
- - -
+ @if (!minimized) { +
+ + +
+ }
+ >
diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.ts index b9b40aef..eca1ed97 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.ts @@ -5,7 +5,7 @@ import {Store} from '@ngrx/store'; import {distinctUntilChanged, filter, take, tap, withLatestFrom} from 'rxjs/operators'; import {combineLatest} from 'rxjs'; import {selectRouterParams} from '@common/core/reducers/router-reducer'; -import {convertMultiPlots, IMultiplot, prepareMultiPlots, sortMetricsList} from '@common/tasks/tasks.utils'; +import {convertMultiPlots, prepareMultiPlots, sortMetricsList} from '@common/tasks/tasks.utils'; import {isEqual} from 'lodash-es'; import { getMultiPlotCharts, @@ -34,21 +34,21 @@ import {getCustomMetricsPerType} from '@common/experiments/actions/common-experi import {EventTypeEnum} from '~/business-logic/model/events/eventTypeEnum'; import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; -import {AsyncPipe, NgIf} from '@angular/common'; import {SelectableFilterListComponent} from '@common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component'; import {ExperimentGraphsModule} from '@common/shared/experiment-graphs/experiment-graphs.module'; import {ReportsApiMultiplotsResponse} from '@common/constants'; +import {PushPipe} from '@ngrx/component'; +import {HIDDEN_PLOTS_BY_DEFAULT} from '@common/experiments-compare/experiments-compare.constants'; @Component({ selector: 'sm-experiment-compare-plots', templateUrl: './experiment-compare-plots.component.html', styleUrls: ['./experiment-compare-plots.component.scss'], imports: [ - NgIf, SelectableFilterListComponent, ExperimentGraphsModule, - AsyncPipe - ], + PushPipe +], standalone: true }) export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { @@ -61,8 +61,8 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { private subs = new Subscription(); public graphList: SelectableListItem[] = []; - private taskIds: Array; - public graphs: { [key: string]: ExtFrame[] }; + private taskIds: string[]; + public graphs: Record; public refreshDisabled: boolean; @ViewChild(ExperimentGraphsComponent) graphsComponent: ExperimentGraphsComponent; @@ -77,9 +77,9 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { public minimized = false; private previousSelectedMetrics: ISmCol[]; public splitSize$: Observable; - private originMetrics: Array; + private originMetrics: MetricVariantResult[]; private firstTime = true; - private previousTaskIds: Array; + private previousTaskIds: string[]; @HostListener('window:beforeunload', ['$event']) unloadHandler() { this.saveSettingsState(); @@ -121,13 +121,15 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { const tagsLists = globalLegendOrSelectedExperiments.reduce((acc, task) => { acc[task.id] = task.tags ?? []; return acc; - }, {} as { [id: string]: string[] }); + }, {} as Record); const newGraphs = convertMultiPlots(merged, tagsLists); if (!this.graphs || !isEqual(newGraphs, this.graphs)) { this.graphs = newGraphs; } this.changeDetection.detectChanges(); - 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.subs.add(this.routerParams$ @@ -157,7 +159,7 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { acc[curr.metricName] = [curr.variantName]; } return acc; - }, {} as { [metric: string]: string[] }); + }, {} as Record); this.settings.selectedMetricsPlot = selectedMetrics.filter(m => !m.hidden).map(m => `${m.metricName} - ${m.variantName}`); const variants = Object.entries(metricsVariants).map(([metricName, variants]) => ({metric: metricName, variants})) this.selectedVariants = variants; @@ -179,7 +181,7 @@ 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, 5).map(a => a.name)} as ExperimentCompareSettings; + this.settings = selectedMetrics ? {...this.initialSettings, selectedMetricsPlot: selectedMetrics} : {...this.initialSettings, selectedMetricsPlot: this.graphList.slice(0, 8).map(a => a.name)} as ExperimentCompareSettings; })); this.subs.add(this.store.select(selectMetricVariantsPlots) @@ -191,13 +193,15 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { 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.slice(0, 5); + this.settings.selectedMetricsPlot = listSorted.filter(name => !HIDDEN_PLOTS_BY_DEFAULT.includes(name)).slice(0, 8); } if (!this.minimized) { const selectedMetricsCols = metrics.filter(metric => this.settings.selectedMetricsPlot.includes(`${metric.metric} - ${metric.variant}`)) this.selectedVariants = this.buildMetricVariants(selectedMetricsCols) - this.selectedVariants?.length > 0 && this.store.dispatch(getMultiPlotCharts({taskIds: this.taskIds, entity: this.entityType, metrics: this.selectedVariants})); + if (this.selectedVariants?.length > 0) { + this.store.dispatch(getMultiPlotCharts({taskIds: this.taskIds, entity: this.entityType, metrics: this.selectedVariants})); + } } })); } @@ -210,7 +214,7 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { acc[curr.metric] = [curr.variant]; } return acc; - }, {} as { [metric: string]: string[] }); + }, {} as Record); return Object.entries(metricsVariants).map(([metricName, variants]) => ({metric: metricName, variants})) } @@ -222,7 +226,7 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { this.resetMetrics(); } - private prepareList(metricsScalar): Array { + private prepareList(metricsScalar): SelectableListItem[] { const list = metricsScalar ? Object.keys(metricsScalar) : []; const sortedList = sortMetricsList(list); return sortedList.map((item) => ({name: item, value: item})); @@ -238,7 +242,9 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { const selectedMetricsCols = this.originMetrics.filter(metric => this.settings.selectedMetricsPlot.includes(`${metric.metric} - ${metric.variant}`)) const variants = this.buildMetricVariants(selectedMetricsCols) this.selectedVariants = variants; - variants?.length > 0 && this.store.dispatch(getMultiPlotCharts({taskIds: this.taskIds, entity: this.entityType, metrics: variants})); + if (variants?.length > 0) { + this.store.dispatch(getMultiPlotCharts({taskIds: this.taskIds, entity: this.entityType, metrics: variants})); + } } } diff --git a/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.html b/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.html index efc382b3..8c11450f 100644 --- a/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.html +++ b/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.html @@ -1,11 +1,11 @@ + >
-
- - - - -
-
-
- - {{(renameMap[node.data.key] || node.data.key) | hideHashTitle}} - -
-
-
-
+ + @let dataSource = experimentsDataControl[experiment.id][0]; + @let treeControl = experimentsDataControl[experiment.id][1]; + + +
+ @if (node.hasChildren) { +
+
+ + {{(renameMap[node.data.key] || node.data.key) | hideHashTitle}} + @if (node.data.tooltip) { + + } +
+
+ } + @if (!node.hasChildren) { +
+
-
- 
{{node.data.key |
+                      

+                        @if ((node.data.value !== undefined) || (node.data.existOnOrigin && node.data.existOnCompared)) {
+                          
@if (!!node.data.value?.dataDictionary && !!node.data.value?.link) {
+                            {{node.data.key |
                             hideHash}}{{node.data.value.dataValue}}{{node.data.key | hideHash}}{{node.data.value}}
-                    

+                          (click)="linkClicked(node.data.value.link)">{{node.data.value.dataValue}}
+                        } @else {
+                          {{node.data.key | hideHash}}{{node.data.value}}
+                          }
+
+ } +
-
+ }
-
-
+ } +
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 f96da88c..979827fb 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 @@ -10,6 +10,8 @@ display: inline-block; position: relative; overflow: visible; + white-space: nowrap; + .link { color: $purple; } diff --git a/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.html b/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.html index a6ec138f..51373fb2 100644 --- a/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.html +++ b/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.html @@ -16,11 +16,11 @@
Include Archived
@@ -32,22 +32,22 @@ [selectionMode]="null" [reorderableColumns]="false" [minimizedView]="false" - [colsOrder]="(tableColsOrder$ | async)" - [tableCols]="tableCols$| async" - [users]="users$ | async" - [projects]="projects$ | async" + [colsOrder]="(tableColsOrder$ | ngrxPush)" + [tableCols]="tableCols$| ngrxPush" + [users]="users$ | ngrxPush" + [projects]="projects$ | ngrxPush" [selectedExperiments]="selectedExperimentsIds | idToObjectsArray" - [experiments]="experiments$ | async" - [experimentTypes]="types$ | async" - [tableFilters]="(tableFilters$ | async)" - [tableSortFields]="(tableSortFields$ | async)" - [tableSortOrder]="(tableSortOrder$ | async)" - [tags]="tags$ | async" - [hyperParamsOptions]="hyperParamsOptions$ | async" - [activeParentsFilter]="activeParentsFilter$ | async" - [parents]="parent$ | async" - [noMoreExperiments]="noMoreExperiments$ | async" - [systemTags]="systemTags$ | async" + [experiments]="experiments$ | ngrxPush" + [experimentTypes]="types$ | ngrxPush" + [tableFilters]="(tableFilters$ | ngrxPush)" + [tableSortFields]="(tableSortFields$ | ngrxPush)" + [tableSortOrder]="(tableSortOrder$ | ngrxPush)" + [tags]="tags$ | ngrxPush" + [hyperParamsOptions]="hyperParamsOptions$ | ngrxPush" + [activeParentsFilter]="activeParentsFilter$ | ngrxPush" + [parents]="parent$ | ngrxPush" + [noMoreExperiments]="noMoreExperiments$ | ngrxPush" + [systemTags]="systemTags$ | ngrxPush" [entityType]="entityTypes.experiment" (tagsMenuOpened)="refreshTagsList()" (typesMenuOpened)="refreshTypesList()" @@ -57,8 +57,7 @@ (filterChanged)="filterChanged($event)" (filterSearchChanged)="filterSearchChanged($event)" (columnResized)="resizeCol($event)" - > - + >
@@ -71,5 +70,4 @@ CANCEL
- 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 3a242e39..7d6b83e7 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 @@ -251,7 +251,7 @@ export class SelectExperimentsForCompareComponent implements OnInit, OnDestroy { ngOnDestroy(): void { this.paramsSubscription.unsubscribe(); this.store.dispatch(setShowSearchExperimentsForCompare({payload: false})); - this.store.dispatch(resetExperiments()); + this.store.dispatch(resetExperiments({skipResetMetric: true})); this.store.dispatch(resetGlobalFilter()); this.store.dispatch(resetSelectCompareHeader({fullReset: false})); } diff --git a/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.html b/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.html index 9c61966d..941d8d5b 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.html +++ b/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.html @@ -4,58 +4,64 @@ cdkDropList cdkDropListOrientation="horizontal" (cdkDropListDropped)="drop($event)" -> - - - -
- - -
-
-
- - - - - - + > + @for (experiment of (experiments); track experiment.id; let i = $index) { + + + +
+ +
-
-
- +
+
+ + @if (experiments.length > 1) { + + } + @if (baseExperiment.id !== experiment.id) { + + + } + + +
+
+
+ + +
+ + + + } + @if (tasksLimitExceeded) { +
+
+ Only the first 10 experiments are available for this view...
- - - - -
-
- Only the first 10 experiments are available for this view...
-
+ }
diff --git a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.html b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.html index 1d28fb2b..3f0bf2ee 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.html +++ b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.html @@ -11,12 +11,14 @@
- + @if (experimentsStatusLabels[experiment.status]) { + + } {{experimentsStatusLabels[experiment.status] ?? experiment.status}} - + @if (experiment.last_iteration !== undefined) { {{experiment.last_iteration | number | NA}} iterations - + } Last updated {{experiment.last_update | timeAgo | NA}}
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 487199b5..7a6eee60 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 @@ -7,7 +7,7 @@ import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import {IdBadgeComponent} from '@common/shared/components/id-badge/id-badge.component'; import {TagListComponent} from '@common/shared/ui-components/tags/tag-list/tag-list.component'; -import {DatePipe, DecimalPipe, NgIf} from '@angular/common'; +import { DatePipe, DecimalPipe } from '@angular/common'; import {NAPipe} from '@common/shared/pipes/na.pipe'; import {TimeAgoPipe} from '@common/shared/pipes/timeAgo'; import {EllipsisMiddleDirective} from '@common/shared/ui-components/directives/ellipsis-middle.directive'; @@ -23,13 +23,12 @@ import {EllipsisMiddleDirective} from '@common/shared/ui-components/directives/e RouterLink, IdBadgeComponent, TagListComponent, - NgIf, DecimalPipe, NAPipe, TimeAgoPipe, DatePipe, EllipsisMiddleDirective - ] +] }) export class ExperimentCompareGeneralDataComponent { diff --git a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-header/experiment-compare-header.component.html b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-header/experiment-compare-header.component.html index 983de515..a0c918c3 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-header/experiment-compare-header.component.html +++ b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-header/experiment-compare-header.component.html @@ -1,94 +1,115 @@
- - + + (click)="openAddExperimentSearch()" class="btn btn-secondary btn-add-experiment plus"> - - - - - - Parallel Coordinates - Scatter Plot - Graph - Last Values - {{ (queryParamsViewMode$ | async) || viewMode | noUnderscore | titlecase }} - - - - - Last Values + @if (viewMode) { + + + + + @switch (true) { + @case (currentPage === 'hyper-params' && viewMode === 'graph') { + Parallel Coordinates + } + @case (currentPage === 'hyper-params' && viewMode === 'scatter') { + Scatter Plot + } + @case (currentPage === 'scalars' && viewMode === 'graph') { + Graph + } + @case (currentPage === 'scalars' && viewMode === 'values') { + Last Values + } + @default { + {{ (queryParamsViewMode$ | ngrxPush) || viewMode | noUnderscore | titlecase }} + } + } + + @if (currentPage === 'scalars') { + + Last Values + + @if (currentPage === 'scalars') { + + Min Values + + } + @if (currentPage === 'scalars') { + + Max Values + + } + } @else { + + Values + + } + + {{ currentPage === 'hyper-params' ? 'Parallel Coordinates' : 'Graph' }} - - Min Values - - - Max Values - - - - - Values - - - - {{ currentPage === 'hyper-params' ? 'Parallel Coordinates' : 'Graph' }} - - - Scatter Plot - - - + @if (currentPage === 'hyper-params') { + + Scatter Plot + + } + + + }
- Hide Identical {{ (viewMode === 'graph' || viewMode === 'scatter') ? 'Parameters' : 'Fields' }} - + @if (['hyper-params', 'details', 'models-details', 'network'].includes(currentPage)) { + Hide Identical {{ (viewMode === 'graph' || viewMode === 'scatter') ? 'Parameters' : 'Fields' }} + + } - Show row extremes - + @if (['scalars'].includes(currentPage) && viewMode !== 'graph') { + Show row extremes + + }
- + @if (['scalars'].includes(currentPage) && viewMode !== 'graph') { + + } - - --> + - -
+ +
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 3a5086b5..c139bf23 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 @@ -20,7 +20,7 @@
-
+
@for (experiment of experiments; track experiment.id) {
@@ -32,11 +32,13 @@ + [class.hide]="experiment.hidden" + smShowTooltipIfEllipsis + [smTooltip]="experiment.name + (experiment.duplicateName ? ('.' + (experiment.id|slice:0:5)) : '')"> {{experiment.name + (experiment.duplicateName ? ('.' + (experiment.id|slice:0:5)) : '')}}
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 958d451c..0bde0600 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 @@ -40,7 +40,7 @@ .experiment-name { padding: 4px 12px; - min-width: 200px; + min-width: 0; display: flex; align-items: center; } @@ -57,6 +57,14 @@ font-size: 14px; max-height: calc(100% - 524px); overflow: auto; + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr; + @media(max-width: 1300px) { + grid-template-columns: 1fr 1fr 1fr; + } + @media(max-width: 1080px) { + grid-template-columns: 1fr 1fr; + } } .task-name { @@ -106,3 +114,11 @@ background-color: white; } } + +.graph-container.downloading { + height: unset !important; + + .legend-container { + overflow: visible; + } +} 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 7b877e8f..3dfdce7a 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 @@ -23,6 +23,7 @@ import {MatDialog} from '@angular/material/dialog'; import {ChooseColorModule} from '@common/shared/ui-components/directives/choose-color/choose-color.module'; import {MetricVariantToPathPipe} from '@common/shared/pipes/metric-variant-to-path.pipe'; import {MetricVariantToNamePipe} from '@common/shared/pipes/metric-variant-to-name.pipe'; +import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; // eslint-disable-next-line @typescript-eslint/naming-convention declare let Plotly; @@ -59,7 +60,8 @@ interface ParaPlotData { SlicePipe, TooltipDirective, ChooseColorModule, - MetricVariantToNamePipe + MetricVariantToNamePipe, + ShowTooltipIfEllipsisDirective ], standalone: true }) @@ -215,8 +217,10 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent type: 'parcoords', labelangle: 30, dimensions: this.parameters.map((parameter) => { + const splitted = parameter.split('.'); + const newParameter = [splitted.shift(), splitted.join('.'), 'value']; parameter = `${parameter}.value`; - const allValuesIncludingNull = this.experiments.map(experiment => get(experiment.hyperparams, parameter)); + const allValuesIncludingNull = this.experiments.map(experiment => get(experiment.hyperparams, newParameter)); const allValues = allValuesIncludingNull.filter(value => (value !== undefined)).filter(value => (value !== '')); const textVal = {} as { [key: string]: number }; let ticktext = this.naturalCompare(uniq(allValues).filter(text => text !== '')); @@ -233,7 +237,7 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent } } return { - label: parameter, + label: parameter.replace(/\.value$/, ''), ticktext, tickvals, values: filteredExperiments.map((experiment) => (textVal[['', undefined].includes(get(experiment.hyperparams, parameter)) ? 'N/A' : get(experiment.hyperparams, parameter)])), @@ -313,9 +317,9 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent return valuesMax === valuesMin ? (valuesMin - 1) : valuesMin - ((valuesMax - valuesMin) / values.length); } - getLayout(setDimentiosn = true) { + getLayout(setDimentiosn = true, margins?) { return { - margin: {l: 120, r: 120}, + margin: margins ? margins : {l: 120, r: 120}, ...(setDimentiosn && { height: 500, width: this.parallelGraph.nativeElement.offsetWidth @@ -409,6 +413,7 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent } downloadImage() { + this.container.nativeElement.classList.add('downloading'); from(domtoimage.toBlob(this.container.nativeElement)) .pipe(take(1)) .subscribe((blob: Blob) => { @@ -418,6 +423,7 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent a.target = '_blank'; a.download = `Hyperparameters ${this.metrics[0].metric} ${this.metrics[0].variant}.png`; a.click(); + this.container.nativeElement.classList.remove('downloading'); }); } @@ -438,7 +444,7 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent chart: cloneDeep({ data: this.data as unknown as ExtData[], layout: { - ...this.getLayout(false), + ...this.getLayout(false, {l: 120, r: 120, t: 150, b: 40}), title: '' }, config: { diff --git a/src/app/webapp-common/experiments-compare/effects/experiments-compare-charts.effects.ts b/src/app/webapp-common/experiments-compare/effects/experiments-compare-charts.effects.ts index 52428add..d4a96043 100644 --- a/src/app/webapp-common/experiments-compare/effects/experiments-compare-charts.effects.ts +++ b/src/app/webapp-common/experiments-compare/effects/experiments-compare-charts.effects.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import * as chartActions from '../actions/experiments-compare-charts.actions'; import {activeLoader, deactivateLoader, setServerError} from '../../core/actions/layout.actions'; 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 aff0ee2c..070e7923 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 @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {activeLoader, deactivateLoader, setServerError} from '../../core/actions/layout.actions'; import {catchError, filter, map, mergeMap, switchMap} from 'rxjs/operators'; diff --git a/src/app/webapp-common/experiments-compare/effects/experiments-compare-scalars-graph.effects.ts b/src/app/webapp-common/experiments-compare/effects/experiments-compare-scalars-graph.effects.ts index 704b56dd..1a156b77 100644 --- a/src/app/webapp-common/experiments-compare/effects/experiments-compare-scalars-graph.effects.ts +++ b/src/app/webapp-common/experiments-compare/effects/experiments-compare-scalars-graph.effects.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {activeLoader, deactivateLoader, setServerError} from '../../core/actions/layout.actions'; import {catchError, mergeMap, map} from 'rxjs/operators'; import {requestFailed} from '../../core/actions/http.actions'; diff --git a/src/app/webapp-common/experiments-compare/effects/select-experiment-for-compare-effects.service.ts b/src/app/webapp-common/experiments-compare/effects/select-experiment-for-compare-effects.service.ts index 0078229c..36dbe84c 100644 --- a/src/app/webapp-common/experiments-compare/effects/select-experiment-for-compare-effects.service.ts +++ b/src/app/webapp-common/experiments-compare/effects/select-experiment-for-compare-effects.service.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {debounceTime, filter, map, mergeMap, switchMap} from 'rxjs/operators'; import {activeLoader, deactivateLoader} from '../../core/actions/layout.actions'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; diff --git a/src/app/webapp-common/experiments-compare/experiments-compare.component.html b/src/app/webapp-common/experiments-compare/experiments-compare.component.html index 44eb3e67..79a679da 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare.component.html +++ b/src/app/webapp-common/experiments-compare/experiments-compare.component.html @@ -1,26 +1,30 @@
-
+
-
- + - - {{exp.name}} - - - -
+ > + + {{exp.name}} + + + @if ((globalLegendData$ | ngrxPush)?.length > 1) { + + } +
+ }
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 9b0edb12..f273d006 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare.component.scss +++ b/src/app/webapp-common/experiments-compare/experiments-compare.component.scss @@ -142,13 +142,16 @@ $header-height: 60px; display: inline-block; font-size: 12px; font-weight: 500; - color: $blue-800; margin-right: 6px; max-width: 300px; - > a:hover { - text-decoration: underline; - text-underline-offset: 4px; - text-decoration-color: $blue-300; + > a { + color: $blue-800; + &:hover { + color: $blue-900; + text-decoration: underline; + text-underline-offset: 4px; + text-decoration-color: $blue-300; + } } } diff --git a/src/app/webapp-common/experiments-compare/experiments-compare.constants.ts b/src/app/webapp-common/experiments-compare/experiments-compare.constants.ts index baac9fbb..39428003 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare.constants.ts +++ b/src/app/webapp-common/experiments-compare/experiments-compare.constants.ts @@ -110,3 +110,5 @@ export const MODELS_COMPARE_ROUTES = [ {header: 'scalars', subHeader: ''}, {header: 'plots', subHeader: '', featureLink: 'metrics-plots'}, ] as HeaderNavbarTabConfig[]; + +export const HIDDEN_PLOTS_BY_DEFAULT = ['Pipeline - Execution Flow', 'Pipeline Details - Execution Details']; 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 fc378149..9690513b 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare.module.ts +++ b/src/app/webapp-common/experiments-compare/experiments-compare.module.ts @@ -106,6 +106,8 @@ import {MetricVariantToPathPipe} from '@common/shared/pipes/metric-variant-to-pa import {MetricResultToSelectedMetricPipe} from '@common/shared/pipes/metric-result-to-selected-metric.pipe'; import {MetricVariantToNamePipe} from '@common/shared/pipes/metric-variant-to-name.pipe'; import {DrawerComponent} from '@common/shared/ui-components/panel/drawer/drawer.component'; +import {PushPipe} from '@ngrx/component'; + export const COMPARE_STORE_KEY = 'experimentsCompare'; export const COMPARE_CONFIG_TOKEN = @@ -217,6 +219,7 @@ export const getCompareConfig = (userPreferences: UserPreferences) => ({ MetricResultToSelectedMetricPipe, MetricVariantToNamePipe, DrawerComponent, + PushPipe, ], providers: [ {provide: COMPARE_CONFIG_TOKEN, useFactory: getCompareConfig, deps: [UserPreferences]}, diff --git a/src/app/webapp-common/experiments-compare/jsonToDiffConvertor.ts b/src/app/webapp-common/experiments-compare/jsonToDiffConvertor.ts index 651b44bc..72e3e59e 100644 --- a/src/app/webapp-common/experiments-compare/jsonToDiffConvertor.ts +++ b/src/app/webapp-common/experiments-compare/jsonToDiffConvertor.ts @@ -345,17 +345,21 @@ export function compareArrayOfStrings>(values: T): T { } export function convertConfigurationFromExperiments>(experiments: T, originalExperiments: Record): T { - const data = experiments.map(experiment => originalExperiments[experiment.id]?.configuration?.General?.value.split('\n') || []) || []; - if (data.some(experimentData => experimentData.length > MAX_ROWS_FOR_SMART_COMPARE_ARRAYS)) { - return experiments; - } - const values = compareArrayOfStrings(data); - experiments.forEach((experiment, index) => { - if (' General' in experiment.configuration) { - experiment.configuration[' General'] = values[index] as any; - } else { - experiment.configuration['General'] = values[index] as any; + const allKeys = new Set(experiments.map(experiment => Object.keys(experiment.configuration)).flat(1)); + allKeys.forEach(key => { + const keyData = experiments.map(experiment => originalExperiments[experiment.id]?.configuration?.[key.trim()]?.value.split('\n') || []) || []; + if (keyData.some(experimentData => experimentData.length > MAX_ROWS_FOR_SMART_COMPARE_ARRAYS)) { + return; } + const keyValues = compareArrayOfStrings(keyData); + experiments.forEach((experiment, index) => { + if (` ${key}` in experiment.configuration) { + experiment.configuration[` ${key}`] = keyValues[index] as any; + } else { + experiment.configuration[key] = keyValues[index] as any; + } + + }); }); return experiments; } diff --git a/src/app/webapp-common/experiments-compare/services/model-details-reverter.service.ts b/src/app/webapp-common/experiments-compare/services/model-details-reverter.service.ts index a812ab59..5980e920 100644 --- a/src/app/webapp-common/experiments-compare/services/model-details-reverter.service.ts +++ b/src/app/webapp-common/experiments-compare/services/model-details-reverter.service.ts @@ -1,4 +1,4 @@ -/* eslint-disable @typescript-eslint/naming-convention */ + import {Inject, Injectable, LOCALE_ID} from '@angular/core'; import {TAGS} from '../../tasks/tasks.constants'; import {IModelInfo} from '../../experiments/shared/common-experiment-model.model'; @@ -22,7 +22,7 @@ export class ModelDetailsReverterService { this.locale = locale; } - revertModels(modelIds: Array, models: Array, tasks: Array): ModelDetail[] { + revertModels(modelIds: string[], models: IModelInfo[], tasks: ITask[]): ModelDetail[] { // map the experiment ids to keep the user order. return modelIds.map(id => { const model = models.find(ex => ex.id === id); @@ -42,7 +42,7 @@ export class ModelDetailsReverterService { }); } - revertModelsDesign(modelIds: Array, models: Array, safeMode: boolean): ModelDetail[] { + revertModelsDesign(modelIds: string[], models: IModelInfo[], safeMode: boolean): ModelDetail[] { // map the experiment ids to keep the user order. return modelIds.map(id => { const model = models.find(ex => ex.id === id); @@ -89,9 +89,9 @@ export class ModelDetailsReverterService { return model.metadata; } - private revertLineage(model: IModelInfo, tasks: Array) { + private revertLineage(model: IModelInfo, tasks: ITask[]) { return { - 'created by': `${model.task.name} (${model.task.id})`, + ...(model.task && {'created by': `${model.task.name} (${model.task.id})`}), 'Used by': tasks.reduce((acc, curr) => { acc[`hash_${curr.name}${curr.id}`] = `${curr.name} : ${curr.id}`; return acc; diff --git a/src/app/webapp-common/experiments-compare/shared/experiment-compare-shared.module.ts b/src/app/webapp-common/experiments-compare/shared/experiment-compare-shared.module.ts index 2bb1113c..d56d7f93 100755 --- a/src/app/webapp-common/experiments-compare/shared/experiment-compare-shared.module.ts +++ b/src/app/webapp-common/experiments-compare/shared/experiment-compare-shared.module.ts @@ -12,6 +12,8 @@ import {MatExpansionModule} from '@angular/material/expansion'; 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 {IsEmptyPipe} from '@common/shared/pipes/is-empty.pipe'; +import {MatSlideToggle} from '@angular/material/slide-toggle'; + const declarations = [ ExperimentSettingsComponent, @@ -30,7 +32,8 @@ const declarations = [ MatExpansionModule, TooltipDirective, ShowTooltipIfEllipsisDirective, - IsEmptyPipe + IsEmptyPipe, + MatSlideToggle, ], declarations : [declarations], exports : [...declarations] 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 99b505a2..a53ff159 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 @@ -2,8 +2,10 @@ import {createAction, props} from '@ngrx/store'; import {ExperimentSettings} from '../reducers/experiment-output.reducer'; import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {MetricsPlotEvent} from '~/business-logic/model/events/metricsPlotEvent'; -import {EventsGetTaskSingleValueMetricsResponseTasks} from '~/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseTasks'; -import {ChartHoverModeEnum} from '../shared/common-experiments.const'; +import { + EventsGetTaskSingleValueMetricsResponseTasks +} from '~/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseTasks'; +import {Task} from '~/business-logic/model/tasks/task'; export type GroupByCharts = 'metric' | 'none'; @@ -82,6 +84,11 @@ export const setExperimentScalarSingleValue = createAction( props() ); +export const setExperimentMetricsVariantValues = createAction( + EXPERIMENTS_OUTPUT_PREFIX + 'SET_EXPERIMENT_METRICS_VARIANT_VALUES', + props<{lastMetrics: Task['last_metrics']} >() +); + export const setExperimentSettings = createAction( EXPERIMENTS_OUTPUT_PREFIX + 'UPDATE_EXPERIMENT_SETTINGS', props<{ id: string; changes: Partial }>() @@ -102,5 +109,6 @@ export const setLogFilter = createAction( export const resetLogFilter = createAction(EXPERIMENTS_OUTPUT_PREFIX + 'RESET_LOG_FILTER'); export const downloadFullLog = createAction(EXPERIMENTS_OUTPUT_PREFIX + 'DOWNLOAD_FULL_LOG', props<{ experimentId: string }>()); export const toggleSettings = createAction(EXPERIMENTS_OUTPUT_PREFIX + 'TOGGLE_SETTINGS'); +export const toggleMetricValuesView = createAction(EXPERIMENTS_OUTPUT_PREFIX + 'TOGGLE_METRIC_VALUES_VIEW'); export const setGraphsPerRow = createAction(EXPERIMENTS_OUTPUT_PREFIX + 'SET_GRAPHS_PER_ROW', props<{ graphsPerRow: number }>()); 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 f8056c6b..6b10f74d 100755 --- a/src/app/webapp-common/experiments/actions/common-experiments-info.actions.ts +++ b/src/app/webapp-common/experiments/actions/common-experiments-info.actions.ts @@ -6,39 +6,78 @@ import {ParamsItem} from '~/business-logic/model/tasks/paramsItem'; 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', + pending = 'pending', + skipped = 'skipped', + cached = 'cached', + executed = 'executed', + running = 'running', + failed = 'failed', + aborted = 'aborted', + completed = 'completed' +} + +export interface TreeStep { + base_task_id: string, + queue: string, + parents: string[], + executed: string; + status: StepStatusEnum; + job_type: TaskTypeEnum; + job_started: number; + job_ended: number; + job_code_section: string; + job_id: string; +} export const EXPERIMENTS_INFO_PREFIX = 'EXPERIMENTS_INFO_'; export const getExperimentInfo = createAction( EXPERIMENTS_INFO_PREFIX + 'GET_EXPERIMENT_INFO', - props<{id: string}>() + 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'); export const autoRefreshExperimentInfo = createAction( EXPERIMENTS_INFO_PREFIX + 'AUTO_REFRESH_EXPERIMENT_INFO', - props<{id: string}>() + props<{ id: string }>() ); export const setExperiment = createAction( EXPERIMENTS_INFO_PREFIX + 'SET_EXPERIMENT', - props<{experiment: IExperimentInfo}>() + props<{ experiment: IExperimentInfo }>() ); export const experimentUpdatedSuccessfully = createAction( EXPERIMENTS_INFO_PREFIX + 'EXPERIMENT_UPDATED_SUCCESSFULLY', - props<{id: string}>() + props<{ id: string }>() ); export const setExperimentInfoData = createAction( EXPERIMENTS_INFO_PREFIX + 'SET_EXPERIMENT_INFO_DATA', - props<{experiment: IExperimentInfo}>() + 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}>() + props<{ experimentId: string; autoRefresh?: boolean }>() ); export const getExperimentUncommittedChanges = createAction( @@ -51,21 +90,21 @@ export const setExperimentUncommittedChanges = createAction( props<{ diff: string }>() ); -export const getExperimentArtifacts= createAction( +export const getExperimentArtifacts = createAction( EXPERIMENTS_INFO_PREFIX + '[get artifacts]', props<{ experimentId: string; autoRefresh?: boolean }>() ); -export const downloadArtifacts= createAction( +export const downloadArtifacts = createAction( EXPERIMENTS_INFO_PREFIX + '[download artifacts]', - props<{url: string; inMemory?: boolean}>() + props<{ url: string; inMemory?: boolean }>() ); -export const downloadSuccess= createAction( EXPERIMENTS_INFO_PREFIX + '[download artifacts success]'); -export const downloadFailed= createAction( EXPERIMENTS_INFO_PREFIX + '[download artifacts failed]'); +export const downloadSuccess = createAction(EXPERIMENTS_INFO_PREFIX + '[download artifacts success]'); +export const downloadFailed = createAction(EXPERIMENTS_INFO_PREFIX + '[download artifacts failed]'); export const setExperimentArtifacts = createAction( EXPERIMENTS_INFO_PREFIX + '[set artifacts]', - props<{model: IExperimentModelInfo; experimentId: string}>() + props<{ model: IExperimentModelInfo; experimentId: string }>() ); export const updateExperimentInfoData = createAction( @@ -73,7 +112,11 @@ export const updateExperimentInfoData = createAction( props<{ id?: ITableExperiment['id']; changes: Partial }>() ); export const saveExperimentInputModel = createAction( - EXPERIMENTS_INFO_PREFIX + '[save input model]', props<{ modelId: string; modelName: string; route: ActivatedRoute}>()); + EXPERIMENTS_INFO_PREFIX + '[save input model]', props<{ + modelId: string; + modelName: string; + route: ActivatedRoute + }>()); export const saveHyperParamsSection = createAction( EXPERIMENTS_INFO_PREFIX + 'SAVE_HYPERPARAMS', props<{ hyperparams: ParamsItem[] }>()); @@ -92,7 +135,7 @@ export const setExperimentSaving = createAction( export const getExperimentConfigurationObj = createAction( EXPERIMENTS_INFO_PREFIX + 'GET_CONFIGURATION_OBJ', - ); +); export const getPipelineConfigurationObj = createAction( EXPERIMENTS_INFO_PREFIX + 'GET_PIPELINE_CONFIGURATION_OBJ', ); @@ -134,7 +177,7 @@ export const experimentDetailsUpdated = createAction( export const setExperimentErrors = createAction( EXPERIMENTS_INFO_PREFIX + 'SET_EXPERIMENT_ERRORS', - props<{ [key: string]: ExperimentInfoState['errors'] }>() + props>() ); export const activateEdit = createAction( @@ -146,10 +189,10 @@ export const deactivateEdit = createAction(EXPERIMENTS_INFO_PREFIX + 'DEACTIVATE export const setExperimentFormErrors = createAction( EXPERIMENTS_INFO_PREFIX + 'SET_EXPERIMENT_FORM_ERRORS', - props<{errors: {[key: string]: any}}>() + props<{ errors: Record }>() ); export const navigateToDataset = createAction( EXPERIMENTS_INFO_PREFIX + 'Navigate to open dataset', - props<{datasetId: string}>() + props<{ datasetId: string }>() ); diff --git a/src/app/webapp-common/experiments/actions/common-experiments-menu.actions.ts b/src/app/webapp-common/experiments/actions/common-experiments-menu.actions.ts index 92f7de4e..e26553c2 100644 --- a/src/app/webapp-common/experiments/actions/common-experiments-menu.actions.ts +++ b/src/app/webapp-common/experiments/actions/common-experiments-menu.actions.ts @@ -72,6 +72,11 @@ export const navigateToQueue = createAction( props<{ experimentId: string }>() ); +export const navigateToWorker = createAction( + EXPERIMENTS_INFO_PREFIX + 'navigate to worker', + props<{ experimentId: string }>() +); + export const enqueueClicked = createAction( EXPERIMENTS_INFO_PREFIX + 'enqueue experiments', props<{ selectedEntities: ISelectedExperiment[]; queue: Queue; verifyWatchers: 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 09cfb1a5..ba08fdb4 100755 --- a/src/app/webapp-common/experiments/actions/common-experiments-view.actions.ts +++ b/src/app/webapp-common/experiments/actions/common-experiments-view.actions.ts @@ -193,7 +193,9 @@ export const setHyperParamsFiltersPage = createAction( EXPERIMENTS_PREFIX + ' [set hyper params filters page]', props<{ page: number }>() ); -export const resetExperiments = createAction(EXPERIMENTS_PREFIX + ' [reset experiments]'); +export const resetExperiments = createAction( + EXPERIMENTS_PREFIX + ' [reset experiments]', + props<{skipResetMetric?: boolean}>()); export const getCustomMetrics = createAction( EXPERIMENTS_PREFIX + ' [get custom metrics]', props<{hideLoader?: boolean}>() 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 03bd81bc..6e6b4a77 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 @@ -13,7 +13,7 @@ @if (codeFormGroup.controls.name.invalid) { @if (codeFormGroup.controls.name.errors?.minlength) { - Name should be more than 2 characters long + Name should be at least 3 characters long } @else if (codeFormGroup.controls.name.errors?.required) { Name is required @@ -119,10 +119,14 @@
Configuration Hyperparameters Args
} - +
@@ -205,6 +209,7 @@
Enqueue experiment to
label="Queue" [data]="queues() | filter: queueVal(): 'name'" [isRequired]="true" + (loadMore)="loadMoreQueues()" >
Output
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 881cd3a0..b46fbbc7 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 @@ -85,3 +85,10 @@ mat-form-field { display: flex; gap: 12px; } + +.add-argument { + display: inline-flex; + align-items: center; + color: $purple; + gap: 2px; +} 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 8abb82dd..f4e36566 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 @@ -220,4 +220,8 @@ export class CreateExperimentDialogComponent { .forEach((control) => control.enable()); } } + + loadMoreQueues() { + this.store.dispatch(getQueuesForEnqueue()); + } } 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 3f41bd34..b1b6f364 100755 --- 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 @@ -2,10 +2,10 @@ let-modelInfo="modelInfo" let-editable="editable" [ngTemplateOutletContext]="{ - modelInfo: modelInfo$ | async, - editable: editable$ | async + modelInfo: modelInfo$ | ngrxPush, + editable: editable$ | ngrxPush }" [ngTemplateOutlet]="selfie" #selfie> - + diff --git a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-aritfacts.component.scss b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.scss old mode 100755 new mode 100644 similarity index 100% rename from src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-aritfacts.component.scss rename to src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.scss 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 5534e637..7825adc1 100755 --- 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 @@ -28,7 +28,7 @@ import {selectSelectedProject} from '@common/core/reducers/projects.reducer'; @Component({ selector: 'sm-experiment-info-artifacts-model', templateUrl: './experiment-info-artifacts.component.html', - styleUrls: ['./experiment-info-aritfacts.component.scss'] + styleUrls: ['./experiment-info-artifacts.component.scss'] }) export class ExperimentInfoArtifactsComponent implements OnDestroy { public backdropActive$: Observable; @@ -51,7 +51,7 @@ export class ExperimentInfoArtifactsComponent implements OnDestroy { this.modelInfo$ = this.store.select(selectExperimentModelInfoData); this.experimentInfo$ = this.store.select(selectExperimentInfoData); this.routerConfig$ = this.store.select(selectRouterConfig); - this.selectedId$ = this.store.select(selectArtifactId) + this.selectedId$ = this.store.select(selectArtifactId); this.experimentKey$ = this.store.select(selectSelectedExperimentFromRouter); this.sub.add(this.store.select(selectRouterConfig) @@ -95,9 +95,10 @@ export class ExperimentInfoArtifactsComponent implements OnDestroy { .subscribe(([selectedId, modelInfo]) => { const onOutputModel = this.route.snapshot.firstChild?.data?.outputModel; const onInputModel = this.route.snapshot.firstChild?.data?.outputModel === false; + const taskName = this.route.snapshot.queryParams.taskName; if (selectedId) { const selectedArtifact = modelInfo.artifacts?.find(artifact => artifact.key === selectedId); - const selectedInputModel = modelInfo.input?.find(model => model.id === selectedId); + const selectedInputModel = modelInfo.input?.find(model => model.id === selectedId && model.taskName === taskName); const selectedOutputModel = modelInfo.output?.find(model => model.id === selectedId); const onArtifact = !onInputModel && !onOutputModel; if ((onOutputModel && !selectedOutputModel) || (onInputModel && !selectedInputModel) || (onArtifact && !selectedArtifact)) { diff --git a/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.html b/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.html index ca250dc5..74d99436 100755 --- a/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.html @@ -1,7 +1,7 @@ diff --git a/src/app/webapp-common/experiments/containers/experiment-info-execution/experiment-info-execution.component.html b/src/app/webapp-common/experiments/containers/experiment-info-execution/experiment-info-execution.component.html index 18a90182..b0601ced 100755 --- a/src/app/webapp-common/experiments/containers/experiment-info-execution/experiment-info-execution.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-info-execution/experiment-info-execution.component.html @@ -1,197 +1,234 @@ - - - - - {{ link | uppercase }} - - - - - - + +@if (!minimized) { + + + + @for (link of links; track link) { + {{ link | uppercase }} + } + + + + + + +} @else { + +} - -
- - - - - - - - - - - - - - -
- - - + @if (minimized || currentLink === 'details') { + + + + + } + @if (minimized || currentLink === 'uncommitted changes') { + + @if (minimized) { + + } + - {{req.label}} - - -
- - - - - - - - -
{{formData.container?.image}}
- - - - - -
{{formData.container?.arguments | hideRedactedArguments: (redactedArguments$| async) }}
- - - - + @if (formData.diff && editable() && !showExtraDataSpinner()) { + + } + @if (formData.diff && editable() && !showExtraDataSpinner()) { + + } + + + } + @if (minimized || currentLink === 'installed packages') { + + @if (editable() && !showExtraDataSpinner()) { + + } +
+ @if (minimized) { + + } + @if (requirementsOptions?.length > 1) { + + + @for (req of requirementsOptions; track req) { + {{ req.label }} + } + + + } - +
+ + @if (editableRequirements && formData?.requirements?.pip && editable() && !showExtraDataSpinner()) { + + } + + + } + @if (minimized || currentLink === 'container') { + + + + @if (!((editable() && !isInDev()) && containerSection.inEditMode)) { +
{{ formData.container?.image }}
+ } + @if ((editable() && !isInDev()) && containerSection.inEditMode) { + + + + } + + + @if (!((editable() && !isInDev()) && containerSection.inEditMode)) { +
{{ formData.container?.arguments | hideRedactedArguments: (redactedArguments$| ngrxPush) }}
+ } + @if ((editable() && !isInDev()) && containerSection.inEditMode) { + + + + } + + + } + @if (minimized || currentLink === 'container') { - + - - + @if (formData?.container?.setup_shell_script && editable() && !showExtraDataSpinner()) { + + } + @if (formData.container?.setup_shell_script && editable() && !showExtraDataSpinner()) { + + } - - - - -
{{formData.output?.destination}}
- - - - - - -
{{formData.output?.logLevel}}
- - - - - -
- + } + @if (minimized || currentLink === 'details') { + + + + @if (!((editable() && !isInDev()) && outputSection.inEditMode)) { +
{{ formData.output?.destination }}
+ } + @if (editable() && outputSection.inEditMode) { + + + + } + + + + @if (!((editable() && !isInDev()) && outputSection.inEditMode)) { +
{{ formData.output?.logLevel }}
+ } + @if (editable() && outputSection.inEditMode) { + + + + } + + + } +
+ } diff --git a/src/app/webapp-common/experiments/containers/experiment-info-execution/experiment-info-execution.component.scss b/src/app/webapp-common/experiments/containers/experiment-info-execution/experiment-info-execution.component.scss index 1b05f348..6ea8badc 100755 --- a/src/app/webapp-common/experiments/containers/experiment-info-execution/experiment-info-execution.component.scss +++ b/src/app/webapp-common/experiments/containers/experiment-info-execution/experiment-info-execution.component.scss @@ -5,12 +5,16 @@ height: 100%; overflow: auto; + .clear-all { + margin-left: auto; + } + mat-sidenav-container { height: 100%; position: static; } - mat-sidenav-content { + mat-sidenav-content { position: static; } @@ -100,23 +104,28 @@ top: 0; bottom: 0; } - ::ng-deep sm-section-header { + + ::ng-deep sm-section-header { width: 155px; + h4 { font-weight: 500; color: #71758A; font-size: 11px; } } + sm-scroll-textarea { position: relative; flex: 1; + span.no-changes { font-size: 11px; } } } } + .terminal.toggle { color: $neon-yellow; } @@ -124,6 +133,7 @@ .requirements-header { display: flex; gap: 24px; + align-items: center; } .requirements-selector { 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 12204a68..3f607312 100755 --- 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 @@ -2,10 +2,7 @@ import {Component, ElementRef, inject, OnDestroy, OnInit, ViewChild} from '@angu import {Store} from '@ngrx/store'; import {Observable, Subscription} from 'rxjs'; import {IExecutionForm, sourceTypesEnum} from '~/features/experiments/shared/experiment-execution.model'; -import { - selectIsExperimentEditable, - selectShowExtraDataSpinner -} from '~/features/experiments/reducers'; +import {selectIsExperimentEditable, selectShowExtraDataSpinner} from '~/features/experiments/reducers'; import * as commonInfoActions from '../../actions/common-experiments-info.actions'; import { selectExperimentExecutionInfoData, @@ -30,6 +27,9 @@ import { import { CommonExperimentConverterService } from '@common/experiments/shared/services/common-experiment-converter.service'; +import { + ClearInstalledPackagesDialogComponent +} from '@common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component'; @Component({ selector: 'sm-experiment-info-execution', @@ -46,11 +46,11 @@ export class ExperimentInfoExecutionComponent implements OnInit, OnDestroy { private formDataSubscription: Subscription; public minimized = this.route.snapshot.routeConfig?.data?.minimized ?? false; public executionInfo$ = this.store.select(selectExperimentExecutionInfoData); - public showExtraDataSpinner$ = this.store.select(selectShowExtraDataSpinner); - public editable$ = this.store.select(selectIsExperimentEditable); - public isInDev$ = this.store.select(selectIsSelectedExperimentInDev); - public saving$ = this.store.select(selectIsExperimentSaving); - public backdropActive$ = this.store.select(selectBackdropActive); + public showExtraDataSpinner = this.store.selectSignal(selectShowExtraDataSpinner); + public editable = this.store.selectSignal(selectIsExperimentEditable); + public isInDev = this.store.selectSignal(selectIsSelectedExperimentInDev); + public saving = this.store.selectSignal(selectIsExperimentSaving); + public backdropActive = this.store.selectSignal(selectBackdropActive); public redactedArguments$ = this.store.select(selectHideRedactedArguments); public formData: IExecutionForm; links = ['details', 'uncommitted changes', 'installed packages', 'container']; @@ -74,10 +74,7 @@ export class ExperimentInfoExecutionComponent implements OnInit, OnDestroy { @ViewChild('containerImage') containerImage: ElementRef; @ViewChild('containerArguments') containerArguments: ElementRef; - - constructor() { - - } + resetRequirementToolTip: string; ngOnInit() { this.store.dispatch(commonInfoActions.setExperimentFormErrors({errors: null})); @@ -88,13 +85,14 @@ export class ExperimentInfoExecutionComponent implements OnInit, OnDestroy { this.requirementsOptions = Object.keys(this.requirementLabels) .filter(key => Object.hasOwn(formData?.requirements ?? {}, key)) .map(key => ({ - value: key, - label: this.requirementLabels[key] - } as IOption)); + value: key, + label: this.requirementLabels[key] + } as IOption)); if (!Object.hasOwn(formData?.requirements ?? {}, this.selectedRequirement)) { this.selectedRequirement = 'pip'; } this.editableRequirements = this.selectedRequirement === 'pip'; + this.resetRequirementToolTip = `Set packages to originally recorded values (${formData.requirements?.orgPip ? 'original-pip' : ''}${formData.requirements?.orgPip && formData.requirements?.orgConda ? ' / ' : ''}${formData.requirements?.orgConda ? 'original-conda' : ''})`; } }); } @@ -104,15 +102,14 @@ export class ExperimentInfoExecutionComponent implements OnInit, OnDestroy { } saveSourceData() { - const source = this.sourceCode.sourceCodeForm.form.value as IExecutionForm['source']; + const source = this.sourceCode.sourceCodeForm.value as IExecutionForm['source']; this.store.dispatch(commonInfoActions.saveExperimentSection({ script: { - /* eslint-disable @typescript-eslint/naming-convention */ repository: source.repository, entry_point: source.entry_point, working_dir: source.working_dir, binary: source.binary?.trim(), - /* eslint-enable @typescript-eslint/naming-convention */ + ...this.convertScriptType(source) } })); @@ -126,7 +123,7 @@ export class ExperimentInfoExecutionComponent implements OnInit, OnDestroy { const outputDestination = this.outputDestination.nativeElement.value; // why BE can't get output.destination as task.edit? - // eslint-disable-next-line @typescript-eslint/naming-convention + this.store.dispatch(commonInfoActions.saveExperimentSection({output_dest: outputDestination} as any)); } @@ -163,8 +160,8 @@ export class ExperimentInfoExecutionComponent implements OnInit, OnDestroy { filter(res => res) ) .subscribe(() => { - this.activateEditChanged('diff'); - this.store.dispatch(commonInfoActions.saveExperimentSection({script: {diff: ''}})); + this.activateEditChanged('diff'); + this.store.dispatch(commonInfoActions.saveExperimentSection({script: {diff: ''}})); }); } @@ -178,11 +175,11 @@ export class ExperimentInfoExecutionComponent implements OnInit, OnDestroy { .subscribe(setupShellScript => { if (this.formData.container.setup_shell_script !== setupShellScript) { smEditableSection.saveSection(); - // eslint-disable-next-line @typescript-eslint/naming-convention + this.store.dispatch(commonInfoActions.saveExperimentSection({ container: { ...this.formData.container, - // eslint-disable-next-line @typescript-eslint/naming-convention + setup_shell_script: setupShellScript } })); @@ -235,22 +232,62 @@ export class ExperimentInfoExecutionComponent implements OnInit, OnDestroy { } clearInstalledPackages() { - this.clearConfirmDialog('installed packages').pipe(take(1)).subscribe((confirmed) => { + this.dialog.open(ClearInstalledPackagesDialogComponent, + {data: {showReset: (this.editableRequirements && (this.formData.requirements?.orgPip || this.formData.requirements?.orgConda))}}) + .afterClosed().pipe(take(1)).subscribe((confirmed) => { if (confirmed) { this.activateEditChanged('requirements'); - this.store.dispatch(commonInfoActions.saveExperimentSection({script: {requirements: {}}})); + if (confirmed.selectedOption === 'reset') { + this.store.dispatch(commonInfoActions.saveExperimentSection({ + script: { + requirements: { + ...this.formData.requirements, + ...((this.formData.requirements?.pip && this.formData.requirements.orgPip) && {pip: this.formData.requirements.orgPip}), + ...((this.formData.requirements?.conda && this.formData.requirements.orgConda) && {pip: this.formData.requirements.orgConda}), + } + } + })); + } else { + this.store.dispatch(commonInfoActions.saveExperimentSection({script: {requirements: confirmed?.selectedOption === 'dontInstall' ? {[this.selectedRequirement]: ''} : {}}})); + } } }); } + resetInstalledPackages() { + this.dialog.open(ConfirmDialogComponent, { + data: { + title: `Reset installed packages`, + body: `Are you sure you want to reset Installed Packages?
This will set the packages to originally recorded values.`, + yes: 'Reset', + no: 'Keep', + iconClass: 'al-icon al-ico-reset al-color blue-300', + } + }).afterClosed().pipe(take(1)).subscribe((confirmed) => { + if (confirmed) { + this.activateEditChanged('requirements'); + this.store.dispatch(commonInfoActions.saveExperimentSection({ + script: { + requirements: { + ...this.formData.requirements, + ...((this.formData.requirements?.pip && this.formData.requirements.orgPip) && {pip: this.formData.requirements.orgPip}), + ...((this.formData.requirements?.conda && this.formData.requirements.orgConda) && {pip: this.formData.requirements.orgConda}), + } + } + })); + } + }); + + } + clearSetupShellScript() { this.clearConfirmDialog('setup shell script').pipe(take(1)).subscribe((confirmed) => { if (confirmed) { - // eslint-disable-next-line @typescript-eslint/naming-convention + this.store.dispatch(commonInfoActions.saveExperimentSection({ container: { ...this.formData.container, - // eslint-disable-next-line @typescript-eslint/naming-convention + setup_shell_script: '' } })); @@ -271,7 +308,12 @@ export class ExperimentInfoExecutionComponent implements OnInit, OnDestroy { } - private openEditJsonDialog(data: { textData: string; readOnly?: boolean; title?: string; format?: string }, editableSectionComponent?: EditableSectionComponent): MatDialogRef { + private openEditJsonDialog(data: { + textData: string; + readOnly?: boolean; + title?: string; + format?: string + }, editableSectionComponent?: EditableSectionComponent): MatDialogRef { const editJsonComponent = this.dialog.open(EditJsonComponent, { data }); 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 fee8aa92..b0c9dccb 100755 --- 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 a0d97eaa..5ebe7691 100755 --- 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,42 +1,53 @@ -import {Component, ElementRef, OnDestroy, ViewChild} from '@angular/core'; -import {Observable, Subscription} from 'rxjs'; +import {Component, ElementRef, inject, OnDestroy, ViewChild} from '@angular/core'; +import {BehaviorSubject, combineLatest, Observable, Subscription} from 'rxjs'; import {Store} from '@ngrx/store'; -import {filter, map} from 'rxjs/operators'; -import {tap} from 'rxjs/operators'; +import {debounceTime, filter, map} from 'rxjs/operators'; import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; -import {selectExperimentInfoData, selectIsExperimentEditable, selectSelectedExperiment} from '~/features/experiments/reducers'; +import { + selectExperimentInfoData, + selectIsExperimentEditable, + selectSelectedExperiment +} 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 { ExperimentGeneralInfoComponent } from '@common/experiments/dumb/experiment-general-info/experiment-general-info.component'; +import {RefreshService} from '@common/core/services/refresh.service'; @Component({ - selector : 'sm-experiment-info-general', + selector: 'sm-experiment-info-general', templateUrl: './experiment-info-general.component.html', - styleUrls : ['./experiment-info-general.component.scss'] + styleUrls: ['./experiment-info-general.component.scss'] }) -export class ExperimentInfoGeneralComponent implements OnDestroy{ +export class ExperimentInfoGeneralComponent implements OnDestroy { + public experimentChanged(experiment) { + this.isExample = isReadOnly(experiment); + this.selectedExperiment = experiment; + } public selectedExperiment$: Observable; + + + public refresh = inject(RefreshService); + private readonly ref = inject(ElementRef); + + public store = inject(Store); public editable$: Observable; public experimentInfoData$: Observable; public isExample: boolean; - private selectedExperiment: IExperimentInfo; - private sub = new Subscription(); + public selectedExperiment: IExperimentInfo; + public sub = new Subscription(); + public experiment$ = new BehaviorSubject(null); @ViewChild(ExperimentGeneralInfoComponent) info: ExperimentGeneralInfoComponent; - constructor(private store: Store, private readonly ref: ElementRef) { - this.selectedExperiment$ = this.store.select(selectSelectedExperiment) - .pipe( - filter(experiment => !!experiment), - map(experiment => this.selectedExperiment = experiment), - tap((experiment) => this.isExample = isReadOnly(experiment)) - ); + constructor() { this.experimentInfoData$ = this.store.select(selectExperimentInfoData); - this.editable$ = this.store.select(selectIsExperimentEditable); + this.editable$ = this.store.select(selectIsExperimentEditable); + this.selectedExperiment$ = this.store.select(selectSelectedExperiment).pipe(filter(experiment => !!experiment)); + this.sub.add(this.store.select(selectEditingDescription) .pipe( filter(edit => edit)) @@ -45,10 +56,28 @@ export class ExperimentInfoGeneralComponent implements OnDestroy{ this.info?.experimentDescriptionSection.editModeChanged(true); }) ); + + this.sub.add( + combineLatest([ + this.store.select(selectSelectedExperiment), + this.experiment$ + ]).pipe( + debounceTime(0), + map(([selected, input]) => input ?? selected), + 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.selectedExperiment?.id, changes: {comment}})); } ngOnDestroy() { 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 65ff6ced..25b55148 100755 --- 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 @@ -1,10 +1,10 @@ - + + 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 c63f0e89..09494002 100755 --- 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 @@ -1,10 +1,10 @@ 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 7e479333..bdc74621 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 @@ -9,7 +9,8 @@ $output-tabs-height: 64px; .experiment-output-container { height: 100%; - &.minimized{ + + &.minimized { height: calc(100% - 32px); } } @@ -37,17 +38,35 @@ $output-tabs-height: 64px; .refresh-position { display: flex; align-items: center; - margin-right: 30px; + margin-right: 24px; margin-left: auto; + + .scalar-buttons { + gap: 12px; + display: flex; + align-items: center; + } } .refreshIcon { margin-right: 10px; } + .table-graph-toggle { + height: 28px; + + &.maximized { + height: 32px; + align-items: center; + display: flex; + margin-right: 14px; + } + } + .output-body { position: relative; height: calc(100% - #{$output-tabs-height + $experiment-info-header-height + 32px}); + &.minimized { height: calc(100% - #{$experiment-info-header-height + $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 e97209e5..867a53f2 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 @@ -3,7 +3,7 @@ import {selectRouterConfig, selectRouterParams} from '@common/core/reducers/rout import {Store} from '@ngrx/store'; import {Observable, Subscription} from 'rxjs'; import {ActivatedRoute, Router} from '@angular/router'; -import {distinctUntilChanged, filter, map, tap, withLatestFrom} from 'rxjs/operators'; +import {debounceTime, 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 { @@ -11,12 +11,21 @@ import { selectIsSharedAndNotOwner, selectSelectedExperiment } from '~/features/experiments/reducers'; -import {resetExperimentMetrics, toggleSettings} from '../../actions/common-experiment-output.actions'; +import { + resetExperimentMetrics, + toggleMetricValuesView, + toggleSettings +} 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 {addMessage, setAutoRefresh} from '@common/core/actions/layout.actions'; -import {selectIsExperimentInEditMode, selectSelectedExperiments, selectSplitSize} from '../../reducers'; +import { + selectIsExperimentInEditMode, + selectMetricValuesView, + selectSelectedExperiments, + selectSplitSize +} from '../../reducers'; import {RefreshService} from '@common/core/services/refresh.service'; import {isDevelopment} from '~/features/experiments/shared/experiments.utils'; import * as experimentsActions from '../../actions/common-experiments-view.actions'; @@ -50,6 +59,7 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy private toMaximize = false; public selectSplitSize$: Observable; private selectedProject$: Observable; + public metricValuesView$: Observable; constructor( @@ -65,7 +75,7 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy this.backdropActive$ = this.store.select(selectBackdropActive); this.selectSplitSize$ = this.store.select(selectSplitSize); this.selectedProject$ = this.store.select(selectSelectedProject); - + this.metricValuesView$ = this.store.select(selectMetricValuesView); } @@ -73,7 +83,7 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy ngOnInit() { this.subs.add(this.store.select(selectRouterConfig).subscribe(routerConfig => { this.minimized = !routerConfig.includes('output'); - if (!this.minimized){ + if (!this.minimized) { this.setupBreadcrumbsOptions(); } this.routerConfig = routerConfig; @@ -89,7 +99,7 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy withLatestFrom(this.store.select(selectSelectedExperiments)) ).subscribe(([experimentId, selectedExperiments]) => { this.selectedExperiment = selectedExperiments.find(experiment => experiment.id === experimentId) as unknown as IExperimentInfo; - this.isExample = isReadOnly( this.selectedExperiment); + this.isExample = isReadOnly(this.selectedExperiment); this.isDevelopment = isDevelopment(this.selectedExperiment); this.store.dispatch(resetExperimentMetrics()); this.store.dispatch(infoActions.resetExperimentInfo()); @@ -99,13 +109,14 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy this.subs.add(this.refresh.tick .pipe( + debounceTime(5000), // Fix loop - getExperimentInfo trigger tick withLatestFrom(this.isExperimentInEditMode$), filter(([, isExperimentInEditMode]) => !isExperimentInEditMode && !this.minimized) ).subscribe(([auto]) => { if (auto === null) { this.store.dispatch(infoActions.autoRefreshExperimentInfo({id: this.experimentId})); } else { - this.store.dispatch(infoActions.getExperimentInfo({id: this.experimentId})); + this.store.dispatch(infoActions.getExperimentInfo({id: this.experimentId, autoRefresh: auto})); } }) ); @@ -114,7 +125,7 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy .pipe(filter(experiment => experiment?.id === this.experimentId)) .subscribe(experiment => { this.selectedExperiment = experiment; - this.isExample = isReadOnly( this.selectedExperiment); + this.isExample = isReadOnly(this.selectedExperiment); this.isDevelopment = isDevelopment(this.selectedExperiment); }) ); @@ -143,6 +154,10 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy this.store.dispatch(toggleSettings()); } + toggleTableView() { + this.store.dispatch(toggleMetricValuesView()); + } + updateExperimentName(name) { if (name.trim().length > 2) { this.store.dispatch(experimentDetailsUpdated({id: this.selectedExperiment.id, changes: {name}})); @@ -163,13 +178,16 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy this.store.dispatch(headerActions.setTabs({contextMenu: null})); this.toMaximize = true; } + onActivate(e, scrollContainer) { scrollContainer.scrollTop = 0; } + closePanel() { this.store.dispatch(experimentsActions.setTableMode({mode: 'table'})); return this.router.navigate(['..'], {relativeTo: this.route, queryParamsHandling: 'merge'}); } + setupBreadcrumbsOptions() { this.subs.add(this.selectedProject$.pipe( ).subscribe((selectedProject) => { 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 e4cb02a5..88f94eb3 100755 --- 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 @@ -13,21 +13,21 @@ placeholder="Filter By Regex" class="form-control" style="width: 250px;" - [value]="filter$ |async" + [value]="filter$ |ngrxPush" (keyup)="filterLog($event)" />
- +

NO LOG DATA

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 a6f6dea5..22f8cc4b 100755 --- 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 @@ -80,13 +80,6 @@ export class ExperimentOutputLogComponent implements OnInit, AfterViewInit, OnDe this.store.dispatch(activeLoader(getExperimentLog.type)); this.store.dispatch(getExperimentLog({ id: this.currExperiment.id, direction: null })); } - // else if (!this.logRef?.lines?.length || this.logRef?.canRefresh) { - // this.store.dispatch(getExperimentLog({ - // id: this.currExperiment.id, - // direction: !this.logRef?.orgLogs ? 'prev' : 'next', - // from: last(this.logRef?.orgLogs)?.timestamp - // })); - // } }) ); } 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 1607122d..830b086e 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 @@ -8,7 +8,7 @@ placeholder="Find plots" [list]="plotsList" [checkedList]="selectedMetrics" - [searchTerm]="searchTerm$ | async" + [searchTerm]="searchTerm$ | ngrxPush" (itemSelect)="metricSelected($event)" (hiddenChanged)="hiddenListChanged($event)" (searchTermChanged)="searchTermChanged($event)" @@ -35,7 +35,7 @@ [metrics]="graphs" [legendStringLength]="minimized ? 14 : 19" [minimized]="minimized" - [splitSize]="splitSize$ | async" + [splitSize]="splitSize$ | ngrxPush" [isDarkTheme]="dark" (resetGraphs)="resetMetrics()" (createEmbedCode)="createEmbedCode($event)" 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 5df04b7e..53c40b2d 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,80 +1,87 @@ - - - -
+@if (metricValuesView$ | async) { + +} @else { + + + +
+ + + +
+ + - -
- - - -
-
- +
+ @if ((metricValuesView$ | async) === false && minimized) { +
+ +
+ } + +
- - -
- - + + +} diff --git a/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.scss b/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.scss index ca001c01..0dac4a60 100644 --- a/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.scss +++ b/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.scss @@ -45,7 +45,7 @@ $list-width: 360px; background-color: #f2f3f6; transition: max-height 0.3s; - &.showSettings { + &.with-settings { min-height: 64px; max-height: 128px; } diff --git a/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.ts b/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.ts index 3ed0ee9a..01b14d8e 100644 --- a/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.ts @@ -4,10 +4,13 @@ import { selectExperimentInfoHistograms, selectExperimentMetricsSearchTerm, selectIsExperimentInProgress, + selectLastMetricsValues, + selectMetricValuesView, selectScalarSingleValue, selectSelectedSettingsGroupBy, - selectSelectedSettingsHiddenScalar, selectSelectedSettingsSmoothType, - selectSelectedSettingsSmoothWeight, + selectSelectedSettingsHiddenScalar, + selectSelectedSettingsSmoothType, + selectSelectedSettingsSmoothWeight, selectSelectedSettingsTableMetric, selectSelectedSettingsxAxisType, selectShowSettings, selectSplitSize @@ -16,9 +19,11 @@ import {combineLatest, Observable, Subscription} from 'rxjs'; import {Store} from '@ngrx/store'; import {debounceTime, distinctUntilChanged, distinctUntilKeyChanged, filter, tap} from 'rxjs/operators'; import {selectRouterParams} from '@common/core/reducers/router-reducer'; -import {ActivatedRoute, Params, Router} from '@angular/router'; +import {ActivatedRoute, Params} from '@angular/router'; import { experimentScalarRequested, + GroupByCharts, + groupByCharts, resetExperimentMetrics, setExperimentMetricsSearchTerm, setExperimentSettings, @@ -27,16 +32,13 @@ import { import {convertScalars, sortMetricsList} from '@common/tasks/tasks.utils'; import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {selectSelectedExperiment} from '~/features/experiments/reducers'; -import {GroupByCharts, groupByCharts} from '../../actions/common-experiment-output.actions'; import {ExtFrame} from '@common/shared/single-graph/plotly-graph-base'; import {ExperimentGraphsComponent} from '@common/shared/experiment-graphs/experiment-graphs.component'; -import {isEqual} from 'lodash-es'; import { EventsGetTaskSingleValueMetricsResponseValues } from '~/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseValues'; import { ReportCodeEmbedService } from '~/shared/services/report-code-embed.service'; import {SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; import {singleValueChartTitle} from '@common/experiments/shared/common-experiments.const'; import {GroupedList} from '@common/tasks/tasks.model'; -import {PlotData} from 'plotly.js'; export const prepareScalarList = (metricsScalar: GroupedList): GroupedList => sortMetricsList(Object.keys(metricsScalar || [])).reduce((acc, curr) => { @@ -51,22 +53,28 @@ export const prepareScalarList = (metricsScalar: GroupedList): GroupedList => styleUrls: ['./experiment-output-scalars.component.scss', './shared-experiment-output.scss'] }) export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { + protected store = inject(Store); + private activeRoute = inject(ActivatedRoute); + private changeDetection = inject(ChangeDetectorRef); + private reportEmbed = inject(ReportCodeEmbedService); + private refreshService = inject(RefreshService); + public scalarList: GroupedList = {}; private subs = new Subscription(); protected experimentId: string; protected routerParams$: Observable; public refreshDisabled: boolean; - public listOfHidden$: Observable>; + public listOfHidden$: Observable; public scalars$: Observable; public searchTerm$: Observable; public minimized = false; - public graphs: { [key: string]: ExtFrame[] }; + public graphs: Record; public selectIsExperimentPendingRunning: Observable; public smoothWeight$: Observable; public smoothWeightDelayed$: Observable; public smoothType$: Observable; - public showSettingsBar = false; + public showSettingsBar$ = this.store.select(selectShowSettings); public xAxisType$: Observable; public groupBy$: Observable; public splitSize$: Observable; @@ -86,28 +94,22 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { value: groupByCharts.none } ]; - public singleValueData$: Observable>; + public singleValueData$: Observable; public experimentName: string; - private singleValueExists: boolean; - protected store: Store; - protected router: Router; - protected activeRoute: ActivatedRoute; - protected changeDetection: ChangeDetectorRef; - protected reportEmbed: ReportCodeEmbedService; + public singleValueExists: boolean; protected entitySelector: Observable<{ id?: string; name?: string }>; - protected refreshService: RefreshService; protected selectedMetrics: string[] = []; - private originalScalarList: { [p: string]: { [p: string]: { [p: string]: PlotData } }; [singleValueChartTitle]: {} }; + private originalScalarList: {metric: string; variant: string}[]; + public metricValuesView$: Observable; + public lastMetricsValues$: Observable>; + private firstTime = true; + public tableSelectedMetrics$: Observable; constructor() { - this.store = inject(Store); - this.router = inject(Router); - this.activeRoute = inject(ActivatedRoute); - this.changeDetection = inject(ChangeDetectorRef); - this.reportEmbed = inject(ReportCodeEmbedService); - this.refreshService = inject( RefreshService); - 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); @@ -123,8 +125,7 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { 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) - .pipe(distinctUntilChanged(isEqual)); + this.listOfHidden$ = this.store.select(selectSelectedSettingsHiddenScalar); this.routerParams$ = this.store.select(selectRouterParams) @@ -135,10 +136,6 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { ); this.selectIsExperimentPendingRunning = this.store.select(selectIsExperimentInProgress); - - this.subs.add(this.store.select(selectShowSettings) - .subscribe((show) => this.showSettingsBar = show) - ); } ngOnInit() { @@ -155,6 +152,7 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { .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( @@ -178,15 +176,19 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { .subscribe(scalars => { this.refreshDisabled = false; this.scalars = scalars; - this.originalScalarList = { - ...(this.singleValueExists && {[singleValueChartTitle]: {}}), - ...prepareScalarList(this.splitScalars(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.changeDetection.markForCheck(); }) ); + this.subs.add(this.routerParams$ .subscribe(params => { if (!this.experimentId || ![params.experimentId, params.modelId].includes(this.experimentId)) { @@ -198,20 +200,35 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { }) ); - this.subs.add(combineLatest([this.listOfHidden$, this.scalars$]).subscribe(([hiddenList]) => { - const selectedMetric = hiddenList.length === 0 ? Object.keys(this.originalScalarList) : Object.keys(this.originalScalarList).filter(metric => !hiddenList.some( item => metric.startsWith(item))); - const metricsWithoutVariants = selectedMetric.map(m => m.split(' / ')[0]).filter(m => !!m) - this.selectedMetrics = Array.from(new Set([...selectedMetric, ...metricsWithoutVariants])); - })); + 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(); + })); } private prepareGraphsAndUpdate(scalars: GroupedList) { if (scalars) { - const splittedScalars = this.groupBy === 'metric' ? scalars : this.splitScalars(scalars); - // eslint-disable-next-line @typescript-eslint/naming-convention - this.scalarList = {...(this.singleValueExists && {[singleValueChartTitle]: {}}), ...prepareScalarList(splittedScalars)}; - this.graphs = convertScalars(splittedScalars, this.experimentId); - this.changeDetection.detectChanges(); + const splitScalars = this.groupBy === 'metric' ? scalars : this.splitScalars(scalars); + this.scalarList = {...(this.singleValueExists && {[singleValueChartTitle]: {}}), ...prepareScalarList(splitScalars)}; + this.graphs = convertScalars(splitScalars, this.experimentId); + this.changeDetection.markForCheck(); } } @@ -225,10 +242,14 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { } - hiddenListChanged(hiddenList) { + hiddenListChanged(hiddenList: string[]) { this.store.dispatch(setExperimentSettings({ id: this.experimentId, - changes: {hiddenMetricsScalar: Object.keys(this.scalarList).filter(metric => !hiddenList.some( item => item.startsWith(metric)))}})); + changes: { + hiddenMetricsScalar: Object.keys(this.scalarList) + .filter(metric => !hiddenList.includes(metric)) + } + })); } refresh() { @@ -275,7 +296,7 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { }, {}); } - createEmbedCode(event: { metrics?: string[]; variants?: string[]; xaxis?: ScalarKeyEnum; domRect: DOMRect}) { + createEmbedCode(event: { metrics?: string[]; variants?: string[]; xaxis?: ScalarKeyEnum; domRect: DOMRect }) { this.reportEmbed.createCode({ type: (!event.metrics && !event.variants) ? 'single' : 'scalar', objects: [this.experimentId], @@ -288,4 +309,11 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { this.store.dispatch(experimentScalarRequested({experimentId: this.experimentId})); this.experimentGraphs.prepareRedraw(); } + + selectedMetricsChanged(selectedMetrics: string[]) { + this.store.dispatch(setExperimentSettings({ + id: this.experimentId, + 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 5ed61881..e390fc91 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 @@ -27,6 +27,10 @@ mat-drawer { top: 16px; left: 16px; z-index: 14; + &.right { + left: auto; + right: 30px; + } button { padding: 6px; display: flex; 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 new file mode 100644 index 00000000..4da5fc92 --- /dev/null +++ b/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.html @@ -0,0 +1,25 @@ + +
Set Installed Packages to:
+
+ + 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).} +
{{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.scss b/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.scss new file mode 100644 index 00000000..3603da36 --- /dev/null +++ b/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.scss @@ -0,0 +1,35 @@ +@import "variables"; +.sub-header{ + color: $blue-500; +} +.al-ico-info-circle { + display: flex; + align-items: center; + height: 18px; +} +.mat-mdc-radio-group { + display: flex; + flex-direction: column; +} + + +.buttons { + margin-top: 48px; + display: flex; + flex-direction: row-reverse; + align-items: center; + justify-content: center; + left: 50%; + position: relative; + transform: translateX(-50%); + + + button { + width: 130px; + text-transform: uppercase; + } + + .yes-button { + margin-left: 16px; + } +} diff --git a/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.spec.ts b/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.spec.ts new file mode 100644 index 00000000..432ae87f --- /dev/null +++ b/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ClearInstalledPackgesDialogComponent } from './clear-installed-packages-dialog.component'; + +describe('ClearInstalledPackgesDialogComponent', () => { + let component: ClearInstalledPackgesDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ClearInstalledPackgesDialogComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ClearInstalledPackgesDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..76f06abb --- /dev/null +++ b/src/app/webapp-common/experiments/dumb/clear-installed-packges-dialog/clear-installed-packages-dialog.component.ts @@ -0,0 +1,45 @@ +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 {CheckboxControlComponent} from '@common/shared/ui-components/forms/checkbox-control/checkbox-control.component'; +import {MatRadioButton, MatRadioChange, MatRadioGroup} from '@angular/material/radio'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; + +@Component({ + selector: 'sm-clear-installed-packages-dialog', + standalone: true, + imports: [ + DialogTemplateComponent, + TooltipDirective, + CheckboxControlComponent, + MatRadioButton, + MatRadioGroup, + ReactiveFormsModule, + FormsModule + ], + templateUrl: './clear-installed-packages-dialog.component.html', + styleUrl: './clear-installed-packages-dialog.component.scss' +}) +export class ClearInstalledPackagesDialogComponent { + install: 'install' | 'dontInstall' | 'reset' = 'install'; + showReset: boolean; + + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) data: { showReset: boolean }) { + this.showReset = data?.showReset; + } + + closeDialog(isConfirmed) { + if (isConfirmed) { + this.dialogRef.close({isConfirmed, selectedOption: this.install}); + } else { + this.dialogRef.close(isConfirmed); + } + } + + setInstalledOption($event: MatRadioChange) { + this.install = $event.value; + } +} diff --git a/src/app/webapp-common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component.html b/src/app/webapp-common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component.html index d1467184..126a4a5b 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component.html @@ -1,69 +1,85 @@ - - - INPUT MODELS - -
- Input Model -
- -
- - {{model.taskName}} -
- - +@if (inputModels()?.length || editable()) { + + + INPUT MODELS + + @if (noItemsMode()) { +
+ Input Model +
+ } @else { + @for (model of inputModels(); track model.id + model.taskName) { +
+ + {{model.taskName}} +
+ } + } + +} - - - OUTPUT MODELS - -
- - {{model.taskName}} -
- +@if (outputModels()?.length) { + + + OUTPUT MODELS + + @for (model of outputModels(); track model.id + model.taskName) { +
+ + {{model.taskName}} +
+ } + +} - - - DATA AUDIT - -
- {{artifact.key}} -
- - - - OTHER - -
- - {{artifact.key}} -
- +@if (dataAuditArtifacts()?.length > 0) { + + + DATA AUDIT + + @for (artifact of dataAuditArtifacts(); track artifact.key + artifact.mode) { +
+ {{artifact.key}} +
+ } + +} +@if (otherArtifacts()?.length > 0) { + + + OTHER + + @for (artifact of otherArtifacts(); track artifact.key + artifact.mode) { +
+ + {{artifact.key}} +
+ } + +} 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 bd2e56ab..01f5d512 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 @@ -1,42 +1,39 @@ -import {Component, Input, OnChanges} from '@angular/core'; +import {ChangeDetectionStrategy, Component, inject, input, computed} from '@angular/core'; import {ActiveSectionEnum} from '@common/experiments/experiment.consts'; import {Artifact} from '~/business-logic/model/tasks/artifact'; import {IModelInfo} from '../../shared/common-experiment-model.model'; +import {ActivatedRoute, RouterLink} from '@angular/router'; +import {MatExpansionPanel, MatExpansionPanelHeader} from '@angular/material/expansion'; +import {safeAngularUrlParameterPipe} from '@common/shared/pipes/safeAngularUrlParameter.pipe'; @Component({ - selector : 'sm-experiment-artifacts-navbar', + selector: 'sm-experiment-artifacts-navbar', templateUrl: './experiment-artifacts-navbar.component.html', - styleUrls : ['./experiment-artifacts-navbar.component.scss'] + styleUrls: ['./experiment-artifacts-navbar.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatExpansionPanel, + MatExpansionPanelHeader, + RouterLink, + safeAngularUrlParameterPipe + ], + standalone: true }) -export class ExperimentArtifactsNavbarComponent implements OnChanges{ +export class ExperimentArtifactsNavbarComponent { + public route = inject(ActivatedRoute); + readonly DATA_AUDIT_TABLE = 'data-audit-table'; - public dataAuditArtifacts: Artifact[]; - public otherArtifacts: Artifact[]; public ACTIVE_SECTIONS = ActiveSectionEnum; - public noItemsMode: boolean; - - @Input() set artifacts(artifacts: Array) { - if (artifacts) { - this.dataAuditArtifacts = artifacts.filter(artifact => artifact.type === this.DATA_AUDIT_TABLE); - this.otherArtifacts = artifacts.filter(artifact => artifact.type !== this.DATA_AUDIT_TABLE); - } - } - - @Input() selectedArtifactKey; - @Input() outputModels: IModelInfo[]; - @Input() inputModels: IModelInfo[]; - @Input() editable; - @Input() activeSection: ActiveSectionEnum; - @Input() routerConfig: string[]; - - constructor() { - } - trackByFn(index, artifact) { - return (artifact.key + artifact.mode); - } + artifacts = input(); + selectedArtifactKey = input(); + outputModels = input(); + inputModels = input(); + editable = input(); + activeSection = input(); + routerConfig = input(); - ngOnChanges(): void { - this.noItemsMode = this.outputModels?.length === 0 && this.inputModels?.length === 0 ; - } + noItemsMode = computed( () => this.outputModels()?.length === 0 && this.inputModels()?.length === 0); + dataAuditArtifacts = computed( () => this.artifacts()?.filter(artifact => artifact.type === this.DATA_AUDIT_TABLE)); + otherArtifacts = computed( () => this.artifacts()?.filter(artifact => artifact.type !== this.DATA_AUDIT_TABLE)); } diff --git a/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.html b/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.html index ae8da544..d087d452 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.html @@ -1,124 +1,123 @@ - -
+
+
- @if (!editable) { -
{{formData?.repository}}
- } - @if (editable) { + @if (!editable()) { +
{{sourceCodeForm.controls.repository.value}}
+ } @else { - + } - - @if (!editable) { + + @if (!editable()) {
- @switch (formData?.scriptType) { + @switch (sourceCodeForm.controls.scriptType.value) { @case (sourceTypesEnum.VersionNum) {
- {{formData?.version_num}} {{formData?.branch ? ' (in branch ' + formData?.branch + ')' : ''}} + {{sourceCodeForm.controls.version_num.value}} + @if (sourceCodeForm.controls.branch.value) { + (in branch {{sourceCodeForm.controls.branch.value}}) + }
} @case (sourceTypesEnum.Branch) {
- {{formData?.branch ? 'Latest in branch ' + formData?.branch : '' }} + @if (sourceCodeForm.controls.branch.value) { + Latest in branch {{sourceCodeForm.controls.branch.value}} + }
} @case (sourceTypesEnum.Tag) {
- @if (formData?.version_num) { - {{formData?.tag}} (commit id {{formData?.version_num}}) + @if (sourceCodeForm.controls.version_num.value) { + {{sourceCodeForm.controls.tag.value}} (commit id {{sourceCodeForm.controls.version_num.value}}) } @else { - {{formData?.tag}} + {{sourceCodeForm.controls.tag.value}} }
} }
- } - @if (editable) { + } @else {
Type - + @for (type of scriptTypeOptions; track type) { {{type.label}} } - - Required - Commit ID - - - - Branch - Required - - - - Required - Tag - - + @switch (sourceCodeForm.controls.scriptType.value) { + @case (sourceTypesEnum.VersionNum) { + + Required + Commit ID + + + } + @case (sourceTypesEnum.Branch) { + + Branch + Required + + + } + @case (sourceTypesEnum.Tag) { + + Required + Tag + + + } + }
} - @if (!editable) { -
{{formData?.entry_point}}
- } - @if (editable) { + @if (!editable()) { +
{{sourceCodeForm.controls.entry_point.value}}
+ } @else { - + } - @if (!editable) { -
{{formData?.working_dir}}
+ @if (!editable()) { +
{{sourceCodeForm.controls.working_dir.value}}
} - @if (editable) { + @if (editable()) { - + } - @if (!editable) { + @if (!editable()) {
- {{formData?.binary}} - @if (formData?.binary && !formData?.binary?.match(pythonRegexp)) { + {{sourceCodeForm.controls.binary.value}} + @if (sourceCodeForm.controls.binary.value && !(sourceCodeForm.controls.binary.value.substring(sourceCodeForm.controls.binary.value.lastIndexOf('/')+1)).match(binaryValidationRegexp)) { }
- } - @if (editable) { + } @else { - + }
- +
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 69ed6aea..586bb2fd 100755 --- 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 @@ -1,23 +1,43 @@ -import {Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild} from '@angular/core'; -import {NgForm} from '@angular/forms'; -import {Subscription} from 'rxjs'; -import {IExperimentInfoFormComponent} from '~/features/experiments/shared/experiment-info.model'; +import { + Component, + input, + inject, + forwardRef, + ChangeDetectionStrategy +} from '@angular/core'; +import {ControlValueAccessor, FormBuilder, NG_VALUE_ACCESSOR, Validators} from '@angular/forms'; import {IExecutionForm, sourceTypesEnum} from '~/features/experiments/shared/experiment-execution.model'; +import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; +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 + }] }) -export class ExperimentExecutionSourceCodeComponent implements OnInit, IExperimentInfoFormComponent, OnDestroy { - - private formChangesSubscription: Subscription; - @Input() formData: IExecutionForm['source']; - @Input() editable: boolean; +export class ExperimentExecutionSourceCodeComponent implements ControlValueAccessor { + private formBuilder = inject(FormBuilder); - @Output() formDataChanged = new EventEmitter<{ field: string; value: IExecutionForm['source'] }>(); + editable = input(); - @ViewChild('sourceCodeForm', { static: true }) sourceCodeForm: NgForm; + sourceCodeForm = this.formBuilder.group({ + repository: [''], + scriptType: [sourceTypesEnum.Branch, Validators.required], + version_num: [''], + branch: [''], + tag: [''], + entry_point: [''], + working_dir: [''], + binary: [''], + }); readonly sourceTypesEnum = sourceTypesEnum; @@ -35,45 +55,95 @@ export class ExperimentExecutionSourceCodeComponent implements OnInit, IExperime label: 'Last Commit In Branch' }, ]; + scriptPlaceHolders = { [sourceTypesEnum.VersionNum]: 'Insert commit id', [sourceTypesEnum.Tag] : 'Insert tag name', [sourceTypesEnum.Branch] : 'Insert branch name', }; + flagNameMap = { [sourceTypesEnum.VersionNum]: 'COMMIT ID', [sourceTypesEnum.Tag] : 'TAG NAME', [sourceTypesEnum.Branch] : 'BRANCH NAME' }; - pythonRegexp = /^python([23](\.\d{1,2}){0,2})?$/; + binaryValidationRegexp = /(^python.*)|(^sh$)|(^bash$)|(^zsh$)/; + private onChange: (val: Partial) => void; + private onTouched: () => void; + private originalData: IExecutionForm['source']; - ngOnInit(): void { - this.formChangesSubscription = this.sourceCodeForm.form.valueChanges.subscribe(formValue => { - if (this.editable) { - this.formDataChanged.emit({field: 'source', value: formValue}); - } - }); + constructor() { + this.sourceCodeForm.valueChanges + .pipe( + takeUntilDestroyed(), + debounceTime(300) + ) + .subscribe(() => { + if (this.editable()) { + this.onChange?.(this.sourceCodeForm.value); + this.onTouched?.(); + } + }); + + this.sourceCodeForm.controls.repository.valueChanges + .pipe( + takeUntilDestroyed(), + startWith(this.sourceCodeForm.controls.repository.value), + map(value => value.length > 0), + pairwise(), + filter(([hasRepo, hadRepo]) => hasRepo !== hadRepo) + ) + .subscribe(() => { + this.setValidators(); + }); + + this.sourceCodeForm.controls.scriptType.valueChanges + .pipe(takeUntilDestroyed()) + .subscribe(() => { + this.setValidators(); + }); } - ngOnDestroy(): void { - this.formChangesSubscription?.unsubscribe(); + private setValidators() { + const selected = this.sourceCodeForm.controls.scriptType.value; + const repo = this.sourceCodeForm.controls.repository.value; + [sourceTypesEnum.Tag, sourceTypesEnum.Branch, sourceTypesEnum.VersionNum] + .forEach(type => { + if (repo?.length > 0 && type === selected) { + this.sourceCodeForm.controls[type].setValidators([Validators.required]); + } else { + this.sourceCodeForm.controls[type].setValidators([]); + } + this.sourceCodeForm.controls[type].updateValueAndValidity(); + }); } resetOtherScriptParameters(sourceType: sourceTypesEnum) { - switch (sourceType) { - case sourceTypesEnum.VersionNum: - this.sourceCodeForm.controls['tag'].setValue(''); - this.sourceCodeForm.controls['branch'].setValue(''); - break; - case sourceTypesEnum.Tag: - this.sourceCodeForm.controls['branch'].setValue(''); - this.sourceCodeForm.controls['version_num'].setValue(''); - break; - case sourceTypesEnum.Branch: - this.sourceCodeForm.controls['version_num'].setValue(''); - this.sourceCodeForm.controls['tag'].setValue(''); - break; - } + [sourceTypesEnum.Tag, sourceTypesEnum.Branch, sourceTypesEnum.VersionNum] + .filter(type => type !== sourceType) + .forEach(type => { + this.sourceCodeForm.controls[type].setValue(''); + }); + + this.setValidators(); + } + + registerOnChange(fn: () => void) { + this.onChange = fn + } + + registerOnTouched(fn: () => void) { + this.onTouched = fn; + } + + writeValue(data: IExecutionForm['source']) { + this.originalData = data; + this.sourceCodeForm.patchValue(data, {emitEvent: false}); + this.setValidators(); + } + + cancel() { + this.writeValue(this.originalData) } } 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-general-info/experiment-general-info.component.html index bf83b88f..03d0e92c 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.html @@ -1,107 +1,107 @@ + - -
+ + + -
{{experiment?.system_tags?.includes('archived') ? 'Yes' : 'No'}}
+
{{ experiment?.system_tags?.includes('archived') ? 'Yes' : 'No' }}
 - - {{(experiment?.status_changed | date : timeFormatString) | NA}} + {{ (experiment?.status_changed | date : timeFormatString) | NA }} - {{(experiment?.last_iteration) | NA}} + {{ (experiment?.last_iteration) | NA }} - - {{experiment?.status_message | NA}} + {{ experiment?.status_message | NA }} - - {{experiment?.status_reason | NA}} + {{ experiment?.status_reason | NA }} - - {{(experiment?.created | date : timeFormatString) | NA}} + {{ (experiment?.created | date : timeFormatString) | NA }} - - {{(experiment?.started | date : timeFormatString) | NA}} + {{ (experiment?.started | date : timeFormatString) | NA }} - - {{(experiment?.last_update | date:'MMM d yyyy H:mm') | NA}} + {{ (experiment?.last_update | date:'MMM d yyyy H:mm') | NA }} - - {{(experiment?.completed | date : timeFormatString) | NA}} + {{ (experiment?.completed | date : timeFormatString) | NA }} - {{(experiment?.active_duration | duration) | NA}} + {{ (experiment?.active_duration | duration) | NA }} - - {{experiment?.execution?.queue?.name | NA}} + + {{ experiment?.execution?.queue?.name | NA }} - - {{experiment?.last_worker | NA}} + + {{ experiment?.last_worker | NA }} - {{experiment?.user?.name | NA}} + {{ experiment?.user?.name | NA }}
{{experiment?.parent?.name}} + target="_blank">{{ experiment?.parent?.name }}
- {{null| NA}} + {{ null| NA }} - {{experiment?.project?.name | NA}} + {{ experiment?.project?.name | NA }} - {{experiment?.id | NA}} + {{ experiment?.id | NA }} - {{runtimeItem.value}} + {{ runtimeItem.value }} -
+ + + 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-general-info/experiment-general-info.component.scss index ec0938cc..6d42db76 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.scss +++ b/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.scss @@ -9,15 +9,29 @@ padding: 24px 24px 64px 24px; } - @include link(); -} -textarea { - border-radius: 4px; - border: solid 1px $blue-100; - padding: 12px; - color: $blue-500; -} -.general-description { - white-space: pre-wrap; + + + textarea { + border-radius: 4px; + border: solid 1px $blue-100; + padding: 12px; + color: $blue-500; + } + + .general-description { + white-space: pre-wrap; + } + + a { + &:hover { + text-decoration: underline; + } + &.na{ + text-decoration: none; + color: unset; + pointer-events: none; + } + } + } 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-general-info/experiment-general-info.component.ts index 3163d02e..148ae267 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.ts @@ -1,10 +1,12 @@ -import {Component, EventEmitter, Input, Output, ViewChild} from '@angular/core'; +import {Component, ElementRef, EventEmitter, Input, Output, viewChild, ViewChild} from '@angular/core'; import {UntypedFormControl} from '@angular/forms'; import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; import {TIME_FORMAT_STRING} from '@common/constants'; import {Store} from '@ngrx/store'; import {activateEdit, deactivateEdit} from '../../actions/common-experiments-info.actions'; import {EditableSectionComponent} from '@common/shared/ui-components/panel/editable-section/editable-section.component'; +import {TableComponent} from '@common/shared/ui-components/data/table/table.component'; + export const EXPERIMENT_COMMENT = 'ExperimentComment'; @@ -14,13 +16,18 @@ export const EXPERIMENT_COMMENT = 'ExperimentComment'; styleUrls: ['./experiment-general-info.component.scss'] }) export class ExperimentGeneralInfoComponent { - constructor(private store: Store) {} + private table: TableComponent<{ id: string }>; + + constructor(private store: Store) { + } commentControl = new UntypedFormControl(); experimentCommentText: string; experimentCommentOriginal: string; @ViewChild('experimentDescriptionSection') experimentDescriptionSection: EditableSectionComponent; + descriptionElement = viewChild>('description'); + @Input() experiment: IExperimentInfo; @Input() editable: boolean; @Input() isExample: boolean; @@ -34,6 +41,7 @@ export class ExperimentGeneralInfoComponent { @Output() commentChanged = new EventEmitter(); timeFormatString = TIME_FORMAT_STRING; + rebuildCommentControl(comment) { this.commentControl = new UntypedFormControl(comment); } @@ -55,4 +63,10 @@ export class ExperimentGeneralInfoComponent { this.store.dispatch(deactivateEdit()); } } + + + + onDescriptionEditMode() { + this.descriptionElement().nativeElement.focus(); + } } 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 92c4af95..0e506288 100755 --- 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 @@ -1,12 +1,12 @@
- + + [itemLabel]="'Download first '+ (maxDownloadItems$ | ngrxPush) +' items'"> } 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 78441efb..f33e5287 100755 --- 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 @@ -1,63 +1,95 @@ -import {Component, computed, EventEmitter, input, OnInit, Output, TemplateRef} from '@angular/core'; +import {ChangeDetectionStrategy, Component, computed, input, OnInit, output, TemplateRef} from '@angular/core'; import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {FilterMetadata} from 'primeng/api/filtermetadata'; import {BaseEntityHeaderComponent} from '@common/shared/entity-page/base-entity-header/base-entity-header.component'; -import {SelectionEvent} from '@common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component'; -import {Option} from '@common/shared/ui-components/inputs/button-toggle/button-toggle.component'; -import {trackByValue} from '@common/shared/utils/forms-track-by'; -import {resourceToIconMap} from '~/features/experiments/experiments.consts'; +import {SelectionEvent, SelectMetricForCustomColComponent} from '@common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component'; +import {ButtonToggleComponent, Option} from '@common/shared/ui-components/inputs/button-toggle/button-toggle.component'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {CustomColumnMode} from '@common/experiments/shared/common-experiments.const'; +import {PushPipe} from '@ngrx/component'; +import {ToggleArchiveComponent} from '@common/shared/ui-components/buttons/toggle-archive/toggle-archive.component'; +import {ClearFiltersButtonComponent} from '@common/shared/components/clear-filters-button/clear-filters-button.component'; +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 {MatFormField} from '@angular/material/form-field'; +import {MatOption, MatSelect} from '@angular/material/select'; +import {FormsModule} from '@angular/forms'; +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {ExperimentCustomColsMenuComponent} from '@common/experiments/dumb/experiment-custom-cols-menu/experiment-custom-cols-menu.component'; +import {RefreshButtonComponent} from '@common/shared/components/refresh-button/refresh-button.component'; +import {SelectHyperParamsForCustomColComponent} from '@common/experiments/dumb/select-hyper-params-for-custom-col/select-hyper-params-for-custom-col.component'; +import {NgTemplateOutlet} from '@angular/common'; @Component({ - selector : 'sm-experiment-header', + selector: 'sm-experiment-header', templateUrl: './experiment-header.component.html', - styleUrls : ['./experiment-header.component.scss'] + styleUrls: ['./experiment-header.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + PushPipe, + ToggleArchiveComponent, + ButtonToggleComponent, + ClearFiltersButtonComponent, + MenuComponent, + MenuItemComponent, + MatFormField, + MatSelect, + FormsModule, + MatOption, + TooltipDirective, + ExperimentCustomColsMenuComponent, + RefreshButtonComponent, + SelectMetricForCustomColComponent, + SelectHyperParamsForCustomColComponent, + NgTemplateOutlet + ], + standalone: true }) -export class ExperimentHeaderComponent extends BaseEntityHeaderComponent implements OnInit{ +export class ExperimentHeaderComponent extends BaseEntityHeaderComponent implements OnInit { protected readonly customColumnModeEnum = CustomColumnMode; customColumnMode: CustomColumnMode; toggleButtons: Option[]; isArchived = input(); - metricVariants = input>(); + metricVariants = input(); hyperParams = input(); minimizedView = input(); isMetricsLoading = input(); - tableFilters = input<{ [s: string]: FilterMetadata }>(); + tableFilters = input>(); sharedView = input(); showNavbarLinks = input(); tableMode = input<'table' | 'info' | 'compare'>(); compareView = input<'scalars' | 'plots'>(); showCompareScalarSettings = input(); rippleEffect = input(); - addButtonTemplate = input>(); + addButtonTemplate = input>(); tableCols = input(); tableColsWithHeader = computed(() => this.tableCols()?.filter(col => col.header !== '')); - @Output() isArchivedChanged = new EventEmitter(); - @Output() selectedTableColsChanged = new EventEmitter(); - @Output() removeColFromList = new EventEmitter(); - @Output() getMetricsToDisplay = new EventEmitter(); - @Output() selectedMetricToShow = new EventEmitter(); - @Output() selectedHyperParamToShow = new EventEmitter<{param: string; addCol: boolean}>(); - @Output() setAutoRefresh = new EventEmitter(); - @Output() toggleShowCompareSettings = new EventEmitter(); - @Output() compareViewChanged = new EventEmitter<'scalars' | 'plots'>(); - @Output() clearSelection = new EventEmitter(); - @Output() clearTableFilters = new EventEmitter<{ [s: string]: FilterMetadata }>(); - @Output() tableModeChanged = new EventEmitter<'table' | 'info' | 'compare'>(); - protected readonly resourceToIconMap = resourceToIconMap; - protected readonly trackByValue = trackByValue; + isArchivedChanged = output(); + selectedTableColsChanged = output(); + removeColFromList = output(); + getMetricsToDisplay = output(); + selectedMetricToShow = output(); + selectedHyperParamToShow = output<{ + param: string; + addCol: boolean; + }>(); + setAutoRefresh = output(); + toggleShowCompareSettings = output(); + compareViewChanged = output<'scalars' | 'plots'>(); + clearSelection = output(); + clearTableFilters = output>(); + tableModeChanged = output<'table' | 'info' | 'compare'>(); ngOnInit(): void { this.toggleButtons = [ {label: 'Table view', value: 'table', icon: 'al-ico-table-view'}, {label: 'Details view', value: 'info', icon: 'al-ico-experiment-view'}, - ...(this.entityType === EntityTypeEnum.experiment ? [{label: 'Compare view', value: 'compare', icon: 'al-ico-charts-view'}] : []) + ...([EntityTypeEnum.experiment, EntityTypeEnum.controller].includes(this.entityType) ? [{label: 'Compare view', value: 'compare', icon: 'al-ico-charts-view'}] : []) ]; } } 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 061ad829..d76a1aa0 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 @@ -28,7 +28,7 @@ >
diff --git a/src/app/webapp-common/experiments/dumb/experiment-info-header/experiment-info-header.component.ts b/src/app/webapp-common/experiments/dumb/experiment-info-header/experiment-info-header.component.ts index 2a3e66bf..1eb32e83 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-info-header/experiment-info-header.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-info-header/experiment-info-header.component.ts @@ -21,6 +21,7 @@ import { selectionDisabledPublishExperiments, selectionDisabledQueue, selectionDisabledReset, + selectionDisabledRetry, selectionDisabledViewWorker } from '@common/shared/entity-page/items.utils'; import {addMessage} from '@common/core/actions/layout.actions'; @@ -92,6 +93,7 @@ export class ExperimentInfoHeaderComponent implements OnDestroy { [MenuItems.delete]: selectionDisabledDelete([experiment]), [MenuItems.moveTo]: selectionDisabledMoveTo([experiment]), [MenuItems.enqueue]: selectionDisabledEnqueue([experiment]), + [MenuItems.retry]: selectionDisabledRetry([experiment]), [MenuItems.dequeue]: selectionDisabledDequeue([experiment]), [MenuItems.queue]: selectionDisabledQueue([experiment]), [MenuItems.viewWorker]: selectionDisabledViewWorker([experiment]), diff --git a/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.html b/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.html new file mode 100644 index 00000000..00578c41 --- /dev/null +++ b/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.html @@ -0,0 +1,31 @@ + + + +
+ {{ row?.[col.id] | date:'MMM d yyyy H:mm' }} +
+ +
{{OPERATIONS[row.operation]?? (row.operation | titlecase)}}
+ + +
{{ row.user?.name }}
+ + + {{ row?.[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 new file mode 100644 index 00000000..67dc60db --- /dev/null +++ b/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.scss @@ -0,0 +1,5 @@ +@import "variables"; + +:host { + +} diff --git a/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.spec.ts b/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.spec.ts new file mode 100644 index 00000000..6125c3ce --- /dev/null +++ b/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.spec.ts @@ -0,0 +1,21 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExperimentOperationsLogComponent } from './experiment-operations-log.component'; + +describe('ResourcesLogComponent', () => { + let component: ExperimentOperationsLogComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [ExperimentOperationsLogComponent] + }); + fixture = TestBed.createComponent(ExperimentOperationsLogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..f75da320 --- /dev/null +++ b/src/app/webapp-common/experiments/dumb/experiment-operations-log/experiment-operations-log.component.ts @@ -0,0 +1,104 @@ +import {AfterViewInit, Component, EventEmitter, input, Output, QueryList, ViewChildren} from '@angular/core'; +import {DatePipe, NgSwitch, NgSwitchCase, NgSwitchDefault, TitleCasePipe} from '@angular/common'; +import {CdkFixedSizeVirtualScroll, CdkVirtualForOf, CdkVirtualScrollViewport} from '@angular/cdk/scrolling'; +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 { + 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 {filter, take} from 'rxjs/operators'; +import { + TasksGetOperationsLogResponseOperations +} from '~/business-logic/model/tasks/tasksGetOperationsLogResponseOperations'; +import {EXPERIMENTS_STATUS_LABELS} from '~/features/experiments/shared/experiments.const'; + + +@Component({ + selector: 'sm-experiment-operations-log', + templateUrl: './experiment-operations-log.component.html', + styleUrls: ['./experiment-operations-log.component.scss'], + imports: [ + DatePipe, + CdkVirtualScrollViewport, + CdkFixedSizeVirtualScroll, + CdkVirtualForOf, + TableComponent, + PrimeTemplate, + NgSwitchCase, + NgSwitchDefault, + NgSwitch, + ShowTooltipIfEllipsisDirective, + TooltipDirective, + TitleCasePipe, + ], + standalone: true +}) +export class ExperimentOperationsLogComponent implements AfterViewInit { + OPERATIONS = {...EXPERIMENTS_STATUS_LABELS, archived: 'Archived'}; + + columns: ISmCol[] = [ + { + id: 'operation', + header: 'New status', + key: 'operation', + bodyStyleClass: '', + }, + { + id: 'reason', + header: 'Reason', + key: 'reason', + style: {maxWidth: '360px'} + }, + { + id: 'created', + header: 'Timestamp', + key: 'created', + }, { + id: 'user', + header: 'User', + key: 'user', + getter: 'user.name', + }, + { + id: 'ip', + header: 'ip', + key: 'ip', + hidden: true, + includeInDownload: true, + style: {maxWidth: '80px'} + }, { + id: 'originator', + header: 'Source', + key: 'originator', + }, { + id: 'originator_version', + header: 'Source version', + key: 'originator_version', + }, { + id: 'info', + header: 'Info', + key: 'info', + style: {maxWidth: '360px'} + }, + ]; + public table: TableComponent<{ id: string }>; + + lines = input([]); + @Output() downloadFullLog = new EventEmitter(); + @Output() openFullLog = new EventEmitter(); + @ViewChildren(TableComponent) tables: QueryList>; + + protected readonly trackByIndex = trackByIndex; + + ngAfterViewInit(): void { + this.tables.changes + .pipe(filter((comps: QueryList>) => !!comps.first), take(1)) + .subscribe((comps: QueryList>) => { + this.table = comps.first; + }); + this.tables.forEach(item => this.table = item); + } +} 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 146198f3..7e0bb1ea 100755 --- 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 @@ -1,4 +1,4 @@ - +
diff --git a/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.ts b/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.ts index d4f4a08c..3e99d547 100755 --- a/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.ts @@ -87,8 +87,8 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, @Input() tableCols: ISmCol[]; private _experiments: IExperimentInfo[] = []; private _selectedExperiment: IExperimentInfo; - public roundedMetricValues: { [colId: string]: { [expId: string]: boolean } } = {}; - private _tableFilters: { [p: string]: FilterMetadata }; + public roundedMetricValues: Record> = {}; + private _tableFilters: Record; @Input() set experiments(experiments) { this._experiments = experiments; @@ -109,8 +109,8 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, } public contextExperiment: IExperimentInfo | ISelectedExperiment; - public filtersMatch: { [colId: string]: string } = {}; - public filtersSubValues: { [colId: string]: any } = {}; + public filtersMatch: Record = {}; + public filtersSubValues: Record = {}; private titleCasePipe = new TitleCasePipe(); @Input() selectedExperimentsDisableAvailable: Record; @@ -214,7 +214,7 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, return this.systemTags.filter(tag => tag !== 'archived'); } - @Input() set tableFilters(filters: { [s: string]: FilterMetadata }) { + @Input() set tableFilters(filters: Record) { this._tableFilters = filters; this.filtersValues = {}; this.filtersValues[EXPERIMENTS_TABLE_COL_FIELDS.STATUS] = filters?.[EXPERIMENTS_TABLE_COL_FIELDS.STATUS]?.value ?? []; @@ -239,15 +239,15 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, } @Output() experimentSelectionChanged = new EventEmitter<{ experiment: ITableExperiment; openInfo?: boolean }>(); - @Output() experimentsSelectionChanged = new EventEmitter>(); + @Output() experimentsSelectionChanged = new EventEmitter(); @Output() loadMoreExperiments = new EventEmitter(); @Output() sortedChanged = new EventEmitter<{ isShift: boolean; colId: ISmCol['id'] }>(); @Output() tagsMenuOpened = new EventEmitter(); @Output() typesMenuOpened = new EventEmitter(); @Output() columnResized = new EventEmitter<{ columnId: string; widthPx: number }>(); - @Output() openContextMenu = new EventEmitter<{ x: number; y: number; single?: boolean; backdrop?: boolean }>(); + @Output() contextMenu = new EventEmitter<{ x: number; y: number; single?: boolean; backdrop?: boolean }>(); @Output() removeTag = new EventEmitter<{ experiment: ITableExperiment; tag: string }>(); - @Output() clearAllFilters = new EventEmitter<{ [s: string]: FilterMetadata }>(); + @Output() clearAllFilters = new EventEmitter>(); constructor( private changeDetector: ChangeDetectorRef, @@ -307,11 +307,12 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, } } - tableRowClicked(event: { e: MouseEvent; data: ITableExperiment }) { - if (this._selectedExperiments.some(exp => exp.id === event.data.id)) { - this.onContextMenu({e: event.e, rowData: event.data, backdrop: true}); - } else if (!this.selectionReachedLimit) { - this.experimentsSelectionChanged.emit([event.data]); + tableRowClicked({e, data}: { e: MouseEvent; data: ITableExperiment }) { + if (this.selectionMode === 'single') { + this.experimentSelectionChanged.emit({experiment: data}); + } + if (this._selectedExperiments.some(exp => exp.id === data.id)) { + this.openContextMenu({e, rowData: data, backdrop: true}); } } @@ -319,8 +320,7 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, this.experimentsSelectionChanged.emit(selection); } - - onContextMenu(data: { e: Event; rowData; single?: boolean; backdrop?: boolean }) { + openContextMenu(data: { e: Event; rowData; single?: boolean; backdrop?: boolean }) { if (!data?.single) { this.contextExperiment = this._experiments.find(experiment => experiment.id === data.rowData.id); if (!this.selectedExperiments.map(exp => exp.id).includes(this.contextExperiment.id)) { @@ -332,7 +332,7 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, } const event = data.e as MouseEvent; event.preventDefault(); - this.openContextMenu.emit({x: event.clientX, y: event.clientY, single: data?.single, backdrop: data?.backdrop}); + this.contextMenu.emit({x: event.clientX, y: event.clientY, single: data?.single, backdrop: data?.backdrop}); } @@ -365,9 +365,7 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, } } - selectAll(filtered?: boolean) { this.store.dispatch(selectAllExperiments({filtered})); } - } diff --git a/src/app/webapp-common/experiments/dumb/select-hyper-params-for-custom-col/select-hyper-params-for-custom-col.component.ts b/src/app/webapp-common/experiments/dumb/select-hyper-params-for-custom-col/select-hyper-params-for-custom-col.component.ts index 14008176..84da0737 100644 --- a/src/app/webapp-common/experiments/dumb/select-hyper-params-for-custom-col/select-hyper-params-for-custom-col.component.ts +++ b/src/app/webapp-common/experiments/dumb/select-hyper-params-for-custom-col/select-hyper-params-for-custom-col.component.ts @@ -1,5 +1,5 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@angular/core'; -import {GroupedCheckedFilterListComponent} from '@common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component'; +import {GroupedCheckedFilterListComponent, HyperParams} from '@common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; @Component({ @@ -17,7 +17,7 @@ export class SelectHyperParamsForCustomColComponent { public metricsCols: string[]; - @Input() hyperParams: any[]; + @Input() hyperParams: Record>; @Output() getMetricsToDisplay = new EventEmitter(); @Output() selectedHyperParamToShow = new EventEmitter<{param: string; addCol: boolean}>(); @Output() goBack = new EventEmitter(); diff --git a/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/has-selected.pipe.ts b/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/has-selected.pipe.ts new file mode 100644 index 00000000..9f098dee --- /dev/null +++ b/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/has-selected.pipe.ts @@ -0,0 +1,12 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'hasSelected', + standalone: true +}) +export class HasSelectedPipe implements PipeTransform { + + transform(selectedMetrics: Record, metric: string): unknown { + return Object.keys(selectedMetrics).includes(metric); + } +} diff --git a/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.html b/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.html index 49c20736..fcba4b74 100644 --- a/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.html +++ b/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.html @@ -19,24 +19,27 @@

SELECT METRIC TO DISPLAY

} +
+ @if (enableClearSelection && !(metricsCols| isEmpty)) { + Clear Selection + } +
@if (filteredMetricTree && filteredMetricTree.length === 0) { -
+
No data to show
} - @if (enableClearSelection && !(metricsCols| isEmpty)) { -
Clear Selection
- } @for (metric of filteredMetricTree; track metric[1][0].metric_hash) { + [expanded]="searchText?.length > 0 || expandedMetrics[metric[1][0].metric_hash]"> + (click)="expandedMetrics[metric[1][0].metric_hash] = !expandedMetrics[metric[1][0].metric_hash]"> {{ metric[0] }} + @if (selectedMetric | hasSelected: metricTree[metric[0]][0].metric_hash) { + + } @@ -45,24 +48,24 @@

SELECT METRIC TO DISPLAY

@if (multiSelect) {
@if (metricVariant.formData && !skipValueType) {
} @@ -73,7 +76,7 @@

SELECT METRIC TO DISPLAY

#metricVariant (change)="toggleAllMetricsToDisplay(variant, false)" [checked]="metricsCols[variant.metric_hash + variant.variant_hash] !== undefined" - >{{ variant.variant }} + >{{ variant.variant }}
@if (metricVariant.checked) { @@ -81,7 +84,7 @@

SELECT METRIC TO DISPLAY

+ > 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 977b904e..cba4371d 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 @@ -6,9 +6,10 @@ :host { .actions { - padding: 6px 0; + display: block; + padding: 12px 0 0; font-size: 12px; - color: $blue-480; + height: 36px; } .metrics-container { display: flex; @@ -37,7 +38,7 @@ } sm-search { - margin: 0 12px; + margin: 0 24px; } .variant-label { @@ -74,22 +75,36 @@ color: $blue-400; mat-expansion-panel-header { - padding: 7px 24px 7px 4px; - border-radius: 0; - border-bottom: 1px solid $blue-100; + padding: 7px 4px 7px 0; - &.mat-expanded { - background-color: $blue-50; - border-radius: 0; - border-bottom: none; - font-weight: bold; + mat-panel-title { + max-width: calc(100% - 12px); } .panel-title { padding-right: 12px; - font-size: 13px; + font-size: 14px; color: $blue-400; } + + .has-selected { + margin-left: auto; + background-color: $purple; + width: 6px; + height: 6px; + flex: 0 0 6px; + border-radius: 6px; + align-self: center; + } + + &.mat-expanded { + border-radius: 0; + border-bottom: none; + font-weight: 500; + .panel-title { + color: $purple; + } + } } } @@ -101,7 +116,7 @@ height: calc(100% - 34px); width: 100%; overflow-y: scroll; - padding-left: 12px; + padding: 0 24px; } .metric-expansion-content { @@ -132,6 +147,11 @@ margin: auto; } + .empty-container { + display: flex; + height: calc(100% - 36px); + } + .empty-state { text-align: center; margin: auto; 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 d52a3860..951e2666 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,6 +13,7 @@ import {CheckboxControlComponent} from '@common/shared/ui-components/forms/check 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'; export interface SelectionEvent { variant: MetricVariantResult; @@ -40,48 +41,57 @@ export interface SelectionEvent { ShowTooltipIfEllipsisDirective, MatRadioButton, MatRadioGroup, - FormsModule + FormsModule, + HasSelectedPipe ], standalone: true }) export class SelectMetricForCustomColComponent { - public metricTree: {[metricName: string]: MetricVariantResult[]}; + public metricTree: Record; public filteredMetricTree: [string, MetricVariantResult[]][]; public expandedMetrics = {}; - public metricsCols: {[metVar: string]: string[]}; + public metricsCols: Record; public searchText: string; public entriesLimit = 300; public moreResults: number; private debounceTimer: number; + public selectedMetric: {[metric: string]: boolean}; - @Input() set metricVariants(metricVar: Array) { + @Input() set metricVariants(metricVar: MetricVariantResult[]) { if (metricVar === null) { return; } this.metricTree = metricVar?.reduce((result, metric) => { - result[metric.metric] ? result[metric.metric].push(metric) : result[metric.metric] = [metric]; + if (result[metric.metric]) { + result[metric.metric].push(metric); + } else { + result[metric.metric] = [metric]; + } return result; - }, {} as {[metricName: string]: MetricVariantResult[]}); + }, {} as Record); this.filteredMetricTree = Object.entries(this.metricTree || {}).slice(0, this.entriesLimit); this.moreResults = Object.keys(this.metricTree || {}).length - this.filteredMetricTree.length; } @Input() set tableCols(tableCols) { this.metricsCols = {}; + this.selectedMetric = {}; tableCols?.filter(tableCol => tableCol.metric_hash)?.forEach(tableCol => { this.expandedMetrics[tableCol.metric_hash] = this.expandedMetrics[tableCol.metric_hash] ?? true; + this.selectedMetric[tableCol.metric_hash] = true; this.metricsCols[tableCol.metric_hash + tableCol.variant_hash] ? - this.metricsCols[tableCol.metric_hash + tableCol.variant_hash].push(tableCol.valueType) : - this.metricsCols[tableCol.metric_hash + tableCol.variant_hash] = [tableCol.valueType]; + this.metricsCols[tableCol.metric_hash + tableCol.variant_hash].push(tableCol.valueType ?? tableCol.metricName) : + this.metricsCols[tableCol.metric_hash + tableCol.variant_hash] = [tableCol.valueType ?? tableCol.metricName]; }); } + @Input() multiSelect = true; @Input() skipValueType = false; @Input() enableClearSelection: boolean; // @Output() getMetricsToDisplay = new EventEmitter(); @Output() selectedMetricToShow = new EventEmitter(); @Output() clearSelection = new EventEmitter(); - @Output() goBack = new EventEmitter(); + @Output() goBack = new EventEmitter(); constructor(private changeDetectorRef: ChangeDetectorRef) { } @@ -102,7 +112,8 @@ export class SelectMetricForCustomColComponent { public toggleMetricToDisplay(variant: ISmCol, value: boolean, valueType: MetricValueType) { this.selectedMetricToShow.emit({variant, addCol: !value, valueType}); } - public resetSearch(){ + + public resetSearch() { this.searchQ(''); } @@ -111,8 +122,9 @@ export class SelectMetricForCustomColComponent { this.debounceTimer = window.setTimeout(() => { this.searchText = value; if (value?.length > 0) { + const query = value.toLowerCase(); this.filteredMetricTree = Object.entries(this.metricTree).filter(([, results]) => - results.some(variant => variant.variant.includes(value)) + results.some(variant => variant.variant.toLowerCase().includes(query) || variant.metric.toLowerCase().includes(query)) ); this.moreResults = this.filteredMetricTree.length - this.entriesLimit; this.filteredMetricTree = this.filteredMetricTree.slice(0, this.entriesLimit); 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 bf816ab7..47d5372c 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 @@ -1,17 +1,26 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; import {ApiAuthService} from '~/business-logic/api-services/auth.service'; import {BlTasksService} from '~/business-logic/services/tasks.service'; import {ApiEventsService} from '~/business-logic/api-services/events.service'; -import {catchError, expand, map, mergeMap, reduce, switchMap, withLatestFrom} from 'rxjs/operators'; +import {catchError, expand, filter, map, mergeMap, reduce, switchMap, withLatestFrom} from 'rxjs/operators'; import {activeLoader, deactivateLoader, setServerError} from '../../core/actions/layout.actions'; import {requestFailed} from '../../core/actions/http.actions'; import * as outputActions from '../actions/common-experiment-output.actions'; -import {Log, setExperimentScalarSingleValue} from '../actions/common-experiment-output.actions'; +import { + Log, + setExperimentMetricsVariantValues, + setExperimentScalarSingleValue +} from '../actions/common-experiment-output.actions'; import {LOG_BATCH_SIZE} from '../shared/common-experiments.const'; -import {selectExperimentHistogramCacheAxisType, selectPipelineSelectedStep, selectSelectedSettingsxAxisType} from '../reducers'; +import { + selectExperimentHistogramCacheAxisType, + selectPipelineSelectedStep, + selectSelectedSettingsxAxisType +} from '../reducers'; import {refreshExperiments} from '../actions/common-experiments-view.actions'; import {EventsGetTaskLogResponse} from '~/business-logic/model/events/eventsGetTaskLogResponse'; import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; @@ -19,6 +28,7 @@ import {EMPTY} from 'rxjs'; import {selectSelectedExperiment} from '~/features/experiments/reducers'; import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; import {EventsGetTaskPlotsResponse} from '~/business-logic/model/events/eventsGetTaskPlotsResponse'; +import {ApiModelsService} from '~/business-logic/api-services/models.service'; @Injectable() @@ -26,6 +36,7 @@ export class CommonExperimentOutputEffects { constructor( private actions$: Actions, private store: Store, private apiTasks: ApiTasksService, + private modelsApi: ApiModelsService, private authApi: ApiAuthService, private taskBl: BlTasksService, private eventsApi: ApiEventsService ) { } @@ -50,7 +61,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) ? [ outputActions.setExperimentLog({ events: res.events.map((e: Log) => ({...e, msg: e.msg?.replace(/\0/g, '')})), @@ -71,7 +82,9 @@ export class CommonExperimentOutputEffects { requestFailed(error), deactivateLoader(action.type), deactivateLoader(refreshExperiments.type), - ...(action.refresh || action.from || action.autoRefresh ? [] : [setServerError(error, null, 'Failed to fetch log')]), + ...(action.refresh || action.from || action.autoRefresh + // hide weird missing id error + || error.error.meta.result_subcode === 101 ? [] : [setServerError(error, null, 'Failed to fetch log')]), outputActions.setExperimentLogLoading({loading: false}) ]) ) @@ -115,11 +128,33 @@ export class CommonExperimentOutputEffects { ) )); + fetchExperimentScalarMetricVariantsTableData$ = createEffect(() => this.actions$.pipe( + ofType(outputActions.experimentScalarRequested), + filter(action=> !action.model), + switchMap((action) => this.apiTasks.tasksGetAllEx({ + id: [action.experimentId], + only_fields: ['last_metrics'] + })), + mergeMap((res) => [setExperimentMetricsVariantValues({lastMetrics: res?.tasks[0].last_metrics})] + ) + )); + + fetchModelScalarMetricVariantsTableData$ = createEffect(() => this.actions$.pipe( + ofType(outputActions.experimentScalarRequested), + filter(action=> !!action.model), + switchMap((action) => this.modelsApi.modelsGetAllEx({ + id: [action.experimentId], + only_fields: ['last_metrics'] + })), + mergeMap((res) => [setExperimentMetricsVariantValues({lastMetrics: res?.models[0].last_metrics})] + ) + )); + fetchExperimentScalar$ = createEffect(() => this.actions$.pipe( ofType(outputActions.experimentScalarRequested), - concatLatestFrom( (action) => [ - this.store.select(selectSelectedSettingsxAxisType(action.model)), - this.store.select(selectExperimentHistogramCacheAxisType) + concatLatestFrom((action) => [ + this.store.select(selectSelectedSettingsxAxisType(action.model)), + this.store.select(selectExperimentHistogramCacheAxisType) ] ), switchMap(([action, axisType, prevAxisType]) => { 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 7df71808..6c819b49 100755 --- a/src/app/webapp-common/experiments/effects/common-experiments-info.effects.ts +++ b/src/app/webapp-common/experiments/effects/common-experiments-info.effects.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {catchError, filter, map, mergeMap, shareReplay, switchMap, take, tap} from 'rxjs/operators'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; @@ -35,7 +36,9 @@ import { saveExperimentConfigObj, saveExperimentSection, saveHyperParamsSection, - setExperimentSaving + setExperimentOperationLog, + setExperimentSaving, + TreeStep } from '../actions/common-experiments-info.actions'; import {getTags, updateExperiment} from '../actions/common-experiments-view.actions'; import { @@ -70,6 +73,9 @@ import {fromFetch} from 'rxjs/fetch'; import {isFileserverUrl} from '~/shared/utils/url'; import {getExtraHeaders} from '~/features/experiments/shared/experiments.utils'; import {MESSAGES_SEVERITY} from '@common/constants'; +import {Task} from '~/business-logic/model/tasks/task'; +import {TasksGetAllExResponse} from '~/business-logic/model/tasks/tasksGetAllExResponse'; +import {TaskStatusEnum} from '~/business-logic/model/tasks/taskStatusEnum'; @Injectable() @@ -103,39 +109,45 @@ export class CommonExperimentsInfoEffects { this.store.select(selectExperimentSelectedConfigObjectFromRoute) ]), filter(([, experimentId]) => !!experimentId), - switchMap(([action, experimentId, configuration, selectedConfiguration]) => this.apiTasks.tasksGetConfigurationNames({tasks: [experimentId], skip_empty: false}) - .pipe( - mergeMap(res => { - let configurations = cloneDeep(configuration); - if (configurations) { - Object.keys(configurations).forEach(name => { - if (!res.configurations[0]?.names.includes(name)) { - delete configurations.name; + switchMap(([action, experimentId, configuration, selectedConfiguration]) => this.apiTasks.tasksGetConfigurationNames({ + tasks: [experimentId], + skip_empty: false + }) + .pipe( + mergeMap(res => { + let configurations = cloneDeep(configuration); + if (configurations) { + Object.keys(configurations).forEach(name => { + if (!res.configurations[0]?.names.includes(name)) { + delete configurations.name; + } + }); + } else { + configurations = {}; + } + res.configurations[0]?.names.forEach(name => { + if (!(name in configurations)) { + configurations[name] = null; } }); - } else { - configurations = {}; - } - res.configurations[0]?.names.forEach(name => { - if (!(name in configurations)) { - configurations[name] = null; - } - }); - return [ - commonInfoActions.updateExperimentInfoData({ - id: experimentId, - changes: {configuration: configurations} - }), - selectedConfiguration ? getExperimentConfigurationObj() : emptyAction(), + return [ + commonInfoActions.updateExperimentInfoData({ + id: experimentId, + changes: {configuration: configurations} + }), + selectedConfiguration ? getExperimentConfigurationObj() : emptyAction(), + deactivateLoader(action.type), + ]; + }), + catchError(error => [ + requestFailed(error), deactivateLoader(action.type), - ]; - }), - catchError(error => [ - requestFailed(error), - deactivateLoader(action.type), - addMessage('warn', 'Fetch configuration names failed', [{name: 'More info', actions: [setServerError(error, null, 'Fetch configuration names failed')]}]) - ]) - ) + addMessage('warn', 'Fetch configuration names failed', [{ + name: 'More info', + actions: [setServerError(error, null, 'Fetch configuration names failed')] + }]) + ]) + ) ) )); @@ -151,32 +163,35 @@ export class CommonExperimentsInfoEffects { tasks: [experimentId], names: [action.type === getPipelineConfigurationObj.type ? 'Pipeline' : configObj] }) - .pipe( - mergeMap(res => { - const configurationObj = { - ...configuration, - [action.type === getPipelineConfigurationObj.type ? 'Pipeline' : configObj]: res.configurations[0].configuration[0] - }; - return [ - commonInfoActions.updateExperimentInfoData({ - id: experimentId, - changes: {configuration: configurationObj} - }), + .pipe( + mergeMap(res => { + const configurationObj = { + ...configuration, + [action.type === getPipelineConfigurationObj.type ? 'Pipeline' : configObj]: res.configurations[0].configuration[0] + }; + return [ + commonInfoActions.updateExperimentInfoData({ + id: experimentId, + changes: {configuration: configurationObj} + }), + deactivateLoader(action.type), + setBackdrop({active: false}), + deactivateEdit(), + setExperimentSaving({saving: false}) + ]; + }), + catchError(error => [ + requestFailed(error), deactivateLoader(action.type), setBackdrop({active: false}), deactivateEdit(), - setExperimentSaving({saving: false}) - ]; - }), - catchError(error => [ - requestFailed(error), - deactivateLoader(action.type), - setBackdrop({active: false}), - deactivateEdit(), - setExperimentSaving({saving: false}), - addMessage('warn', 'Fetch configuration failed', [{name: 'More info', actions: [setServerError(error, null, 'Fetch configuration failed')]}]) - ]) - ) + setExperimentSaving({saving: false}), + addMessage('warn', 'Fetch configuration failed', [{ + name: 'More info', + actions: [setServerError(error, null, 'Fetch configuration failed')] + }]) + ]) + ) ) )); @@ -187,7 +202,6 @@ export class CommonExperimentsInfoEffects { ]), switchMap(([action, pipeline]) => this.apiTasks.tasksGetByIdEx({ id: [action.id], - // eslint-disable-next-line @typescript-eslint/naming-convention only_fields: pipeline ? PIPELINE_INFO_ONLY_FIELDS : ['name', 'comment', 'parent.name', 'parent.project.id', 'runtime', 'configuration', 'status'] }).pipe( mergeMap(res => @@ -200,12 +214,25 @@ 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(() => [ this.store.select(selectSelectedTableExperiment), this.store.select(selectSelectedExperiment), - this.store.select(selectSelectedFromTable ), + this.store.select(selectSelectedFromTable), this.store.select(selectExperimentInfoData), this.store.select(selectAppVisible), this.store.select(selectRouterConfig).pipe(map(config => !!config?.includes('pipelines') || !!config?.includes('datasets'))) @@ -222,8 +249,8 @@ export class CommonExperimentsInfoEffects { } return (selectedExperimentFromTable ? of(selectedExperimentFromTable) : - // eslint-disable-next-line @typescript-eslint/naming-convention - this.apiTasks.tasksGetByIdEx({id: [selected.id], only_fields: ['last_change']}).pipe(map(res => res.tasks[0])) + + 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))), @@ -236,14 +263,17 @@ export class CommonExperimentsInfoEffects { (new Date(this.previousSelectedLastUpdate) < new Date(updateTime)) || action.type === commonInfoActions.experimentUpdatedSuccessfully.type ) { - const autoRefresh = action.type === commonInfoActions.autoRefreshExperimentInfo.type; - if (autoRefresh) { + const autoRefresh = action.type === commonInfoActions.autoRefreshExperimentInfo.type || action['autoRefresh']; + if (action.type === commonInfoActions.autoRefreshExperimentInfo.type) { this.refreshService.trigger(true); } return [ deactivateLoader(action.type), commonInfoActions.getExperiment({experimentId: action.id, autoRefresh}), - ...(customView ? [] : [commonInfoActions.getExperimentUncommittedChanges({experimentId: action.id, autoRefresh})]), + ...(customView ? [] : [commonInfoActions.getExperimentUncommittedChanges({ + experimentId: action.id, + autoRefresh + })]), // clear log data if experiment was restarted ...(selected?.started && tableSelected?.started && selected.started !== tableSelected?.started ? [resetOutput()] : []) ]; @@ -254,7 +284,6 @@ export class CommonExperimentsInfoEffects { )); - fetchExperiment$ = createEffect(() => this.actions$.pipe( ofType(commonInfoActions.getExperiment), switchMap(action => this.store.select(selectSelectedProject).pipe( @@ -265,50 +294,64 @@ export class CommonExperimentsInfoEffects { this.store.select(selectHasDataFeature), this.store.select(selectRouterConfig).pipe(map(config => !!config?.includes('pipelines') || !!config?.includes('datasets'))) ]), - switchMap(([action, hasDataFeature, graphView]) => - this.apiTasks.tasksGetByIdEx({ + switchMap(([action, hasDataFeature, graphView]) => this.apiTasks.tasksGetByIdEx({ id: [action.experimentId], - // eslint-disable-next-line @typescript-eslint/naming-convention + only_fields: graphView ? PIPELINE_INFO_ONLY_FIELDS : getExperimentInfoOnlyFields(hasDataFeature) }) - .pipe( - concatLatestFrom(() => this.store.select(selectPipelineSelectedStep)), - mergeMap(([res, selectedStep]) => { - let experiment = res.tasks[0]; - if (experiment) { - this.previousSelectedLastUpdate = experiment.last_change; - experiment = convertStopToComplete([experiment])[0]; - experiment = this.commonExperimentReverterService.revertReadOnly(experiment); - return [ - commonInfoActions.setExperimentInfoData({experiment: this.reverter.revertExperiment(experiment)}), - commonInfoActions.setExperiment({experiment}), - updateExperiment({id: action.experimentId, changes: experiment}), - deactivateLoader(action.type), - deactivateLoader(commonInfoActions.getExperimentInfo.type), - setBackdrop({active: false}), - deactivateEdit(), - setExperimentSaving({saving: false}), - graphView && selectedStep?.id ? getSelectedPipelineStep({id: selectedStep.id}) : emptyAction() - ]; - } else { - this.router.navigate(['dashboard']); - return [deactivateLoader(action.type)]; - } - }), - catchError(error => [ - requestFailed(error), - deactivateLoader(action.type), - deactivateLoader(commonInfoActions.getExperimentInfo.type), - ...(action.autoRefresh ? [] : [setServerError(error, null, 'Fetch experiment failed')]) - ]) - ) + .pipe( + switchMap((res: TasksGetByIdExResponse) => { + // fetch steps real status + const task = res.tasks[0]; + const ids = this.getPipelineStepsIds(task); + return graphView && task.status === TaskStatusEnum.Stopped && ids.length ? + this.apiTasks.tasksGetAllEx({ + id: ids, + only_fields: ['status'], + search_hidden: true + }).pipe( + map((steps: TasksGetAllExResponse) => steps?.tasks.length ? + this.updateStepsStatus(task, steps.tasks) : + task), + ) : + of(res.tasks[0]); + }), + concatLatestFrom(() => this.store.select(selectPipelineSelectedStep)), + mergeMap(([task, selectedStep]) => { + if (task) { + this.previousSelectedLastUpdate = task.last_change; + let experiment = convertStopToComplete([task])[0]; + experiment = this.commonExperimentReverterService.revertReadOnly(experiment); + return [ + commonInfoActions.setExperimentInfoData({experiment: this.reverter.revertExperiment(experiment)}), + commonInfoActions.setExperiment({experiment}), + updateExperiment({id: action.experimentId, changes: experiment}), + deactivateLoader(action.type), + deactivateLoader(commonInfoActions.getExperimentInfo.type), + setBackdrop({active: false}), + deactivateEdit(), + setExperimentSaving({saving: false}), + graphView && selectedStep?.id ? getSelectedPipelineStep({id: selectedStep.id}) : emptyAction() + ]; + } else { + this.router.navigate(['dashboard']); + return [deactivateLoader(action.type)]; + } + }), + catchError(error => [ + requestFailed(error), + deactivateLoader(action.type), + deactivateLoader(commonInfoActions.getExperimentInfo.type), + ...(action.autoRefresh ? [] : [setServerError(error, null, 'Fetch experiment failed')]) + ]) + ) ) )); fetchDiff$ = createEffect(() => this.actions$.pipe( ofType(commonInfoActions.getExperimentUncommittedChanges), switchMap((action) => - // eslint-disable-next-line @typescript-eslint/naming-convention + this.apiTasks.tasksGetByIdEx({id: [action.experimentId], only_fields: ['script.diff']}) .pipe( mergeMap(res => { @@ -323,7 +366,7 @@ export class CommonExperimentsInfoEffects { fetchArtifacts$ = createEffect(() => this.actions$.pipe( ofType(commonInfoActions.getExperimentArtifacts), switchMap((action) => - // eslint-disable-next-line @typescript-eslint/naming-convention + this.apiTasks.tasksGetByIdEx({id: [action.experimentId], only_fields: ARTIFACTS_ONLY_FIELDS}) .pipe( mergeMap((res: TasksGetByIdExResponse) => { @@ -381,7 +424,7 @@ export class CommonExperimentsInfoEffects { map((status: string) => status ? commonInfoActions.downloadArtifacts({url: status}) : commonInfoActions.downloadSuccess()) - ), ); + ),); // Changes fields which can be applied regardless of experiment draft state i.e name, comments, tags @@ -402,8 +445,8 @@ export class CommonExperimentsInfoEffects { commonInfoActions.experimentUpdatedSuccessfully({id: action.id}), updateExperiment({id: action.id, changes}), ...(selectedExperiment?.id === action.id ? - [commonInfoActions.updateExperimentInfoData({ id: action.id, changes })] : - [] + [commonInfoActions.updateExperimentInfoData({id: action.id, changes})] : + [] ), ...(changes.tags ? [getTags({})] : []) ]; @@ -484,7 +527,7 @@ export class CommonExperimentsInfoEffects { this.apiTasks.tasksEditHyperParams({ task: selectedExperiment.id, hyperparams: action.hyperparams.length > 0 ? action.hyperparams : [{section}], - // eslint-disable-next-line @typescript-eslint/naming-convention + replace_hyperparams: ReplaceHyperparamsEnum.Section }) .pipe( @@ -565,7 +608,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}/experiments/${task.id}`; a.target = '_blank'; a.click(); return {type: 'none'}; @@ -575,4 +618,37 @@ export class CommonExperimentsInfoEffects { }), catchError(() => of(addMessage(MESSAGES_SEVERITY.WARN, 'Dataset not found'))) )); + + private getPipelineStepsIds(task: Task) { + if (!task.runtime._pipeline_hash) { + return []; + } + const pipelineStr = task?.configuration?.Pipeline?.value; + try { + const pipelineObj: Record = JSON.parse(pipelineStr); + return Object.values(pipelineObj).map(step => step.job_id); + } catch { + return []; + } + } + + private updateStepsStatus(task: Task, steps: Task[]) { + const pipelineStr = task?.configuration?.Pipeline?.value; + let pipelineObj: Record; + try { + pipelineObj = JSON.parse(pipelineStr); + } catch { + return task; + } + const stepStatus = steps.reduce((acc, step) => { + acc[step.id] = step.status; + return acc; + }, {}); + pipelineObj = Object.entries(pipelineObj).reduce((acc, [id, step]: [string, TreeStep]) => { + acc[id] = {...step, status: stepStatus[step.job_id] ?? step.status}; + return acc; + }, {}); + task.configuration.Pipeline.value = JSON.stringify(pipelineObj); + return task; + } } 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 04c29896..b48a0ae9 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 @@ -57,15 +57,16 @@ import {ITableExperiment} from '@common/experiments/shared/common-experiment-mod import * as projectsActions from '@common/core/actions/projects.actions'; import {PipelinesStartPipelineResponse} from '~/business-logic/model/pipelines/pipelinesStartPipelineResponse'; import {selectSelectedProjectId} from '@common/core/reducers/projects.reducer'; +import {TasksGetByIdExResponse} from '~/business-logic/model/tasks/tasksGetByIdExResponse'; -export const getChildrenExperiments = (tasksApi, parents, filters?: { [key: string]: any }): Observable => +export const getChildrenExperiments = (tasksApi, parents, filters?: Record): Observable => tasksApi.tasksGetAllEx({ - /* eslint-disable @typescript-eslint/naming-convention */ + page_size: 2000, only_fields: ['name', 'status'], status: [TaskStatusEnum.Queued, TaskStatusEnum.InProgress], parent: parents.map(p => p.id), ...(filters && filters) - /* eslint-enable @typescript-eslint/naming-convention */ + }) .pipe( map((res: TasksGetAllExResponse) => res.tasks), @@ -102,12 +103,12 @@ export class CommonExperimentsMenuEffects { switchMap(([action, selectedEntity]) => { const ids = action.selectedEntities.map(exp => exp.id); return this.apiTasks.tasksEnqueueMany({ - /* eslint-disable @typescript-eslint/naming-convention */ + ids, queue: action.queue.id, ...((!action.queue.id) && {queue_name: action.queue.name}), validate_tasks: true, ...( action.verifyWatchers && {verify_watched_queue: true}) - /* eslint-enable @typescript-eslint/naming-convention */ + }) .pipe( mergeMap((res: TasksEnqueueManyResponse) => [ @@ -170,13 +171,13 @@ export class CommonExperimentsMenuEffects { concatLatestFrom(() => this.store.select(selectRouterParams).pipe(map(params => params?.projectId))), switchMap(([action, projectId]) => this.apiTasks.tasksGetAllEx({ - /* eslint-disable @typescript-eslint/naming-convention */ + project: projectId, type: [TaskTypeEnum.Controller], ...(action.task && {id: [action.task]}), ...(!action.task && {order_by: ['-started'], page_size: 1}), only_fields: PIPELINE_INFO_ONLY_FIELDS - /* eslint-enable @typescript-eslint/naming-convention */ + }).pipe( mergeMap((res: TasksGetAllExResponse) => [ menuActions.setControllerForStartPipelineDialog({task: res?.tasks[0] as unknown as IExperimentInfo}), @@ -212,13 +213,13 @@ export class CommonExperimentsMenuEffects { concatLatestFrom(() => this.store.select(selectTableMode)), switchMap(([action, ]) => this.apiTasks.tasksClone({ task: action.originExperiment.id, - /* eslint-disable @typescript-eslint/naming-convention */ + ...(action.cloneData?.project?.value && {new_task_project: action.cloneData.project.value}), new_task_comment: action.cloneData.comment, new_task_name: action.cloneData.name, new_project_name: action.cloneData.newProjectName, ...(action.cloneData.forceParent && {new_task_parent: action.originExperiment.id}) - /* eslint-enable @typescript-eslint/naming-convention */ + } as TasksCloneRequest) .pipe( mergeMap((res: TasksCloneResponse) => { @@ -292,14 +293,14 @@ export class CommonExperimentsMenuEffects { action => this.apiTasks.tasksMove({ ids: action.selectedEntities.map(exp => exp.id), project: action.project.id, - // eslint-disable-next-line @typescript-eslint/naming-convention + project_name: action.project.name }) .pipe( tap((res) => this.router.navigate([`projects/${action.project.id ? action.project.id : res.project_id ?? '*'}/experiments/${action.selectedEntities.length === 1 ? action.selectedEntities[0].id : ''}`], {queryParamsHandling: 'merge'})), concatLatestFrom(() => this.store.select(selectSelectedExperiment)), mergeMap(([, selectedExperiment]) => [ - viewActions.resetExperiments(), + viewActions.resetExperiments({}), viewActions.setSelectedExperiments({experiments: []}), ...action.selectedEntities.map(exp => this.setExperimentIfSelected(selectedExperiment, exp.id, {project: action.project ?? '*'})), deactivateLoader(action.type), @@ -448,7 +449,7 @@ export class CommonExperimentsMenuEffects { if (routerConfig.includes('output') && routerParams?.experimentId === experiments[0].id) { actions.push(experimentDetailsUpdated({ id: experiments[0].id, - // eslint-disable-next-line @typescript-eslint/naming-convention + changes: {system_tags: [...(experiments[0]?.system_tags.filter(t => t !== 'shared') ?? []), 'archived'].sort()} })); } @@ -509,7 +510,7 @@ export class CommonExperimentsMenuEffects { if (routerConfig.includes('output') && routerParams?.experimentId === experiments[0].id) { actions.push(experimentDetailsUpdated({ id: experiments[0].id, - // eslint-disable-next-line @typescript-eslint/naming-convention + changes: {system_tags: experiments[0]?.system_tags.filter(tag => tag !== 'archived')} })); } @@ -537,7 +538,7 @@ export class CommonExperimentsMenuEffects { } else { return this.apiTasks.tasksGetAllEx({ id: [action.experimentId], - // eslint-disable-next-line @typescript-eslint/naming-convention + only_fields: ['execution.queue.id'] }); } @@ -548,6 +549,28 @@ export class CommonExperimentsMenuEffects { }) ), {dispatch: false}); + navigateToWorker = createEffect(() => { + return this.actions$.pipe( + ofType(menuActions.navigateToWorker), + concatLatestFrom(() => this.store.select(selectSelectedExperiment)), + switchMap(([action, info]) => { + if (action.experimentId === info?.id && info?.last_worker) { + return of({tasks: [info]}); + } else { + return this.apiTasks.tasksGetByIdEx({ + id: [action.experimentId], + only_fields: ['last_worker'] + }); + } + }), + map((res: TasksGetByIdExResponse) => { + const worker = (res.tasks[0]).last_worker; + // return this.router.navigate(['/workers-and-queues/queues'], {queryParams: {id: queue.id}}); + this.router.navigate(['workers-and-queues', 'workers'], {queryParams: {id: worker}}); + }) + ) + }, {dispatch: false}); + isSelectedExpInCheckedExps(checked: ISelectedExperiment[], selected: IExperimentInfo): boolean { return selected && checked.some(exp => exp.id === selected.id); 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 0b47848f..7e560180 100755 --- a/src/app/webapp-common/experiments/effects/common-experiments-view.effects.ts +++ b/src/app/webapp-common/experiments/effects/common-experiments-view.effects.ts @@ -1,6 +1,7 @@ -import {Injectable} from '@angular/core'; +import {inject, Injectable} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Action, Store} from '@ngrx/store'; import {cloneDeep, flatten, isEqual} from 'lodash-es'; import {EMPTY, iif, interval, Observable, of} from 'rxjs'; @@ -15,7 +16,7 @@ import { mergeMap, reduce, switchMap, - tap, + tap } from 'rxjs/operators'; import {ApiProjectsService} from '~/business-logic/api-services/projects.service'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; @@ -41,12 +42,19 @@ import { decodeHyperParam, encodeColumns, encodeOrder, - excludedKey, getTagsFilters, + excludedKey, + getTagsFilters, TableFilter } from '../../shared/utils/tableParamEncode'; import {autoRefreshExperimentInfo, getExperimentInfo} from '../actions/common-experiments-info.actions'; import * as exActions from '../actions/common-experiments-view.actions'; -import {getSelectedExperiments, setActiveParentsFilter, setParents, setSelectedExperiments, updateManyExperiment} from '../actions/common-experiments-view.actions'; +import { + getSelectedExperiments, + setActiveParentsFilter, + setParents, + setSelectedExperiments, + updateManyExperiment +} from '../actions/common-experiments-view.actions'; import * as exSelectors from '../reducers/index'; import {selectHyperParamsFiltersPage, selectSelectedExperiments, selectTableRefreshList} from '../reducers/index'; import {ITableExperiment} from '../shared/common-experiment-model.model'; @@ -76,6 +84,7 @@ import { selectionDisabledPublishExperiments, selectionDisabledQueue, selectionDisabledReset, + selectionDisabledRetry, selectionDisabledTags, selectionDisabledViewWorker } from '../../shared/entity-page/items.utils'; @@ -116,13 +125,15 @@ import * as menuActions from '@common/experiments/actions/common-experiments-men @Injectable() export class CommonExperimentsViewEffects { - /* eslint-disable @typescript-eslint/naming-convention */ - constructor( - private actions$: Actions, private store: Store, private apiTasks: ApiTasksService, - private projectsApi: ApiProjectsService, private eventsApi: ApiEventsService, private router: Router, - private route: ActivatedRoute, private orgApi: ApiOrganizationService, private errService: ErrorService - ) { - } + private actions$ = inject(Actions); + private store = inject(Store); + private apiTasks = inject(ApiTasksService); + private projectsApi = inject(ApiProjectsService); + private eventsApi = inject(ApiEventsService); + private router = inject(Router); + private orgApi = inject(ApiOrganizationService); + private errService = inject(ErrorService); + private route = inject(ActivatedRoute); activeLoader = createEffect(() => this.actions$.pipe( ofType( @@ -153,7 +164,7 @@ export class CommonExperimentsViewEffects { ...action.filters.reduce((acc, updatedFilter) => { acc[updatedFilter.col] = {value: updatedFilter.value, matchMode: updatedFilter.filterMatchMode}; return acc; - }, {} as { [col: string]: FilterMetadata }) + }, {} as Record) }, update: true })] ) @@ -163,7 +174,6 @@ export class CommonExperimentsViewEffects { prepareTableForDownload = createEffect(() => this.actions$.pipe( ofType(exActions.prepareTableForDownload), - // eslint-disable-next-line @typescript-eslint/naming-convention concatLatestFrom(() => [ this.store.select(selectRouterParams).pipe(map(params => params?.projectId)), this.store.select(selectIsArchivedMode), @@ -179,14 +189,14 @@ export class CommonExperimentsViewEffects { this.store.select(selectIsCompare), this.store.select(selectViewArchivedInAddTable), this.store.select(selectIsPipelines), - this.store.select(selectIsDatasets), + this.store.select(selectIsDatasets) ]), switchMap(([ - , projectId, isArchived, gb, orderFields, filters, selectedExperiments, - showAllSelectedIsActive, cols, metricCols, deep, showHidden, isCompare, showArcived, - isPipeline, isDataset - ]) => { - const tableFilters = cloneDeep(filters) || {} as { [key: string]: FilterMetadata }; + , projectId, isArchived, gb, orderFields, filters, selectedExperiments, + showAllSelectedIsActive, cols, metricCols, deep, showHidden, isCompare, showArcived, + isPipeline, isDataset + ]) => { + const tableFilters = cloneDeep(filters) || {} as Record; if (tableFilters && tableFilters.status && tableFilters.status.value.includes('completed')) { tableFilters.status.value.push('closed'); } @@ -355,7 +365,7 @@ export class CommonExperimentsViewEffects { exActions.setNoMoreExperiments({hasMore: (res.tasks.length < EXPERIMENTS_PAGE_SIZE)}), ...addTasksAction, exActions.setCurrentScrollId({scrollId: res.scroll_id}), - deactivateLoader(action.type), + deactivateLoader(action.type) ]; }), catchError(error => [ @@ -386,11 +396,26 @@ export class CommonExperimentsViewEffects { this.store.select(selectRouterParams).pipe(map(params => params?.projectId)), this.store.select(selectTableMode) ]), - filter(([, , , , tableMode]) => tableMode !== 'table'), + filter(([, , , , tableMode]) => tableMode === 'info'), tap(([, routeConfig, tasks, projectId]) => this.navigateAfterExperimentSelectionChanged(tasks[0] as ITableExperiment, projectId, routeConfig, true)), mergeMap(([, , , , tableMode]) => [exActions.setTableMode({mode: tableMode}), exActions.setSelectedExperiments({experiments: []})]) )); + selectNextExperimentEffectForCompareView = createEffect(() => this.actions$.pipe( + ofType(exActions.selectNextExperiment), + debounceTime(500), + concatLatestFrom(() => [ + this.store.select(selectRouterConfig), + this.store.select(selectRouterParams).pipe(map(params => params?.projectId)), + this.store.select(selectTableMode) + ]), + filter(([, , , tableMode]) => tableMode === 'compare'), + tap(([, routeConfig, projectId]) => { + const url = routeConfig.map(conf => conf === ':projectId' ? projectId : conf) + setTimeout(() => this.router.navigate([...url, {ids: []}], {queryParamsHandling: 'preserve'})) + }), + map(() => exActions.setSelectedExperiments({experiments: []})) + )); getTypesEffect = createEffect(() => this.actions$.pipe( ofType(exActions.getProjectTypes), @@ -514,7 +539,7 @@ export class CommonExperimentsViewEffects { getCustomMetricsPerType = createEffect(() => this.actions$.pipe( ofType(exActions.getCustomMetricsPerType), concatLatestFrom(() => [ - this.store.select(selectRouterParams).pipe(map(params => params?.projectId)), + this.store.select(selectRouterParams).pipe(map(params => params?.projectId)) ]), switchMap(([action, projectId]) => { if (action.ids.length > 0) { @@ -584,7 +609,7 @@ export class CommonExperimentsViewEffects { this.store.select(selectIsDeepMode), this.store.select(selectRouterProjectId), this.store.select(selectIsCompare), - this.store.select(selectHyperParamsFiltersPage), + this.store.select(selectHyperParamsFiltersPage) ]), switchMap(([action, isDeep, selectedProjectId, isCompare, page]) => { const projectId = action.col.projectId || selectedProjectId; @@ -596,12 +621,12 @@ export class CommonExperimentsViewEffects { ...((!isCompare && projectId !== '*') && {projects: [projectId]}), page, page_size: rootProjectsPageSize, - pattern: escapeRegex(action.searchValue), + pattern: escapeRegex(action.searchValue) }).pipe( map((data: ProjectsGetHyperparamValuesResponse) => { const values = data.values.filter(x => hasValue(x) && x !== ''); return exActions.hyperParamSelectedInfoExperiments({col: action.col, values, loadMore: page > 0}); - }), + }) ); }) )); @@ -618,12 +643,12 @@ export class CommonExperimentsViewEffects { this.store.select(selectIsDeepMode), this.store.select(selectShowHidden), this.store.select(selectIsPipelines), - this.store.select(selectIsDatasets), + this.store.select(selectIsDatasets) ]), switchMap(([ - action, projectId, archived, globalSearch, cols, metricCols, - tableFilters, deep, showHidden, isPipeline, isDataset - ]) => { + action, projectId, archived, globalSearch, cols, metricCols, + tableFilters, deep, showHidden, isPipeline, isDataset + ]) => { const pageSize = 5000; const query = this.getGetAllQuery({ projectId, @@ -653,7 +678,7 @@ export class CommonExperimentsViewEffects { catchError(error => [ requestFailed(error), deactivateLoader(exActions.selectAllExperiments.type), - setServerError(error, null, 'Fetch experiments for selection failed'), + setServerError(error, null, 'Fetch experiments for selection failed') ]) )); @@ -692,8 +717,8 @@ export class CommonExperimentsViewEffects { this.route.queryParams ]), map(([, projectId, isArchived, , sortFields, filters, - cols, hiddenCols, metricsCols, colsOrder, isDeep, queryParams - ]) => { + cols, hiddenCols, metricsCols, colsOrder, isDeep, queryParams + ]) => { const columns = encodeColumns(cols, hiddenCols, this.filterColumns(projectId, metricsCols), colsOrder ? colsOrder : queryParams.columns); return setURLParams({ columns, @@ -711,43 +736,45 @@ export class CommonExperimentsViewEffects { // wow angular really suck... const activeChild = this.route?.firstChild?.firstChild?.firstChild?.firstChild?.firstChild?.firstChild; const activeChildUrl = activeChild ? getRouteFullUrl(activeChild) : ''; - selectedExperiment ? + if (selectedExperiment) { this.router.navigate( [module, experimentProject, 'experiments', selectedExperiment.id].concat(activeChild ? activeChildUrl.split('/') : []), {queryParamsHandling: 'preserve'} - ) : + ); + } else { this.router.navigate([module, experimentProject, 'experiments'], { queryParamsHandling: 'preserve', replaceUrl }); + } } getGetAllQuery({ - refreshScroll = false, - scrollId = null, - projectId, - searchQuery, - archived, - orderFields = [], - tableFilters, - selectedIds = [], - cols = [], - metricCols = [], - deep = false, - showHidden = false, - isCompare, - showArchived = false, - isPipeline = false, - isDataset = false, - pageSize = EXPERIMENTS_PAGE_SIZE - }: { + refreshScroll = false, + scrollId = null, + projectId, + searchQuery, + archived, + orderFields = [], + tableFilters, + selectedIds = [], + cols = [], + metricCols = [], + deep = false, + showHidden = false, + isCompare, + showArchived = false, + isPipeline = false, + isDataset = false, + pageSize = EXPERIMENTS_PAGE_SIZE + }: { refreshScroll?: boolean; scrollId?: string; projectId: string; searchQuery?: SearchState['searchQuery']; archived: boolean; orderFields?: SortMeta[]; - tableFilters: { [columnId: string]: FilterMetadata }; + tableFilters: Record; selectedIds?: string[]; cols?: ISmCol[]; metricCols?: ISmCol[]; @@ -830,7 +857,7 @@ export class CommonExperimentsViewEffects { ...(systemTagsFilter?.length > 0 && {system_tags: systemTagsFilter}), ...(tagsFilter?.length > 0 && { filters: { - tags: getTagsFilters(tagsFilterAnd, tagsFilter), + tags: getTagsFilters(tagsFilterAnd, tagsFilter) } }), include_subprojects: deep && !projectFilter, @@ -857,14 +884,14 @@ export class CommonExperimentsViewEffects { this.store.select(selectIsCompare), this.store.select(selectViewArchivedInAddTable), this.store.select(selectIsPipelines), - this.store.select(selectIsDatasets), + this.store.select(selectIsDatasets) ]), switchMap(([ - scrollId, projectId, isArchived, gb, orderFields, filters, selectedExperiments, - showAllSelectedIsActive, cols, metricCols, deep, showHidden, isCompare, showArcived, - isPipeline, isDataset - ]) => { - const tableFilters = cloneDeep(filters) || {} as { [key: string]: FilterMetadata }; + scrollId, projectId, isArchived, gb, orderFields, filters, selectedExperiments, + showAllSelectedIsActive, cols, metricCols, deep, showHidden, isCompare, showArcived, + isPipeline, isDataset + ]) => { + const tableFilters = cloneDeep(filters) || {} as Record; if (tableFilters && tableFilters.status && tableFilters.status.value.includes('completed')) { tableFilters.status.value.push('closed'); } @@ -920,7 +947,7 @@ export class CommonExperimentsViewEffects { setSelectedExperiments = createEffect(() => this.actions$.pipe( ofType(exActions.setSelectedExperiments, exActions.updateExperiment, updateManyExperiment.type), concatLatestFrom(() => - this.store.select(exSelectors.selectSelectedExperiments), + this.store.select(exSelectors.selectSelectedExperiments) ), switchMap(([action, selectSelectedExperiments]) => { const experiments = action.type === exActions.setSelectedExperiments.type ? @@ -934,11 +961,12 @@ export class CommonExperimentsViewEffects { [MenuItems.moveTo]: selectionDisabledMoveTo(experiments), [MenuItems.continue]: selectionDisabledContinue(experiments), [MenuItems.enqueue]: selectionDisabledEnqueue(experiments), + [MenuItems.retry]: selectionDisabledRetry(experiments), [MenuItems.dequeue]: selectionDisabledDequeue(experiments), [MenuItems.queue]: selectionDisabledQueue(experiments), [MenuItems.viewWorker]: selectionDisabledViewWorker(experiments), [MenuItems.archive]: selectionDisabledArchive(experiments), - [MenuItems.tags]: selectionDisabledTags(experiments), + [MenuItems.tags]: selectionDisabledTags(experiments) }; //allHasExamples: selectionAllExamples(action.experiments), // allArchive: selectionAllIsArchive(action.experiments), @@ -966,16 +994,16 @@ export class CommonExperimentsViewEffects { working_dir: action.data.directory, entry_point: action.data.script, binary: action.data.binary, - requirements: action.data.requirements === 'manual' ? {pip: action.data.pip} : null, + requirements: action.data.requirements === 'manual' ? {pip: action.data.pip} : null }, hyperparams: { Args: action.data.args .filter(arg => arg.key?.length > 0) .reduce((acc, arg) => { - const name = arg.key.startsWith('--') ? arg.key.slice(2) : arg.key; - acc[name] = {name, value: arg.value, section: 'Args'}; - return acc; - }, {}) + const name = arg.key.startsWith('--') ? arg.key.slice(2) : arg.key; + acc[name] = {name, value: arg.value, section: 'Args'}; + return acc; + }, {}) }, ...(action.data.output && {output_dest: action.data.output}), ...((action.data.docker.image || action.data.taskInit) && { @@ -984,7 +1012,7 @@ export class CommonExperimentsViewEffects { 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' : ''}`.trimStart(), setup_shell_script: action.data.docker.script } - }), + }) }).pipe( map((res: TasksCreateResponse) => exActions.createExperimentSuccess({data: {...action.data, id: res.id}, project: projectId})) )), @@ -1009,7 +1037,7 @@ export class CommonExperimentsViewEffects { openExperiment = createEffect(() => { return this.actions$.pipe( ofType(exActions.openExperiment), - map(action => this.router.navigate(['projects', action.project, 'experiments', action.id]),) + map(action => this.router.navigate(['projects', action.project, 'experiments', action.id])) ); }, {dispatch: false}); @@ -1020,9 +1048,9 @@ export class CommonExperimentsViewEffects { switchMap(action => this.apiTasks.tasksEnqueue({ queue: action.data.queue.id, task: action.data.id, - verify_watched_queue: true, + verify_watched_queue: true }).pipe( - map(res => res.queue_watched === false ? menuActions.openEmptyQueueMessage({queue: action.data.queue, entityName: action.data.name}) : {type: 'EMPTY'}), + map(res => res.queue_watched === false ? menuActions.openEmptyQueueMessage({queue: action.data.queue, entityName: action.data.name}) : {type: 'EMPTY'}) )), catchError(error => [addMessage(MESSAGES_SEVERITY.ERROR, `Failed to enqueue experiment.\n${this.errService.getErrorMsg(error.error)}`)]) ); diff --git a/src/app/webapp-common/experiments/experiment-routes.ts b/src/app/webapp-common/experiments/experiment-routes.ts index 08881a80..d869d32c 100644 --- a/src/app/webapp-common/experiments/experiment-routes.ts +++ b/src/app/webapp-common/experiments/experiment-routes.ts @@ -1,24 +1,48 @@ import {Routes} from '@angular/router'; import {ExperimentsComponent} from '@common/experiments/experiments.component'; -import {ExperimentInfoExecutionComponent} from './containers/experiment-info-execution/experiment-info-execution.component'; +import { + ExperimentInfoExecutionComponent +} from './containers/experiment-info-execution/experiment-info-execution.component'; import {leavingBeforeSaveAlertGuard} from '../shared/guards/leaving-before-save-alert.guard'; -import {ExperimentInfoArtifactsComponent} from './containers/experiment-info-aritfacts/experiment-info-artifacts.component'; +import { + ExperimentInfoArtifactsComponent +} from './containers/experiment-info-aritfacts/experiment-info-artifacts.component'; import {ExperimentInfoModelComponent} from './containers/experiment-info-model/experiment-info-model.component'; -import {ExperimentInfoArtifactItemComponent} from './containers/experiment-info-artifact-item/experiment-info-artifact-item.component'; -import {ExperimentInfoHyperParametersComponent} from './containers/experiment-info-hyper-parameters/experiment-info-hyper-parameters.component'; -import {ExperimentInfoTaskModelComponent} from './containers/experiment-info-task-model/experiment-info-task-model.component'; -import {ExperimentInfoHyperParametersFormContainerComponent} from './containers/experiment-info-hyper-parameters-form-container/experiment-info-hyper-parameters-form-container.component'; +import { + ExperimentInfoArtifactItemComponent +} from './containers/experiment-info-artifact-item/experiment-info-artifact-item.component'; +import { + ExperimentInfoHyperParametersComponent +} from './containers/experiment-info-hyper-parameters/experiment-info-hyper-parameters.component'; +import { + ExperimentInfoTaskModelComponent +} from './containers/experiment-info-task-model/experiment-info-task-model.component'; +import { + ExperimentInfoHyperParametersFormContainerComponent +} from './containers/experiment-info-hyper-parameters-form-container/experiment-info-hyper-parameters-form-container.component'; import {ExperimentInfoGeneralComponent} from './containers/experiment-info-general/experiment-info-general.component'; -import {ExperimentOutputComponent} from '~/features/experiments/containers/experiment-ouptut/experiment-output.component'; -import {ExperimentOutputScalarsComponent} from './containers/experiment-output-scalars/experiment-output-scalars.component'; +import { + ExperimentOutputComponent +} from '~/features/experiments/containers/experiment-ouptut/experiment-output.component'; +import { + ExperimentOutputScalarsComponent +} from './containers/experiment-output-scalars/experiment-output-scalars.component'; import {ExperimentOutputPlotsComponent} from './containers/experiment-output-plots/experiment-output-plots.component'; import {DebugImagesComponent} from '../debug-images/debug-images.component'; import {ExperimentOutputLogComponent} from './containers/experiment-output-log/experiment-output-log.component'; import {selectIsExperimentInEditMode} from '@common/experiments/reducers'; -import {ExperimentCompareScalarChartsComponent} from '@common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component'; -import {COMPARE_CONFIG_TOKEN, COMPARE_STORE_KEY, getCompareConfig} from '@common/experiments-compare/experiments-compare.module'; +import { + ExperimentCompareScalarChartsComponent +} from '@common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component'; +import { + COMPARE_CONFIG_TOKEN, + COMPARE_STORE_KEY, + getCompareConfig +} from '@common/experiments-compare/experiments-compare.module'; import {UserPreferences} from '@common/user-preferences'; -import {ExperimentComparePlotsComponent} from '@common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component'; +import { + ExperimentComparePlotsComponent +} from '@common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component'; import {importProvidersFrom} from '@angular/core'; import {StoreModule} from '@ngrx/store'; import {experimentsCompareReducers} from '@common/experiments-compare/reducers'; @@ -54,6 +78,9 @@ export const routes: Routes = [ data: {minimized: true}, providers: [ {provide: COMPARE_CONFIG_TOKEN, useFactory: getCompareConfig, deps: [UserPreferences]}, + importProvidersFrom( + StoreModule.forFeature(COMPARE_STORE_KEY, experimentsCompareReducers, COMPARE_CONFIG_TOKEN), + ), ], }, { diff --git a/src/app/webapp-common/experiments/experiments.component.html b/src/app/webapp-common/experiments/experiments.component.html index e3da1e0d..cb63127d 100644 --- a/src/app/webapp-common/experiments/experiments.component.html +++ b/src/app/webapp-common/experiments/experiments.component.html @@ -1,19 +1,19 @@ - +
+ [class.footer-visible]="((selectedExperiments$ | ngrxPush) && (selectedExperiments$ | ngrxPush)?.length > 1) || (showAllSelectedIsActive$ |ngrxPush)"> @@ -124,7 +125,7 @@
>; + public experiments$: Observable; public selectedExperimentsHasUpdate$: Observable; public noMoreExperiments$: Observable; public tableSortFields$: Observable; public tableSortOrder$: Observable; - public selectedExperiments$: Observable>; + public selectedExperiments$: Observable; public isArchived$: Observable; - public tableFilters$: Observable<{ [columnId: string]: FilterMetadata }>; + public tableFilters$: Observable>; public filteredTableCols$: Observable; public tableCols$: Observable; public metricVariants$: Observable; @@ -125,7 +133,6 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI public readOnlySelection: boolean; public contextMenuActive: boolean; public tableMode$: Observable<'table' | 'info' | 'compare'>; - public contextMenu: ExperimentMenuComponent; public isPipeline$: Observable; protected override entityType = EntityTypeEnum.experiment; public singleRowContext: boolean; @@ -139,9 +146,12 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI private searchQuery$: Observable; protected override parents: ProjectsGetTaskParentsResponseParents[]; - @ViewChild('experimentsTable') public table: ExperimentsTableComponent; - @ViewChild('contextMenuExtended') contextMenuExtended: ExperimentMenuExtendedComponent; + table = viewChild(ExperimentsTableComponent); + contextMenuExtended = viewChild.required(ExperimentMenuExtendedComponent); + public contextMenu = computed(() => this.contextMenuExtended().contextMenu()); + public tableMode: 'table' | 'info' | 'compare'; + private previousSelectedIds: string; public showCompareScalarSettings$: Observable; public metricsVariants$ = this.store.selectSignal(selectMetricVariantForView); public tableCompareView$ = this.store.selectSignal(selectTableCompareView); @@ -184,7 +194,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI this.metricLoading$ = this.store.select(selectMetricsLoading); this.hyperParamsOptions$ = this.store.select(selectHyperParamsOptions); this.hyperParams$ = this.store.select(selectHyperParamsVariants).pipe( - map(hyperParams => groupHyperParams(hyperParams)) + map(hyperParams => groupHyperParams(hyperParams.filter(hp => hp.section !== 'properties' || hp.name !== 'version'))) ); this.experiments$ = this.store.select(selectExperimentsList) .pipe( @@ -247,7 +257,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI this.store.dispatch(experimentsActions.setExtraColumns({ projectId: this.selectedProjectId, columns: metrics.map(metricCol => createMetricColumn(metricCol, projectId)) - .concat(hyperParams.map(param => this.createParamColumn(decodeURIComponent(param), projectId))) + .concat(hyperParams.map(param => this.createParamColumn(decodeURIComponentSafe(param), projectId))) })); this.columnsReordered(allIds, false); } @@ -294,13 +304,6 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI tagsFilterByProject$: this.tagsFilterByProject$ }); - override ngAfterViewInit() { - super.ngAfterViewInit(); - if (this.contextMenuExtended) { - this.contextMenu = this.contextMenuExtended.contextMenu; - } - } - protected emptyUrlInit() { this.store.dispatch(experimentsActions.updateUrlParams()); this.shouldOpenDetails = true; @@ -312,7 +315,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI override createFooterItems(config: { entitiesType: EntityTypeEnum; - selected$: Observable>; + selected$: Observable; showAllSelectedIsActive$: Observable; tags$: Observable; data$?: Observable>; @@ -325,12 +328,11 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI new ShowItemsFooterSelected(config.entitiesType), new CompareFooterItem(config.entitiesType), new DividerFooterItem(), - ...((this.getTableModeFromURL() === 'compare') ? [] : [ - new ArchiveFooterItem(config.entitiesType), - new DeleteFooterItem(), - new DividerFooterItem() - ]), + new ArchiveFooterItem(config.entitiesType), + new DeleteFooterItem(), + new DividerFooterItem(), new EnqueueFooterItem(), + new RetryFooterItem(), new DequeueFooterItem(), new ResetFooterItem(config.entitiesType), new AbortFooterItem(config.entitiesType), @@ -357,31 +359,34 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI this.compareExperiments(); break; case MenuItems.archive: - this.contextMenu.restoreArchive(item.entitiesType); + this.contextMenu().restoreArchive(item.entitiesType); break; case MenuItems.reset: - this.contextMenu.resetPopup(); + this.contextMenu().resetPopup(); break; case MenuItems.publish: - this.contextMenu.publishPopup(); + this.contextMenu().publishPopup(); + break; + case MenuItems.retry: + this.contextMenu().retryPopup(); break; case MenuItems.enqueue: - this.contextMenu.enqueuePopup(); + this.contextMenu().enqueuePopup(); break; case MenuItems.dequeue: - this.contextMenu.dequeuePopup(); + this.contextMenu().dequeuePopup(); break; case MenuItems.delete: - this.contextMenu.deleteExperimentPopup(); + this.contextMenu().deleteExperimentPopup(); break; case MenuItems.abort: - this.contextMenu.stopPopup(); + this.contextMenu().stopPopup(); break; case MenuItems.abortAllChildren: - this.contextMenu.stopAllChildrenPopup(); + this.contextMenu().stopAllChildrenPopup(); break; case MenuItems.moveTo: - this.contextMenu.moveToProjectPopup(); + this.contextMenu().moveToProjectPopup(); break; } }); @@ -401,12 +406,8 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI override ngOnDestroy(): void { super.ngOnDestroy(); - this.store.dispatch(experimentsActions.resetExperiments()); + this.store.dispatch(experimentsActions.resetExperiments({})); this.stopSyncSearch(); - this.table = undefined; - if (this.contextMenuExtended?.contextMenu) { - this.contextMenuExtended.contextMenu = null; - } } stopSyncSearch() { @@ -433,16 +434,17 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI this.firstExperiment = experiments?.[0]; this.entities = experiments; const experimentsIds = this.route.snapshot.firstChild?.params?.ids?.split(',').filter(id => !!id); - if (mode === 'compare' && experimentsIds?.length > 0 && this.selectedExperiments.length === 0) { + if (mode === 'compare' && experimentsIds?.length > 0 && this.selectedExperiments.length === 0 && !this.previousSelectedIds) { this.store.dispatch(experimentsActions.getSelectedExperiments({ids: experimentsIds})); } + this.previousSelectedIds = experimentsIds; if (!experimentId && this.shouldOpenDetails && this.firstExperiment && mode === 'info') { this.shouldOpenDetails = false; this.store.dispatch(experimentsActions.experimentSelectionChanged({ experiment: this.firstExperiment, project: this.selectedProjectId })); - } else if (mode !== 'compare' || this.entityType !== EntityTypeEnum.experiment) { + } else if (mode !== 'compare' || ![EntityTypeEnum.experiment, EntityTypeEnum.controller].includes(this.entityType)) { this.store.dispatch(experimentsActions.setTableMode({mode: this.getTableModeFromURL()})); } else if (this.shouldOpenDetails) { this.modeChanged(mode); @@ -472,7 +474,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI this.store.dispatch(experimentsActions.getNextExperiments()); } - experimentsSelectionChanged(experiments: Array) { + experimentsSelectionChanged(experiments: ITableExperiment[]) { this.store.dispatch(experimentsActions.setSelectedExperiments({experiments})); if (this.getTableModeFromURL() === 'compare') { this.router.navigate(['compare'], {relativeTo: this.route, queryParamsHandling: 'preserve'}); @@ -480,10 +482,12 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI } experimentSelectionChanged(event: { experiment: ITableExperiment; openInfo?: boolean }) { - (this.minimizedView || event.openInfo) && event.experiment && this.store.dispatch(experimentsActions.experimentSelectionChanged({ - experiment: event.experiment, - project: this.selectedProjectId - })); + if ((this.minimizedView || event.openInfo) && event.experiment) { + this.store.dispatch(experimentsActions.experimentSelectionChanged({ + experiment: event.experiment, + project: this.selectedProjectId + })); + } } sortedChanged(event: { isShift: boolean; colId: ISmCol['id'] }) { @@ -567,7 +571,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI headerType: ColHeaderTypeEnum.sortFilter, sortable: true, filterable: true, - header: decodeURIComponent(param.replace('hyperparams.', '')), + header: decodeURIComponentSafe(param.replace('hyperparams.', '')), hidden: false, projectId: projectId || this.projectId, isParam: true, @@ -608,10 +612,10 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI })); } - refreshList(isAutorefresh: boolean) { + refreshList(isAutoRefresh: boolean) { this.store.dispatch(experimentsActions.refreshExperiments({ - hideLoader: isAutorefresh, - autoRefresh: isAutorefresh + hideLoader: isAutoRefresh, + autoRefresh: isAutoRefresh })); } @@ -642,7 +646,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI return params?.experimentId; } - clearTableFiltersHandler(tableFilters: { [s: string]: FilterMetadata }) { + clearTableFiltersHandler(tableFilters: Record) { const filters = Object.keys(tableFilters).map(col => ({col, value: []})); this.store.dispatch(experimentsActions.tableFilterChanged({filters, projectId: this.selectedProjectId})); } @@ -650,10 +654,10 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI onContextMenuOpen({x, y, single, backdrop}: { x: number; y: number; single?: boolean; backdrop?: boolean }) { this.singleRowContext = single; this.menuBackdrop = !!backdrop; - this.contextMenu.openMenu({x, y}); + this.contextMenu().openMenu({x, y}); } - getSingleSelectedDisableAvailable(experiment) { + getSingleSelectedDisableAvailable(experiment): Record { return { [MenuItems.abort]: selectionDisabledAbort([experiment]), [MenuItems.abortAllChildren]: selectionDisabledAbortAllChildren([experiment]), @@ -662,6 +666,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI [MenuItems.delete]: selectionDisabledDelete([experiment]), [MenuItems.moveTo]: selectionDisabledMoveTo([experiment]), [MenuItems.enqueue]: selectionDisabledEnqueue([experiment]), + [MenuItems.retry]: selectionDisabledRetry([experiment]), [MenuItems.dequeue]: selectionDisabledDequeue([experiment]), [MenuItems.queue]: selectionDisabledQueue([experiment]), [MenuItems.viewWorker]: selectionDisabledViewWorker([experiment]), @@ -700,7 +705,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI } downloadTableAsCSV() { - this.table.table.downloadTableAsCSV(`ClearML ${this.selectedProject.id === '*' ? 'All' : this.selectedProject?.basename?.substring(0, 60)} Experiments`); + this.table().table.downloadTableAsCSV(`ClearML ${this.selectedProject.id === '*' ? 'All' : this.selectedProject?.basename?.substring(0, 60)} Experiments`); } downloadFullTableAsCSV() { 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 0e1959f7..2d66294d 100755 --- a/src/app/webapp-common/experiments/reducers/common-experiment-info.reducer.ts +++ b/src/app/webapp-common/experiments/reducers/common-experiment-info.reducer.ts @@ -1,36 +1,40 @@ import * as actions from '../actions/common-experiments-info.actions'; -import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; -import {experimentSections, experimentSectionsEnum} from '~/features/experiments/shared/experiments.const'; import { activateEdit, deactivateEdit, deleteHyperParamsSection, + downloadArtifacts, + downloadFailed, + downloadSuccess, experimentDataUpdated, experimentDetailsUpdated, + getExperimentArtifacts, + getExperimentUncommittedChanges, + resetExperimentInfo, saveExperiment, saveExperimentConfigObj, saveExperimentSection, saveHyperParamsSection, setExperiment, + setExperimentArtifacts, setExperimentErrors, setExperimentFormErrors, + setExperimentInfoData, + setExperimentOperationLog, setExperimentSaving, + setExperimentUncommittedChanges, setSelectedPipelineStep, updateExperimentAtPath, - getExperimentArtifacts, - downloadArtifacts, - resetExperimentInfo, - setExperimentInfoData, - updateExperimentInfoData, - getExperimentUncommittedChanges, - setExperimentUncommittedChanges, - setExperimentArtifacts, - downloadSuccess, - downloadFailed + updateExperimentInfoData } from '../actions/common-experiments-info.actions'; +import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; +import {experimentSections, experimentSectionsEnum} from '~/features/experiments/shared/experiments.const'; 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 { @@ -38,7 +42,7 @@ export interface CommonExperimentInfoState { selectedPipelineStep: IExperimentInfo; pipelineRunDialogTask: IExperimentInfo; infoData: IExperimentInfo; - errors: { [key: string]: any } | null; + errors: Record | null; showExtraDataSpinner: boolean; activeSectionEdit: boolean; saving: boolean; @@ -47,6 +51,8 @@ export interface CommonExperimentInfoState { userKnowledge: Map; artifactsExperimentId: string; downloading: boolean; + downloadingExperimentOperationLog: boolean; + operationLog: TasksGetOperationsLogResponseOperations[]; } export const initialCommonExperimentInfoState: CommonExperimentInfoState = { @@ -68,6 +74,8 @@ export const initialCommonExperimentInfoState: CommonExperimentInfoState = { } as any, artifactsExperimentId: null, downloading: false, + downloadingExperimentOperationLog: false, + operationLog: null }; export const commonExperimentInfoReducers = [ @@ -93,6 +101,7 @@ 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: { @@ -109,7 +118,7 @@ export const commonExperimentInfoReducers = [ })), on(getExperimentUncommittedChanges, (state, action): CommonExperimentInfoState => ({ ...state, - showExtraDataSpinner: !(action as ReturnType).autoRefresh + showExtraDataSpinner: !action.autoRefresh })), on(setExperimentUncommittedChanges, (state, action): CommonExperimentInfoState => ({ ...state, 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 22cbabdd..53a4bef0 100644 --- a/src/app/webapp-common/experiments/reducers/experiment-output.reducer.ts +++ b/src/app/webapp-common/experiments/reducers/experiment-output.reducer.ts @@ -7,6 +7,7 @@ import {MetricsPlotEvent} from '~/business-logic/model/events/metricsPlotEvent'; import {EventsGetTaskSingleValueMetricsResponseValues} from '~/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseValues'; import {createReducer, on} from '@ngrx/store'; import {SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; +import {Task} from '~/business-logic/model/tasks/task'; export interface ExperimentOutputState { @@ -22,7 +23,9 @@ export interface ExperimentOutputState { logFilter: string; logLoading: boolean; showSettings: boolean; + metricValuesView: boolean; scalarSingleValue: Array; + lastMetrics: Task['last_metrics']; graphsPerRow: number; } @@ -30,6 +33,7 @@ export interface ExperimentSettings { id: string; hiddenMetricsScalar: Array; hiddenMetricsPlot: Array; + selectedMetricTable: string[]; selectedMetricsScalar: Array; selectedMetricsPlot: Array; selectedHyperParams: Array; @@ -52,10 +56,12 @@ export const experimentOutputInitState: ExperimentOutputState = { beginningOfLog: false, settingsList: [], scalarSingleValue:[], + lastMetrics: null, searchTerm: '', logFilter: null, logLoading: false, showSettings: false, + metricValuesView: false, graphsPerRow: 2 }; @@ -107,6 +113,7 @@ export const experimentOutputReducer = createReducer( on(actions.setHistogram, (state, action) => ({...state, metricsHistogramCharts: action.histogram, cachedAxisType: action.axisType})), 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.setExperimentSettings, (state, action) => { let newSettings: ExperimentSettings[]; const changes = {...action.changes, lastModified: (new Date()).getTime()} as ExperimentSettings; @@ -136,5 +143,6 @@ export const experimentOutputReducer = createReducer( on(actions.setLogFilter, (state, action) => ({...state, logFilter: (action as ReturnType).filter})), on(actions.resetLogFilter, state => ({...state, logFilter: null})), on(actions.toggleSettings, state => ({...state, showSettings: !state.showSettings})), + on(actions.toggleMetricValuesView, state => ({...state, metricValuesView: !state.metricValuesView})), on(actions.setGraphsPerRow, (state, action) => ({...state, graphsPerRow: action.graphsPerRow})), ); 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 e81df57a..f749eaf6 100644 --- a/src/app/webapp-common/experiments/reducers/experiments-view.reducer.ts +++ b/src/app/webapp-common/experiments/reducers/experiments-view.reducer.ts @@ -2,7 +2,7 @@ import {ITableExperiment} from '../shared/common-experiment-model.model'; import {ISmCol} from '../../shared/ui-components/data/table/table.consts'; import * as actions from '../actions/common-experiments-view.actions'; import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; -import {createCompareMetricColumn, TableFilter} from '../../shared/utils/tableParamEncode'; +import {createCompareMetricColumn, decodeURIComponentSafe, TableFilter} from '../../shared/utils/tableParamEncode'; import {ProjectsGetTaskParentsResponseParents} from '~/business-logic/model/projects/projectsGetTaskParentsResponseParents'; import {SearchState} from '../../common-search/common-search.reducer'; import {SortMeta} from 'primeng/api'; @@ -14,24 +14,25 @@ import {FilterMetadata} from 'primeng/api/filtermetadata'; import {IExperimentInfo, ISelectedExperiment} from '~/features/experiments/shared/experiment-info.model'; import {EventTypeEnum} from '~/business-logic/model/events/eventTypeEnum'; import {cloneExperimentClicked} from '@common/experiments/actions/common-experiments-menu.actions'; +import {HIDDEN_PLOTS_BY_DEFAULT} from '@common/experiments-compare/experiments-compare.constants'; export interface ExperimentsViewState { tableCols: ISmCol[]; - colsOrder: { [Project: string]: string[] }; + colsOrder: Record; tableFilters: any; - tempFilters: { [columnId: string]: FilterMetadata }; - projectColumnFilters: { [projectId: string]: { [columnId: string]: FilterMetadata } }; - projectColumnsSortOrder: { [projectId: string]: SortMeta[] }; - projectColumnsWidth: { [projectId: string]: { [colId: string]: number } }; + tempFilters: Record; + projectColumnFilters: Record>; + projectColumnsSortOrder: Record; + projectColumnsWidth: Record>; metricsCols: ISmCol[]; - hiddenTableCols: { [colName: string]: boolean }; - hiddenProjectTableCols: { [projectId: string]: { [colName: string]: boolean | undefined } }; - experiments: Array; + hiddenTableCols: Record; + hiddenProjectTableCols: Record>; + experiments: ITableExperiment[]; refreshList: boolean; noMoreExperiment: boolean; selectedExperiment: IExperimentInfo; - selectedExperiments: Array; + selectedExperiments: ISelectedExperiment[]; selectedExperimentsDisableAvailable: Record; selectedExperimentSource: string; experimentToken: string; @@ -39,11 +40,11 @@ export interface ExperimentsViewState { hyperParamsFiltersPage: number; globalFilter: SearchState['searchQuery']; showAllSelectedIsActive: boolean; - metricVariants: Array; - metricVariantsPlots: Array; - compareSelectedMetrics: { [projectid: string]: { metrics: Array>; lastModified: number } }; - compareSelectedMetricsPlots: { [projectid: string]: { metrics: Array>; lastModified: number } }; - hyperParams: Array; + metricVariants: MetricVariantResult[]; + metricVariantsPlots: MetricVariantResult[]; + compareSelectedMetrics: Record[]; lastModified: number }>; + compareSelectedMetricsPlots: Record[]; lastModified: number }>; + hyperParams: {name: string; section: string}[]; hyperParamsOptions: Record; metricsLoading: boolean; projectTags: string[]; @@ -60,7 +61,7 @@ export interface ExperimentsViewState { export const experimentsViewInitialState: ExperimentsViewState = { tableCols: [], colsOrder: {}, - // eslint-disable-next-line @typescript-eslint/naming-convention + hiddenTableCols: {comment: true, active_duration: true, id: true}, hiddenProjectTableCols: {}, experiments: null, @@ -112,12 +113,12 @@ const setExperimentsAndUpdateSelectedExperiments = (state: ExperimentsViewState, export const experimentsViewReducer = createReducer( experimentsViewInitialState, on(actions.setTableCols, (state, action): ExperimentsViewState => ({...state, tableCols: action.cols})), - on(actions.resetExperiments, (state): ExperimentsViewState => ({ + on(actions.resetExperiments, (state, action): ExperimentsViewState => ({ ...state, experiments: experimentsViewInitialState.experiments, selectedExperiment: experimentsViewInitialState.selectedExperiment, metricVariants: experimentsViewInitialState.metricVariants, - metricVariantsPlots: experimentsViewInitialState.metricVariantsPlots, + ...(!action.skipResetMetric && {metricVariantsPlots: experimentsViewInitialState.metricVariantsPlots}), showAllSelectedIsActive: experimentsViewInitialState.showAllSelectedIsActive, // tableMode: experimentsViewInitialState.tableMode })), @@ -249,7 +250,7 @@ export const experimentsViewReducer = createReducer( ...action.filters.reduce((obj, filter: TableFilter) => { obj[filter.col] = {value: filter.value, matchMode: filter.filterMatchMode}; return obj; - }, {} as { [columnId: string]: { value: string; matchMode: string } }) + }, {} as Record) } } })), @@ -258,7 +259,17 @@ export const experimentsViewReducer = createReducer( ...state, metricsCols: [...state.metricsCols.filter(tableCol => !(tableCol.projectId === action['projectId'])), ...action['columns']] })), - on(actions.addColumn, (state, action): ExperimentsViewState => ({...state, metricsCols: [...state.metricsCols, action.col]})), + on(actions.addColumn, (state, action): ExperimentsViewState => { + const hiddenColumns = {...state.hiddenProjectTableCols[action.col.projectId]}; + delete hiddenColumns[action.col.id]; + return { + ...state, + metricsCols: [...state.metricsCols, action.col], + hiddenProjectTableCols: { + ...state.hiddenProjectTableCols, + [action.col.projectId]: hiddenColumns + } + }}), on(actions.addSelectedMetric, (state, action): ExperimentsViewState => { const selectedMetricsKey = state.tableCompareView === 'scalars' ? 'compareSelectedMetrics' : 'compareSelectedMetricsPlots'; return { @@ -273,19 +284,20 @@ export const experimentsViewReducer = createReducer( } }), on(actions.removeCol, (state, action): ExperimentsViewState => { + const columnId = decodeURIComponentSafe(action.id); // eslint-disable-next-line @typescript-eslint/no-unused-vars - const {[action.id]: removedCol, ...remainingColsWidth} = state.projectColumnsWidth[action.projectId] || {}; + const {[columnId]: removedCol, ...remainingColsWidth} = state.projectColumnsWidth[action.projectId] || {}; return { ...state, - metricsCols: [...state.metricsCols.filter(tableCol => !(tableCol.id === action.id && tableCol.projectId === action.projectId))], + metricsCols: [...state.metricsCols.filter(tableCol => !(tableCol.id === columnId && tableCol.projectId === action.projectId))], projectColumnsSortOrder: { ...state.projectColumnsSortOrder, - [action.projectId]: state.projectColumnsSortOrder[action.projectId]?.filter(order => order.field !== action.id) || null + [action.projectId]: state.projectColumnsSortOrder[action.projectId]?.filter(order => order.field !== columnId) || null }, projectColumnsWidth: {...state.projectColumnsWidth, [action.projectId]: remainingColsWidth}, colsOrder: { ...state.colsOrder, - [action.projectId]: state.colsOrder[action.projectId] ? state.colsOrder[action.projectId].filter(colId => colId !== action.id) : null + [action.projectId]: state.colsOrder[action.projectId] ? state.colsOrder[action.projectId].filter(colId => colId !== columnId) : null } }; }), @@ -328,7 +340,7 @@ export const experimentsViewReducer = createReducer( ...state[selectedMetricsKey], [action.projectId]: { lastModified: state[selectedMetricsKey][action.projectId]?.lastModified ?? (new Date()).getTime(), - metrics: action.metrics.slice(0, 5).map(metric => createCompareMetricColumn(metric)) + metrics: action.metrics.slice(0, 8).map(metric => createCompareMetricColumn(metric, HIDDEN_PLOTS_BY_DEFAULT)) } } }), diff --git a/src/app/webapp-common/experiments/reducers/index.ts b/src/app/webapp-common/experiments/reducers/index.ts index ea6a63a8..ace0b289 100755 --- a/src/app/webapp-common/experiments/reducers/index.ts +++ b/src/app/webapp-common/experiments/reducers/index.ts @@ -21,6 +21,7 @@ import {EXPERIMENT_COMMENT} from '@common/experiments/dumb/experiment-general-in 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'; +import {Task} from '~/business-logic/model/tasks/task'; export const selectExperimentsList = createSelector(experimentsView, state => state.experiments); export const selectTableRefreshList = createSelector(experimentsView, state => !!state.refreshList); @@ -151,6 +152,8 @@ 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 selectStartPipelineDialogTask = createSelector(experimentInfo, state => state.pipelineRunDialogTask); @@ -163,12 +166,17 @@ export const selectLogLoading = createSelector(experimentOutput, (state) => stat export const selectTotalLogLines = createSelector(experimentOutput, (state) => state.totalLogLines); 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, settings => settings?.hiddenMetricsPlot ?? []); export const selectSelectedSettingsHiddenScalar = createSelector(selectSelectedExperimentSettings, settings => settings?.hiddenMetricsScalar ?? []); +export const selectSelectedSettingsTableMetric = createSelector(selectSelectedExperimentSettings, + settings => settings?.selectedMetricTable ?? null); +export const selectSelectedSettingsModelTableMetric = createSelector(selectSelectedModelSettings, + settings => settings?.selectedMetricTable ?? null); export const selectSelectedSettingsSmoothWeight = createSelector(selectSelectedExperimentSettings, settings => settings?.smoothWeight === undefined ? 0 : settings.smoothWeight); export const selectSelectedSettingsSmoothType = createSelector(selectSelectedExperimentSettings, @@ -213,6 +221,7 @@ 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 selectLastMetricsValues = createSelector(experimentOutput, (state): Task['last_metrics'] => state.lastMetrics); const selectMetricHistogram = createSelector(experimentOutput, state => state.metricsHistogramCharts); 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 2d7ba14b..73af8120 100755 --- 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 @@ -10,12 +10,12 @@ Project - + (Create New) - + Please provide a Project - Please provide a name longer than 3 characters + Name should be at least 3 characters long Please provide a different name as this project name is taken as an Example project diff --git a/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.html b/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.html index 53982af8..1c03c28d 100755 --- a/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.html +++ b/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.html @@ -30,14 +30,14 @@ minlength="3" (keydown.enter)="projectInput.control.markAsTouched()" smUniqueNameValidator - [existingNames]="readOnlyProjects$ | async"> + [existingNames]="readOnlyProjects$ | ngrxPush"> (Create New) Please provide a Project - Please provide a name longer than 3 characters + Name should be at least 3 characters long Please provide a different name as this project name is taken as an Example project @@ -77,7 +77,7 @@ Set {{reference.length > 80 ? (reference | slice:0:77) + '...' : reference }} as parent 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 95f3c1a6..e1bb3ce1 100755 --- 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 @@ -102,7 +102,7 @@ export class CloneDialogComponent implements OnInit, OnDestroy { } ngOnInit(): void { - this.searchChanged({value: this.defaultProjectId ? this.defaultProjectId : ''}); + this.searchChanged({value: this.defaultProjectId ?? ''}); this.subs.add(this.projects$.subscribe(projects => { this.loading = false; this.noMoreOptions = this.allProjectsBeforeFilter?.length === this.previousLength || this.allProjectsBeforeFilter?.length < rootProjectsPageSize; diff --git a/src/app/webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.html b/src/app/webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.html index e5079b0f..fbafa1cb 100755 --- a/src/app/webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.html +++ b/src/app/webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.html @@ -1,123 +1,188 @@ -
-
-
- - - - -
+} @else { +
+
+} + + @if (selectedDisableAvailable()[menuItems.queue]) { + @if (tableMode() || isCompare()) { + + } + -
- - -
- - - - - - - - - - - + @if (isCommunity()) { + + } + @if (isArchive()) { + + } + + @if (!selectedDisableAvailable()[menuItems.enqueue].disable && !isArchive()) { + + } + @if (!selectedDisableAvailable()[menuItems.retry].disable && !isArchive()) { + + } + @if (!selectedDisableAvailable()[menuItems.dequeue].disable) { + + } - - - + {{selectedDisableAvailable()[menuItems.abort].available | menuItemText : 'Abort' : selectedDisableAvailableIsMultiple() }} + + @if (!selectedDisableAvailable()[menuItems.abortAllChildren]?.disable) { + + }
- + } + + +
+ @if(selectedExperiments.length === 1){ + {{selectedExperiments[0]?.name}} + } @else { + {{selectedExperiments.length}} experiments + } + will be stopped and additional model updates will not be allowed. +
+ + + +
+ @if(selectedExperiments.length === 1){ + {{selectedExperiments[0]?.name}} + } @else { + {{selectedExperiments.length}} experiments + } + will be removed from the + @if (queueName) { + {{queueName}} + } + execution queue. +
+ + + +
+ @if(selectedExperiments.length === 1){ + {{selectedExperiments[0]?.name}} + } @else { + {{selectedExperiments.length}} experiments + } + status will be set to Published. +
+
+ Published experiments are read-only and cannot be reset. The experiment's output, including models will also be published so that other experiments can use it. +
+ 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 3d006b7f..6aea583a 100755 --- 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 @@ -8,7 +8,6 @@ import {TaskTypeEnum} from '~/business-logic/model/tasks/taskTypeEnum'; import {BlTasksService} from '~/business-logic/services/tasks.service'; import {CloneExperimentPayload} from '../../common-experiment-model.model'; import {ConfirmDialogComponent} from '@common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component'; -import {htmlTextShort} from '@common/shared/utils/shared-utils'; import * as commonMenuActions from '../../../actions/common-experiments-menu.actions'; import {abortAllChildren, archiveSelectedExperiments} from '../../../actions/common-experiments-menu.actions'; import {ChangeProjectDialogComponent} from '../change-project-dialog/change-project-dialog.component'; @@ -18,7 +17,7 @@ import {IExperimentInfo, ISelectedExperiment} from '~/features/experiments/share import {getQueuesForEnqueue} from '../select-queue/select-queue.actions'; import {selectQueuesList} from '../select-queue/select-queue.reducer'; import {isDevelopment} from '~/features/experiments/shared/experiments.utils'; -import {Component, EventEmitter, inject, Input, OnInit, Output} from '@angular/core'; +import {Component, computed, inject, input, output, TemplateRef, viewChild} from '@angular/core'; import {BaseContextMenuComponent} from '@common/shared/components/base-context-menu/base-context-menu.component'; import * as experimentsActions from '../../../actions/common-experiments-view.actions'; import {ShareDialogComponent} from '@common/shared/ui-components/overlay/share-dialog/share-dialog.component'; @@ -43,7 +42,8 @@ import { selectionDisabledEnqueue, selectionDisabledMoveTo, selectionDisabledPublishExperiments, - selectionDisabledReset + selectionDisabledReset, + selectionDisabledRetry } from '@common/shared/entity-page/items.utils'; import {resetOutput} from '@common/experiments/actions/common-experiment-output.actions'; import {isReadOnly} from '@common/shared/utils/is-read-only'; @@ -53,6 +53,7 @@ import { } from '@common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component'; import {headerActions} from '@common/core/actions/router.actions'; import {ConfirmDialogConfig} from '@common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.model'; +import {Task} from '~/business-logic/model/tasks/task'; @Component({ @@ -60,77 +61,49 @@ import {ConfirmDialogConfig} from '@common/shared/ui-components/overlay/confirm- templateUrl: './experiment-menu.component.html', styleUrls: ['./experiment-menu.component.scss'] }) -export class ExperimentMenuComponent extends BaseContextMenuComponent implements OnInit { - readonly icons = ICONS; - readonly taskStatusEnum = TaskStatusEnum; - readonly taskTypeEnum = TaskTypeEnum; +export class ExperimentMenuComponent extends BaseContextMenuComponent { + protected blTaskService = inject(BlTasksService); + protected dialog = inject(MatDialog); + protected router = inject(Router); + protected configService = inject(ConfigurationService); + protected route = inject(ActivatedRoute); + protected readonly icons = ICONS; + protected readonly taskStatusEnum = TaskStatusEnum; + protected readonly taskTypeEnum = TaskTypeEnum; public open: boolean; - public isExample: boolean; - public isArchive: boolean; - public selectionHasExamples: boolean; - public isCommunity: boolean; - protected _experiment: ISelectedExperiment = null; - private _selectedExperiments: IExperimentInfo[]; - - @Input() selectedExperiment: IExperimentInfo; - @Input() isSharedAndNotOwner = false; - @Input() tagsFilterByProject: boolean; - @Input() projectTags: string[]; - @Input() companyTags: string[]; - @Input() numSelected = 0; - @Input() activateFromMenuButton = true; - @Input() useCurrentEntity = false; - @Input() isCompare = false; - - @Input() set experiment(experiment: ISelectedExperiment) { - this._experiment = experiment; - this.isExample = isReadOnly(experiment); - this.isArchive = experiment?.system_tags?.includes('archived'); - } - - get experiment() { - return this._experiment; - } - - @Input() neverShowPopups; - @Input() minimizedView: boolean; - @Input() set selectedExperiments(experiments: IExperimentInfo[]) { - this._selectedExperiments = experiments; - this.selectionHasExamples = experiments && experiments.some((exp => isReadOnly(exp))); - } + selectedExperiment = input(); + isSharedAndNotOwner = input(false); + tagsFilterByProject = input(); + projectTags = input(); + companyTags = input(); + numSelected = input(0); + activateFromMenuButton = input(true); + useCurrentEntity = input(false); + isCompare = input(false); - get selectedExperiments(): IExperimentInfo[] { - return this._selectedExperiments; - } - @Output() tagSelected = new EventEmitter(); + neverShowPopups = input(); + minimizedView = input(); - protected blTaskService: BlTasksService; - protected dialog: MatDialog; - protected router: Router; - protected configService: ConfigurationService; - protected route: ActivatedRoute; - constructor() { - super(); + experiment = input.required(); + selectedExperiments = input(); - this.blTaskService = inject(BlTasksService); - this.dialog = inject(MatDialog); - this.router = inject(Router); - this.configService = inject(ConfigurationService); - this.route = inject(ActivatedRoute); - } + protected isExample = computed(() => isReadOnly(this.experiment())); + protected isArchive = computed(() => this.experiment()?.system_tags?.includes('archived')); + protected selectionHasExamples = computed(() => this.selectedExperiments()?.some((exp => isReadOnly(exp)))); + protected isCommunity = computed(() => this.configService.configuration().communityServer); - - ngOnInit(): void { - this.isCommunity = this.configService.getStaticEnvironment().communityServer; - } + tagSelected = output(); + stopTemplate = viewChild.required>('stopTemplate '); + dequeueTemplate = viewChild.required>('dequeueTemplate'); + publishTemplate = viewChild.required>('publishTemplate '); public restoreArchive(entityType?: EntityTypeEnum) { // info header case - const selectedExperiments = this.selectedExperiments ? selectionDisabledArchive(this.selectedExperiments).selectedFiltered : [this._experiment]; + const selectedExperiments = this.selectedExperiments() ? selectionDisabledArchive(this.selectedExperiments()).selectedFiltered : [this.experiment()]; if (selectedExperiments[0].system_tags?.includes('archived')) { this.store.dispatch(commonMenuActions.restoreSelectedExperiments({ @@ -166,26 +139,40 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements toggleFullScreen(showFullScreen: boolean) { if (showFullScreen) { this.store.dispatch(headerActions.setTabs({contextMenu: null})); - this.router.navigateByUrl(`projects/${this.projectId()}/experiments/${this._experiment.id}/output/execution`); + this.router.navigateByUrl(`projects/${this.projectId()}/experiments/${this.experiment().id}/output/execution`); } else { const part = this.route.firstChild.routeConfig.path; if (['log', 'metrics/scalar', 'metrics/plots', 'debugImages'].includes(part)) { - this.router.navigateByUrl(`projects/${this.projectId()}/experiments/${this._experiment.id}/info-output/${part}`); + this.router.navigateByUrl(`projects/${this.projectId()}/experiments/${this.experiment().id}/info-output/${part}`); } else { - this.router.navigateByUrl(`projects/${this.projectId()}/experiments/${this._experiment.id}/${part}`); + this.router.navigateByUrl(`projects/${this.projectId()}/experiments/${this.experiment().id}/${part}`); } } } enqueuePopup() { - const selectedExperiments = !(this.activateFromMenuButton || this.useCurrentEntity) ? - selectionDisabledEnqueue(this.selectedExperiments).selectedFiltered : - [this._experiment]; + const selectedExperiments = !(this.activateFromMenuButton() || this.useCurrentEntity()) ? + selectionDisabledEnqueue(this.selectedExperiments()).selectedFiltered : + [this.experiment()]; + this.openEnqueuePopup(selectedExperiments); + } + + retryPopup() { + const selectedExperiments = !(this.activateFromMenuButton() || this.useCurrentEntity()) ? + selectionDisabledRetry(this.selectedExperiments()).selectedFiltered : + [this.experiment()]; + this.openEnqueuePopup(selectedExperiments, true); + } + private openEnqueuePopup(selectedExperiments: ISelectedExperiment[], retryMode?: boolean) { const selectQueueDialog: MatDialogRef = this.dialog.open(SelectQueueComponent, { autoFocus: 'dialog', - data: {taskIds: selectedExperiments.map(exp => exp.id), reference: selectedExperiments[0].name} + data: { + taskIds: selectedExperiments.map(exp => exp.id), + reference: selectedExperiments[0].name, + retryMode + } }); selectQueueDialog.afterClosed().subscribe(res => { @@ -197,13 +184,13 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements } dequeuePopup() { - const selectedExperiments = this.selectedExperiments ? selectionDisabledDequeue(this.selectedExperiments).selectedFiltered : [this._experiment]; - const getBody = (queueName: string) => `${selectedExperiments.length === 1 ? htmlTextShort(selectedExperiments[0].name) : selectedExperiments.length + 'experiments'} will be removed from the ${queueName ? '' + queueName + ' ' : ''}execution queue.`; + const selectedExperiments = this.selectedExperiments() ? selectionDisabledDequeue(this.selectedExperiments()).selectedFiltered : [this.experiment()]; this.store.dispatch(getQueuesForEnqueue()); - const confirmDialogRef = this.dialog.open(ConfirmDialogComponent, { + const confirmDialogRef = this.dialog.open, boolean>(ConfirmDialogComponent, { data: { title: 'Dequeue Experiment', - body: getBody(null), + template: this.dequeueTemplate(), + templateContext: {$implicit: selectedExperiments}, yes: 'Dequeue', no: 'Cancel', iconClass: 'i-alert', @@ -217,9 +204,9 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements this.store.select(selectQueuesList) .pipe(filter(qs => !!qs), take(2)) .subscribe((queues: Queue[]) => { - const queue = queues.find(q => q.entries.some(entry => (entry.task as any).id === this._experiment.id)); + const queue = queues.find(q => q.entries.some(entry => (entry.task as Task).id === this.experiment().id)); if (confirmDialogRef.componentInstance && queue) { - confirmDialogRef.componentInstance.body = getBody(queue.name); + confirmDialogRef.componentInstance.templateContext = {$implicit: selectedExperiments, queueName: queue.name}; } }); @@ -238,18 +225,18 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements } public enqueueDequeueDisabled() { - return !(this.blTaskService.canEnqueue(this._experiment as any) || this.blTaskService.canDequeue(this._experiment as any)); + return !(this.blTaskService.canEnqueue(this.experiment()) || this.blTaskService.canDequeue(this.experiment())); } public resetPopup() { - const selectedExperiments = (!(this.activateFromMenuButton || this.useCurrentEntity) && this.selectedExperiments) ? selectionDisabledReset(this.selectedExperiments).selectedFiltered : [this._experiment]; + const selectedExperiments = (!(this.activateFromMenuButton() || this.useCurrentEntity()) && this.selectedExperiments()) ? selectionDisabledReset(this.selectedExperiments()).selectedFiltered : [this.experiment()]; const devWarning: boolean = selectedExperiments.some(exp => isDevelopment(exp)); const confirmDialogRef = this.dialog.open(CommonDeleteDialogComponent, { data: { - entity: selectedExperiments?.length > 0 ? selectedExperiments?.length === 1 ? selectedExperiments[0] : selectedExperiments : this._experiment, - numSelected: selectedExperiments?.length ?? this.numSelected, + entity: selectedExperiments?.length > 0 ? selectedExperiments?.length === 1 ? selectedExperiments[0] : selectedExperiments : this.experiment(), + numSelected: selectedExperiments?.length ?? this.numSelected(), entityType: EntityTypeEnum.experiment, - useCurrentEntity: this.activateFromMenuButton || this.useCurrentEntity, + useCurrentEntity: this.activateFromMenuButton() || this.useCurrentEntity(), resetMode: true, devWarning }, @@ -258,61 +245,48 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements confirmDialogRef.afterClosed().subscribe((confirmed) => { if (confirmed) { this.store.dispatch(resetOutput()); - if (this.activateFromMenuButton || !this.tableMode && this.selectedExperiments.some(exp => exp.id === this._experiment.id)) { + if (this.activateFromMenuButton() || !this.tableMode() && this.selectedExperiments().some(exp => exp.id === this.experiment().id)) { this.store.dispatch(resetDebugImages()); - this.store.dispatch(autoRefreshExperimentInfo({id: this._experiment.id})); + this.store.dispatch(autoRefreshExperimentInfo({id: this.experiment().id})); } this.store.dispatch(deactivateEdit()); } }); } - // private resetExperiment(selectedExperiments) { - // this.store.dispatch(commonMenuActions.resetClicked({selectedEntities: selectedExperiments})); - // } - public stopPopup() { - const selectedExperiments = this.selectedExperiments ? selectionDisabledAbort(this.selectedExperiments).selectedFiltered : [this._experiment]; + const selectedExperiments = this.selectedExperiments() ? selectionDisabledAbort(this.selectedExperiments()).selectedFiltered : [this.experiment()]; - const confirmDialogRef = this.dialog.open(ConfirmDialogComponent, { + this.dialog.open, boolean>(ConfirmDialogComponent, { data: { title: 'ABORT', - body: `${selectedExperiments.length === 1 ? htmlTextShort(selectedExperiments[0]?.name || '') : selectedExperiments.length + ' experiments'} - will be stopped and additional model updates will not be allowed.
- `, + template: this.stopTemplate(), + templateContext: {$implicit: selectedExperiments}, yes: 'Abort', no: 'Cancel', iconClass: 'al-icon al-ico-abort al-color', } - }); - confirmDialogRef.afterClosed().subscribe((confirmed) => { - if (confirmed) { - this.stopExperiment(selectedExperiments); - } - }); - } - - stopExperiment(selectedExperiments) { - this.store.dispatch(commonMenuActions.stopClicked({selectedEntities: selectedExperiments})); + }).afterClosed() + .subscribe((confirmed) => { + if (confirmed) { + this.store.dispatch(commonMenuActions.stopClicked({selectedEntities: selectedExperiments})); + } + }); } - public publishPopup() { - const selectedExperiments = this.selectedExperiments ? selectionDisabledPublishExperiments(this.selectedExperiments).selectedFiltered : [this._experiment]; - const publishPopupBody = `${selectedExperiments.length === 1 ? htmlTextShort(selectedExperiments[0]?.name || '') : selectedExperiments.length + ' experiments'} - status will be set to Published.

- Published experiments are read-only and cannot be reset. The experiment's output, including models will also be published so that other experiments can use it.`; + const selectedExperiments = this.selectedExperiments() ? selectionDisabledPublishExperiments(this.selectedExperiments()).selectedFiltered : [this.experiment()]; - const confirmDialogRef = this.dialog.open(ConfirmDialogComponent, { + this.dialog.open, boolean>(ConfirmDialogComponent, { data: { title: 'PUBLISH EXPERIMENTS', - body: publishPopupBody, + template: this.publishTemplate(), + templateContext: {$implicit: selectedExperiments}, yes: 'Publish', no: 'Cancel', iconClass: 'd-block fas fa-cloud-upload-alt fa-7x w-auto', } - }); - confirmDialogRef.afterClosed().subscribe((confirmed) => { + }).afterClosed().subscribe((confirmed) => { if (confirmed) { this.publishExperiment(selectedExperiments); } @@ -327,20 +301,20 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements this.dialog.open(ShareDialogComponent, { data: { title: 'SHARE EXPERIMENT PUBLICLY', - link: `${window.location.origin}/projects/${this._experiment.project.id}/experiments/${this._experiment.id}/output/execution`, - alreadyShared: this._experiment?.system_tags.includes('shared'), - task: this._experiment?.id + link: `${window.location.origin}/projects/${this.experiment().project.id}/experiments/${this.experiment().id}/output/execution`, + alreadyShared: this.experiment()?.system_tags.includes('shared'), + task: this.experiment()?.id } }); } public moveToProjectPopup() { - const selectedExperiments = this.selectedExperiments ? selectionDisabledMoveTo(this.selectedExperiments).selectedFiltered : [this._experiment]; + const selectedExperiments = this.selectedExperiments() ? selectionDisabledMoveTo(this.selectedExperiments()).selectedFiltered : [this.experiment()]; const currentProjects = Array.from(new Set(selectedExperiments.map(exp => exp.project?.id).filter(p => p))); const dialog = this.dialog.open(ChangeProjectDialogComponent, { data: { currentProjects: currentProjects.length > 0 ? currentProjects : [this.projectId()], - defaultProject: this._experiment?.project, + defaultProject: this.experiment()?.project, reference: selectedExperiments.length > 1 ? selectedExperiments : selectedExperiments[0]?.name, type: 'experiment' } @@ -358,19 +332,19 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements } viewWorkerClicked() { - this.router.navigateByUrl('/workers-and-queues/workers'); + this.store.dispatch(commonMenuActions.navigateToWorker({experimentId: this.experiment()?.id})); } manageQueueClicked() { - this.store.dispatch(commonMenuActions.navigateToQueue({experimentId: this._experiment?.id})); + this.store.dispatch(commonMenuActions.navigateToQueue({experimentId: this.experiment()?.id})); } clonePopup() { this.dialog.open(CloneDialogComponent, { data: { type: 'Experiment', - defaultProject: this._experiment?.project?.id, - defaultName: this._experiment.name + defaultProject: this.isExample() ? '' : this.experiment()?.project?.id, + defaultName: this.experiment().name } }).afterClosed().pipe( take(1), @@ -383,7 +357,7 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements cloneExperiment(cloneData: CloneExperimentPayload) { const project = cloneData.project as IOption; this.store.dispatch(commonMenuActions.cloneExperimentClicked({ - originExperiment: this._experiment, + originExperiment: this.experiment(), cloneData: { ...cloneData, project: project, @@ -393,13 +367,13 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements } deleteExperimentPopup(entityType?: EntityTypeEnum, includeChildren?: boolean) { - const selectedExperiments = (!(this.activateFromMenuButton || this.useCurrentEntity) && this.selectedExperiments) ? selectionDisabledDelete(this.selectedExperiments).selectedFiltered : [this._experiment]; + const selectedExperiments = (!(this.activateFromMenuButton() || this.useCurrentEntity()) && this.selectedExperiments()) ? selectionDisabledDelete(this.selectedExperiments()).selectedFiltered : [this.experiment()]; const confirmDialogRef = this.dialog.open(CommonDeleteDialogComponent, { data: { - entity: selectedExperiments?.length > 0 ? selectedExperiments?.length === 1 ? selectedExperiments[0] : selectedExperiments : this._experiment, - numSelected: selectedExperiments?.length ?? this.numSelected, + entity: selectedExperiments?.length > 0 ? selectedExperiments?.length === 1 ? selectedExperiments[0] : selectedExperiments : this.experiment(), + numSelected: selectedExperiments?.length ?? this.numSelected(), entityType: entityType || EntityTypeEnum.experiment, - useCurrentEntity: this.activateFromMenuButton || this.useCurrentEntity, + useCurrentEntity: this.activateFromMenuButton() || this.useCurrentEntity(), includeChildren }, @@ -412,13 +386,16 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements this.store.dispatch(experimentsActions.getExperiments()); this.store.dispatch(deactivateEdit()); - if (this.activateFromMenuButton || this.selectedExperiments.map(e => e.id).includes(this.selectedExperiment?.id)) { + if (this.activateFromMenuButton() || this.selectedExperiments().map(e => e.id).includes(this.selectedExperiment()?.id)) { const entityBaseRoute = { [EntityTypeEnum.experiment]: 'projects', [EntityTypeEnum.dataset]: 'datasets/simple', [EntityTypeEnum.controller]: 'pipelines' }; - window.setTimeout(() => this.router.navigate([`${entityBaseRoute[entityType] || 'projects'}/${this.projectId()}/experiments`], {queryParamsHandling: 'preserve'})); + window.setTimeout(() => this.router.navigate([entityBaseRoute[entityType] || 'projects', this.projectId(), 'experiments'], {queryParamsHandling: 'preserve'})); + } + if (this.isCompare()) { + window.setTimeout(() => this.router.navigate([{ids: []}], {queryParamsHandling: 'preserve', relativeTo: this.route.firstChild})); } } }); @@ -447,14 +424,14 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements } stopAllChildrenPopup() { - const selectedExperiments = this.selectedExperiments ? selectionDisabledAbortAllChildren(this.selectedExperiments).selectedFiltered : [this._experiment]; + const selectedExperiments = this.selectedExperiments() ? selectionDisabledAbortAllChildren(this.selectedExperiments()).selectedFiltered : [this.experiment()]; this.store.dispatch(abortAllChildren({experiments: selectedExperiments})); } toggleDetails() { this.store.dispatch(experimentsActions.setTableMode({mode: 'info'})); this.store.dispatch(experimentsActions.experimentSelectionChanged({ - experiment: this._experiment, + experiment: this.experiment(), project: this.projectId() })); } 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 45efca8a..be368033 100755 --- 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 @@ -1,19 +1,28 @@
-

- {{reference.length > 80 ? (reference | slice:0:77) + '...' : reference }} - will be scheduled for execution through the selected queue. -

+ @if (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.
+ } @else { + will be scheduled for execution through the selected queue. + } +

+ } -

- Note: Some experiments seems to not contain any executable code. -
If enqueued to run, they might produce no results. -

+ @if (enqueueWarning$ | ngrxPush) { +

+ Note: Some experiments seems to not contain any executable code. +
If enqueued to run, they might produce no results. +

+ } @@ -33,34 +42,41 @@ [displayWith]="displayFn" #auto="matAutocomplete" > - "{{displayFn(queueControl.value)}}"(Create New) - - {{part[0]}}{{part[1]}} - + @if ((userAllowedToCreateQueue$ | ngrxPush) && queueControl.value && !(displayFn(queueControl.value) | stringIncludedInArray: queuesNames)) { + "{{ displayFn(queueControl.value) }}"(Create New) + } + @for (option of filteredOptions$ | ngrxPush; track option.id) { + + @for (part of (text.value ? split(option.name, text.value) : [[option.name, text.value]]); track part; let last = $last) { + {{ part[0] }}@if (!last) { + {{ part[1] }} + } + } + + } - - Please provide a value - + @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.scss b/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.component.scss index e2ff2eb6..ced5c848 100755 --- a/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.component.scss +++ b/src/app/webapp-common/experiments/shared/components/select-queue/select-queue.component.scss @@ -5,7 +5,6 @@ max-width: 640px; p { - text-align: center; font-size: 14px; color: $blue-450; overflow-wrap: break-word; @@ -26,13 +25,9 @@ } .enqueue-warning { - opacity: 0; - height: 0; - &.show { - height: auto; - transition: opacity 1s; - opacity: 1; - } + height: auto; + transition: opacity 1s; + opacity: 1; } } 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 2d796a48..28968330 100755 --- 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 @@ -45,6 +45,7 @@ export class SelectQueueComponent implements OnInit, OnDestroy { @Inject(MAT_DIALOG_DATA) public data: { taskIds?: string[]; reference?: string; + retryMode?: boolean; } ) { this.store.dispatch(getQueuesForEnqueue()); 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 afd33529..9c88a9c0 100755 --- 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 @@ -19,6 +19,7 @@ import { import { ShowTooltipIfEllipsisDirective } from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; +import {PushPipe} from '@ngrx/component'; @NgModule({ imports: [ @@ -36,6 +37,7 @@ import { TooltipDirective, RequiredAutocompleteSelectionValidatorDirective, ShowTooltipIfEllipsisDirective, + PushPipe, ], providers : [], declarations : [SelectQueueComponent], 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 ffc7732c..a41dc21c 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 @@ -6,6 +6,7 @@ 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'; +import {PushPipe} from '@ngrx/component'; @@ -17,7 +18,8 @@ import {SaferPipe} from '@common/shared/pipes/safe.pipe'; MatProgressSpinnerModule, ScrollingModule, ExperimentSharedModule, - SaferPipe + SaferPipe, + PushPipe ] }) export class ExperimentOutputLogModule { } diff --git a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.html b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.html index fd842f4a..2292caab 100644 --- a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.html +++ b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.html @@ -3,10 +3,11 @@ {{activeWorkspace.name}} } - @for (breadcrumbGroup of breadcrumbs() ; track breadcrumbGroup; let lastGroup = $last; let + + @for (breadcrumbGroup of breadcrumbs() ; track $index; let lastGroup = $last; let firstGroup = $first) { @if (!(shouldCollapse && breadcrumbGroup?.length > 0 && breadcrumbGroup?.[0]?.collapsable)) { - @for (breadcrumb of breadcrumbGroup ; track breadcrumb; let lastCrumb = $last; let firstCrumb = $first) { + @for (breadcrumb of breadcrumbGroup ; track (breadcrumb.name+breadcrumb.url); let index= $index; let lastCrumb = $last; let firstCrumb = $first) { @if (breadcrumb.hidden) { @@ -16,6 +17,9 @@ [class.first]="firstCrumb && firstGroup" [routerLink]="breadcrumb.url"> {{breadcrumb.name}} + @if (breadcrumb.badge) { + {{breadcrumb.badge}} + } } @else {
} + @if (breadcrumb.badge) { + {{breadcrumb.badge}} + }
} diff --git a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.scss b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.scss index d9699673..516e57e7 100644 --- a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.scss +++ b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.scss @@ -234,3 +234,14 @@ span { color: #8491c2; font-size: 20px; } + + +.badge { + margin-left: 12px; + background-color: $purple; + color: white; + padding: 0 6px; + border-radius: 4px; + font-size: 11px; + text-transform: none; +} diff --git a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.ts b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.ts index 1d9b4b7e..55a3cf46 100644 --- a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.ts +++ b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.ts @@ -30,7 +30,6 @@ import { } from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; import {ClipboardModule} from 'ngx-clipboard'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; -import {BreadcrumbsService} from '@common/shared/services/breadcrumbs.service'; import {TagListComponent} from '@common/shared/ui-components/tags/tag-list/tag-list.component'; import {cloneItemIntoDummy} from '@common/shared/utils/shared-utils'; import {IdBadgeComponent} from '@common/shared/components/id-badge/id-badge.component'; @@ -55,6 +54,8 @@ export interface IBreadcrumbsLink { example?: boolean; id?: string; tags?: string[]; + badge?: string; + badgeTooltip?: string; onlyWithProject?: boolean; } @@ -94,9 +95,8 @@ export class BreadcrumbsComponent { public route = inject(ActivatedRoute); private configService = inject(ConfigurationService); private cd = inject(ChangeDetectorRef); - private breadcrumbsService = inject(BreadcrumbsService); // don't delete public currentUrl: string; - public showShareButton: boolean = false; + public showShareButton = false; public subProjectsMenuIsOpen: boolean; @Input() activeWorkspace: GetCurrentUserResponseUserObjectCompany; diff --git a/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs-config.types.ts b/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs-config.types.ts index 2f035140..8ab391f7 100644 --- a/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs-config.types.ts +++ b/src/app/webapp-common/layout/header-navbar-tabs/header-navbar-tabs-config.types.ts @@ -1,6 +1,8 @@ export interface HeaderNavbarTabConfig { header: string; subHeader: string; + badge?: string; + badgeTooltip?: string; permissionCheck?: string; link?: string | string[]; isActive: boolean; 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 4c3c2e22..df2ad2d8 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 @@ -8,6 +8,8 @@ [active]="route.isActive" [routerLink] = "route.link" [subHeader]="archivedMode() && route.subHeader" + [badge]="route.badge" + [badgeTooltip]="route.badgeTooltip" (click)="setFeature(route.featureName ?? route.header)" > } diff --git a/src/app/webapp-common/layout/header/header.component.html b/src/app/webapp-common/layout/header/header.component.html index 17be3b12..33b04ea3 100644 --- a/src/app/webapp-common/layout/header/header.component.html +++ b/src/app/webapp-common/layout/header/header.component.html @@ -1,4 +1,4 @@ -
+
Online Documentation @if (tipsService.hasTips()) { - } + @if (isAdmin() && !environment().communityServer && changesService.hasChanges()) { + + } @if (environment()?.appsYouTubeIntroVideoId && $any(environment()).appAwarenessMenu !== false) { +
+ diff --git a/src/app/webapp-common/layout/version-chnages-modal/version-changes-modal.component.scss b/src/app/webapp-common/layout/version-chnages-modal/version-changes-modal.component.scss new file mode 100644 index 00000000..38287956 --- /dev/null +++ b/src/app/webapp-common/layout/version-chnages-modal/version-changes-modal.component.scss @@ -0,0 +1,44 @@ +@import "variables"; + +:host { + .tip-container { + display: flex; + justify-content: space-between; + gap: 24px; + } + + .tip-image { + width: 376px; + flex: 0 0 376px; + height: 235px; + background-repeat: no-repeat; + box-shadow: 0 0 0 1px white, 0 0 0 2px $blue-400; + background-size: cover; + + &.full-width { + flex: 1 1 376px; + } + } + + .footer { + display: flex; + justify-content: center; + align-items: center; + margin-top: 32px; + } + + .tip-page { + flex: 3px; + text-align: right; + } + + .content-title { + font-size: 16px; + font-weight: 500; + color: $purple; + } + + .tip-content { + width: 100%; + } +} diff --git a/src/app/webapp-common/layout/version-chnages-modal/version-changes-modal.component.ts b/src/app/webapp-common/layout/version-chnages-modal/version-changes-modal.component.ts new file mode 100644 index 00000000..ffcb379b --- /dev/null +++ b/src/app/webapp-common/layout/version-chnages-modal/version-changes-modal.component.ts @@ -0,0 +1,70 @@ +import {ChangeDetectionStrategy, Component, Inject, signal} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {Store} from '@ngrx/store'; +import {addMessage} from '../../core/actions/layout.actions'; +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'; + +export interface ChangesModalData { + changes: Change[]; + visitedIndex: number; + mainTitle?: string; +} + + +@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 + ], + standalone: true +}) +export class VersionChangesModalComponent { + public changes = signal(this.data.changes); + private visitedIndex = signal(0); + public mainTitle = signal(this.data.mainTitle); + public changeIndex = signal(0); + neverShowAgain: boolean; + + constructor(public matDialogRef: MatDialogRef, private store: Store, + @Inject(MAT_DIALOG_DATA) public data: ChangesModalData) { + this.visitedIndex.set(data.visitedIndex % this.changes().length); + this.changeIndex.set(this.visitedIndex()); + this.saveIndexInLocalstorage(); + this.matDialogRef.beforeClosed().subscribe(res => this.neverShowAgain && !res ? this.matDialogRef.close(this.neverShowAgain) : false); + } + + copyToClipboardSuccess() { + this.store.dispatch(addMessage(MESSAGES_SEVERITY.SUCCESS, 'URL copied successfully')); + } + + prev() { + this.changeIndex.set((this.changes().length + this.changeIndex() - 1) % this.changes().length); + } + + next() { + this.changeIndex.set((this.changeIndex() + 1) % this.changes().length); + this.saveIndexInLocalstorage(); + } + + private saveIndexInLocalstorage() { + if (this.visitedIndex() <= this.changeIndex()) { + this.visitedIndex.set(this.changeIndex() + 1); + // window.localStorage.setItem('tipVisitedIndex', `${this.visitedIndex()}`); + } + } +} diff --git a/src/app/webapp-common/login/login/login.component.html b/src/app/webapp-common/login/login/login.component.html index c97ce3b9..fd42d6d1 100644 --- a/src/app/webapp-common/login/login/login.component.html +++ b/src/app/webapp-common/login/login/login.component.html @@ -53,7 +53,7 @@ } - @for (option of filteredOptions | async; track option.name) { + @for (option of filteredOptions | ngrxPush; track option.name) { {{option.name}} @@ -62,7 +62,7 @@ @if (touLink() && !hideTou()) {
- By signing up you agree to Allegro AI’s Privacy Policy and Terms of Use. + By signing up you agree to ClearML’s Privacy Policy and Terms of Use.
} diff --git a/src/app/webapp-common/login/login/login.component.ts b/src/app/webapp-common/login/login/login.component.ts index c00322b2..485ea5f2 100644 --- a/src/app/webapp-common/login/login/login.component.ts +++ b/src/app/webapp-common/login/login/login.component.ts @@ -10,8 +10,8 @@ import { import {NgForm} from '@angular/forms'; import {ActivatedRoute, Params, Router} from '@angular/router'; import {Store} from '@ngrx/store'; -import {EMPTY, Observable, of, Subscription} from 'rxjs'; -import {finalize, map, startWith, take, filter, mergeMap, catchError, switchMap} from 'rxjs/operators'; +import {EMPTY, Observable, Subscription} from 'rxjs'; +import {finalize, map, startWith, take, filter, mergeMap, catchError, switchMap, tap} from 'rxjs/operators'; import {fetchCurrentUser, setPreferences} from '../../core/actions/users.actions'; import {LoginMode, loginModes} from '../../shared/services/login.service'; import {selectInviteId} from '../login-reducer'; @@ -23,6 +23,7 @@ import {UserPreferences} from '../../user-preferences'; import {setBreadcrumbs} from '@common/core/actions/router.actions'; import {CrumbTypeEnum} from '@common/layout/breadcrumbs/breadcrumbs.component'; import {selectCurrentUser} from '@common/core/reducers/users-reducer'; +import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; @Component({ @@ -79,6 +80,16 @@ export class LoginComponent implements OnInit, OnDestroy { effect(() => { this.nameInput()?.nativeElement.focus(); }); + + this.store.select(selectCurrentUser) + .pipe( + takeUntilDestroyed(), + filter(user => !!user), + ) + .subscribe(() => { + this.openLoginNotice(); + this.router.navigateByUrl(this.getNavigateUrl()); + }); } get buttonCaption() { @@ -91,12 +102,7 @@ export class LoginComponent implements OnInit, OnDestroy { name: 'Login', type: CrumbTypeEnum.Feature }]]})); - this.store.select(selectCurrentUser) - .pipe( - filter(user => !!user), - take(1) - ) - .subscribe(() => this.router.navigateByUrl(this.getNavigateUrl())); + this.store.select(selectInviteId).pipe( filter(invite => !!invite), take(1), @@ -212,25 +218,16 @@ export class LoginComponent implements OnInit, OnDestroy { } private afterLogin() { + return this.userPreferences.loadPreferences() .pipe( take(1), - catchError(() => this.router.navigateByUrl(this.getNavigateUrl())), - finalize( () => { - this.store.dispatch(fetchCurrentUser()); - this.cdr.detectChanges(); + catchError(() => { + return this.router.navigateByUrl(this.getNavigateUrl()); }), - switchMap(res => { - this.store.dispatch(setPreferences({payload: res})); - this.openLoginNotice(); - return of(this.router.navigateByUrl(this.getNavigateUrl())); - }) + map(res => this.store.dispatch(setPreferences({payload: res}))), + tap(() => this.store.dispatch(fetchCurrentUser())), ); - // .subscribe(res => { - // this.store.dispatch(setPreferences({payload: res})); - // this.router.navigateByUrl(this.getNavigateUrl()); - // this.openLoginNotice(); - // }); } private _filter(value: string): string[] { diff --git a/src/app/webapp-common/models/containers/model-experiments-table/model-experiments-table.component.html b/src/app/webapp-common/models/containers/model-experiments-table/model-experiments-table.component.html index 4c41c2c1..42e0c9ae 100644 --- a/src/app/webapp-common/models/containers/model-experiments-table/model-experiments-table.component.html +++ b/src/app/webapp-common/models/containers/model-experiments-table/model-experiments-table.component.html @@ -10,30 +10,30 @@

USED BY

autocomplete="off" smClickStopPropagation placeholder="Search for experiments" - [ngModel]="(searchTerm$ | async)?.query" + [ngModel]="(searchTerm$ | ngrxPush)?.query" (input)="searchTermChanged(searchExperiments.value)" >
; public experiments$: Observable; public tableFilters$: Observable<{ [columnId: string]: FilterMetadata }>; public tags$: Observable; @@ -97,7 +95,6 @@ export class ModelExperimentsTableComponent implements OnInit, OnDestroy { this.resizedCols$.next(this._resizedCols); this.experiments$ = this.store.select(selectExperimentsList); this.searchTerm$ = this.store.select(selectGlobalFilter); - this.columns$ = this.store.select(selectExperimentsTableCols); this.selectSplitSize$ = this.store.select(selectSplitSize); this.tableFilters$ = this.store.select(selectTableFilters) @@ -134,14 +131,14 @@ export class ModelExperimentsTableComponent implements OnInit, OnDestroy { ngOnDestroy(): void { this.paramsSubscription.unsubscribe(); - this.store.dispatch(resetExperiments()); + this.store.dispatch(resetExperiments({})); this.store.dispatch(resetGlobalFilter()); } - experimentsSelectionChanged(tasks) { - const projectId = tasks?.[0]?.project?.id ? tasks?.[0]?.project?.id : '*'; - window.open('projects/' + projectId + '/experiments/' + tasks?.[0]?.id); + experimentSelectionChanged({experiment}) { + const projectId = experiment?.project?.id ? experiment?.project?.id : '*'; + window.open('projects/' + projectId + '/experiments/' + experiment?.id); } getNextExperiments() { diff --git a/src/app/webapp-common/models/containers/model-info-experiments/model-info-experiments.component.html b/src/app/webapp-common/models/containers/model-info-experiments/model-info-experiments.component.html index d8050924..da8e9e72 100644 --- a/src/app/webapp-common/models/containers/model-info-experiments/model-info-experiments.component.html +++ b/src/app/webapp-common/models/containers/model-info-experiments/model-info-experiments.component.html @@ -1,8 +1,8 @@

CREATED BY

{{(selectedModel$ | async)?.task?.name}} - {{(selectedModel$ | ngrxPush)?.task?.name}} +
diff --git a/src/app/webapp-common/models/containers/model-info-general/model-info-general.component.html b/src/app/webapp-common/models/containers/model-info-general/model-info-general.component.html index 1d5ded93..206964b6 100755 --- a/src/app/webapp-common/models/containers/model-info-general/model-info-general.component.html +++ b/src/app/webapp-common/models/containers/model-info-general/model-info-general.component.html @@ -1,6 +1,5 @@ diff --git a/src/app/webapp-common/models/containers/model-info-general/model-info-general.component.ts b/src/app/webapp-common/models/containers/model-info-general/model-info-general.component.ts index 3c790821..14534e0c 100755 --- a/src/app/webapp-common/models/containers/model-info-general/model-info-general.component.ts +++ b/src/app/webapp-common/models/containers/model-info-general/model-info-general.component.ts @@ -20,18 +20,7 @@ export class ModelInfoGeneralComponent implements OnDestroy, OnInit{ public isExample: boolean; private selectedModelSubscription: Subscription; - constructor(private store: Store, private adminService: AdminService, private cdr: ChangeDetectorRef, - ) { - - } - - showModel(model) { - this.store.dispatch(resetDontShowAgainForBucketEndpoint()); - const modelSignedUri = this.adminService.signUrlIfNeeded(model.uri); - if (modelSignedUri) { - window.open(createModelLink(model.uri, model.id, modelSignedUri)); - } - } + constructor(private store: Store) {} commentChanged(comment) { this.store.dispatch(updateModelDetails({id: this.selectedModel.id, changes: {comment}})); @@ -47,7 +36,6 @@ export class ModelInfoGeneralComponent implements OnDestroy, OnInit{ .subscribe(model => { this.isExample = isExample(model); this.selectedModel = model; - // this.cdr.detectChanges(); }); } diff --git a/src/app/webapp-common/models/containers/model-info-labels/model-info-labels.component.html b/src/app/webapp-common/models/containers/model-info-labels/model-info-labels.component.html index 576e2909..cdffd882 100755 --- a/src/app/webapp-common/models/containers/model-info-labels/model-info-labels.component.html +++ b/src/app/webapp-common/models/containers/model-info-labels/model-info-labels.component.html @@ -1,7 +1,7 @@ + [editable]="(selectedModel$ | ngrxPush)?.company?.id && ((isSharedAndNotOwner$ |ngrxPush)===false)" + [saving]="saving$ | ngrxPush" + [disableSave]="metadataForm.invalid" + (cancelClicked)="cancelModelMetaDataChange()" + (saveClicked)="saveFormData()" + (activateEditClicked)="activateEditChanged('metadata')"> -
+
-
- - - - Required - - Key must be unique. - - - - - - Required - - - - - - -
+ > + @for (metadataItem of metadata ; track metadataItem.id) { +
+ + + @if (metadataItemKey.touched && metadataItemKey.invalid && metadataItemKey?.errors?.required) { + + Required + + } + @if (metadataForm?.errors?.uniqueName2 && metadataForm?.errors?.uniqueName2[$index]) { + Key must be unique. + + } + + + + @if (metadataItemType.touched && metadataItemType.invalid && metadataItemType?.errors?.required) { + + Required + + } + + + + + +
+ } - -
+ class="al-icon al-color blue-400 sm al-ico-plus d-flex align-items-center"> + + +
+@if (!inEdit && (saving$ | ngrxPush)===false) { + > {{row?.[col.id]}} +} diff --git a/src/app/webapp-common/models/containers/model-info-metadata/model-info-metadata.component.ts b/src/app/webapp-common/models/containers/model-info-metadata/model-info-metadata.component.ts index 17233eef..ab0e4870 100644 --- a/src/app/webapp-common/models/containers/model-info-metadata/model-info-metadata.component.ts +++ b/src/app/webapp-common/models/containers/model-info-metadata/model-info-metadata.component.ts @@ -8,6 +8,18 @@ import {activateModelEdit, cancelModelEdit, saveMetaData} from '../../actions/mo import {cloneDeep, toInteger} from 'lodash-es'; import {trackById} from '@common/shared/utils/forms-track-by'; import {filter, map} from 'rxjs/operators'; +import {EditableSectionComponent} from '@common/shared/ui-components/panel/editable-section/editable-section.component'; +import {SectionHeaderComponent} from '@common/shared/components/section-header/section-header.component'; +import {FormsModule} from '@angular/forms'; +import {MatFormFieldModule} from '@angular/material/form-field'; +import {PushPipe} from '@ngrx/component'; +import {UuidPipe} from '@common/shared/pipes/uuid.pipe'; +import {TableComponent} from '@common/shared/ui-components/data/table/table.component'; +import {PrimeTemplate} from 'primeng/api'; +import {MatInput} from '@angular/material/input'; +import { + UniqueInListSync2ValidatorDirective +} from '@common/shared/ui-components/template-forms-ui/unique-in-list-sync-validator-2.directive'; export interface IModelMetadataMap { [key: string]: IModelMetadataItem; @@ -24,7 +36,20 @@ export interface IModelMetadataItem { selector: 'sm-model-info-metadata', templateUrl: './model-info-metadata.component.html', styleUrls: ['./model-info-metadata.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [ + EditableSectionComponent, + SectionHeaderComponent, + MatFormFieldModule, + MatInput, + PushPipe, + UuidPipe, + TableComponent, + PrimeTemplate, + UniqueInListSync2ValidatorDirective, + FormsModule + ] }) export class ModelInfoMetadataComponent implements OnInit, OnDestroy { public selectedModel$: Observable; diff --git a/src/app/webapp-common/models/containers/model-info-network/model-info-network.component.html b/src/app/webapp-common/models/containers/model-info-network/model-info-network.component.html index c2a3b7c5..105f3f94 100755 --- a/src/app/webapp-common/models/containers/model-info-network/model-info-network.component.html +++ b/src/app/webapp-common/models/containers/model-info-network/model-info-network.component.html @@ -1,7 +1,7 @@
- + @if (((routerConfig$ | async).includes('scalars') && minimized) || !minimized) { + + } - - - - - - + @if (((routerConfig$ | async).includes('scalars') && minimized) || !minimized) { + +
+ @if ((routerConfig$ | async).includes('scalars')) { +
+ +
+ } + @if ((metricValuesView$ | async) === false && (routerConfig$ | async).includes('scalars') && minimized) { + + + } +
+ @if (!minimized) { + + + } + + }
-
diff --git a/src/app/webapp-common/models/containers/model-info/model-info.component.scss b/src/app/webapp-common/models/containers/model-info/model-info.component.scss index 6224f4d9..90ca44e7 100755 --- a/src/app/webapp-common/models/containers/model-info/model-info.component.scss +++ b/src/app/webapp-common/models/containers/model-info/model-info.component.scss @@ -29,10 +29,8 @@ .tab-nav { display: grid; - grid-template-columns: 200px 1fr 200px; - align-items: center; + grid-template-columns: 110px 1fr 110px; border-bottom: 1px solid #efefef; - margin-right: 30px; &.minimized { display: flex; @@ -62,7 +60,14 @@ .refresh-position { display: flex; align-items: center; + margin-right: 24px; margin-left: auto; + + .scalar-buttons { + gap: 12px; + display: flex; + align-items: center; + } } .refreshIcon { @@ -73,5 +78,16 @@ display: block; padding-top: 6px; } + + .table-graph-toggle { + height: 28px; + + &.maximized { + height: 32px; + align-items: center; + display: flex; + margin-right: 14px; + } + } } diff --git a/src/app/webapp-common/models/containers/model-info/model-info.component.ts b/src/app/webapp-common/models/containers/model-info/model-info.component.ts index 6b2df39f..d91c79f3 100755 --- a/src/app/webapp-common/models/containers/model-info/model-info.component.ts +++ b/src/app/webapp-common/models/containers/model-info/model-info.component.ts @@ -12,7 +12,7 @@ import {selectBackdropActive} from '@common/core/reducers/view.reducer'; import {setTableMode} from '@common/models/actions/models-view.actions'; import {isReadOnly} from '@common/shared/utils/is-read-only'; import {MESSAGES_SEVERITY} from '@common/constants'; -import {toggleSettings} from '@common/experiments/actions/common-experiment-output.actions'; +import {toggleMetricValuesView, toggleSettings} from '@common/experiments/actions/common-experiment-output.actions'; import {Link} from '@common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component'; import {selectIsSharedAndNotOwner} from '~/features/experiments/reducers'; import {RefreshService} from '@common/core/services/refresh.service'; @@ -22,6 +22,7 @@ import {Project} from '~/business-logic/model/projects/project'; import {ALL_PROJECTS_OBJECT} from '@common/core/effects/projects.effects'; import {ModelsInfoEffects} from '@common/models/effects/models-info.effects'; import {headerActions} from '@common/core/actions/router.actions'; +import {selectMetricValuesView} from '@common/experiments/reducers'; @Component({ @@ -54,6 +55,8 @@ export class ModelInfoComponent implements OnInit, OnDestroy { private isModelInEditMode$: Observable; private selectedProject$: Observable; private modelsFeature: boolean; + public routerConfig$: Observable; + public metricValuesView$: Observable; constructor( private router: Router, @@ -63,12 +66,15 @@ export class ModelInfoComponent implements OnInit, OnDestroy { private cdr: ChangeDetectorRef, private modelInfoEffect: ModelsInfoEffects ) { + this.routerConfig$ =this.store.select(selectRouterConfig) this.backdropActive$ = this.store.select(selectBackdropActive); this.selectedTableModel$ = this.store.select(selectSelectedTableModel); this.splitSize$ = this.store.select(selectSplitSize); this.isSharedAndNotOwner$ = this.store.select((selectIsSharedAndNotOwner)); this.isModelInEditMode$ = this.store.select(selectIsModelInEditMode); this.selectedProject$ = this.store.select(selectSelectedProject); + this.metricValuesView$ = this.store.select(selectMetricValuesView); + this.modelsFeature = this.route.snapshot.data?.setAllProject; if (this.modelsFeature) { this.store.dispatch(setSelectedProject({project: ALL_PROJECTS_OBJECT})); @@ -201,5 +207,9 @@ export class ModelInfoComponent implements OnInit, OnDestroy { } })); } + + toggleTableView() { + this.store.dispatch(toggleMetricValuesView()); + } } diff --git a/src/app/webapp-common/models/containers/model-menu/model-menu.component.html b/src/app/webapp-common/models/containers/model-menu/model-menu.component.html index c32fd9c1..61ee717d 100644 --- a/src/app/webapp-common/models/containers/model-menu/model-menu.component.html +++ b/src/app/webapp-common/models/containers/model-menu/model-menu.component.html @@ -1,60 +1,68 @@ -
-
-
- - - -
- + } + @if (tableMode()) { +
+ } + - - - + } +
- - - + } diff --git a/src/app/webapp-common/models/containers/model-menu/model-menu.component.ts b/src/app/webapp-common/models/containers/model-menu/model-menu.component.ts index 6ddec6ff..d529c691 100644 --- a/src/app/webapp-common/models/containers/model-menu/model-menu.component.ts +++ b/src/app/webapp-common/models/containers/model-menu/model-menu.component.ts @@ -1,4 +1,4 @@ -import {Component, EventEmitter, Input, Output} from '@angular/core'; +import {Component, input, output, inject, computed} from '@angular/core'; import { archiveSelectedModels, changeProjectRequested, @@ -42,45 +42,29 @@ import {isReadOnly} from '@common/shared/utils/is-read-only'; styleUrls: ['./model-menu.component.scss'] }) export class ModelMenuComponent extends BaseContextMenuComponent { - + protected dialog = inject(MatDialog); + protected adminService = inject(AdminService); readonly icons = ICONS; public modelSignedUri: string; - public _model: SelectedModel; - public isExample: boolean; - public isLocalFile: boolean; - public isArchive: boolean; - - @Input() set model(model: SelectedModel) { - this._model = model; - this.isExample = isReadOnly(model); - this.isLocalFile = this.adminService.isLocalFile(model?.uri); - this.isArchive = model?.system_tags?.includes('archived'); - } - get model() { - return this._model; - } - - @Input() selectedModel: SelectedModel; - @Input() selectedModels: SelectedModel[]; - @Input() numSelected = 0; - @Input() projectTags: string[]; - @Input() companyTags: string[]; - @Input() tagsFilterByProject: boolean; - @Input() activateFromMenuButton = true; - @Input() useCurrentEntity = false; - @Output() tagSelected = new EventEmitter(); - - constructor( - protected dialog: MatDialog, - protected adminService: AdminService, - ) { - super(); - } + model = input.required(); + selectedModel = input(); + selectedModels = input(); + numSelected = input(0); + projectTags = input(); + companyTags = input(); + tagsFilterByProject = input(); + activateFromMenuButton = input(true); + useCurrentEntity = input(false); + tagSelected = output(); + + protected isExample = computed(() => isReadOnly(this.model())); + protected isLocalFile = computed(() => this.adminService.isLocalFile(this.model()?.uri)); + protected isArchive = computed(() => this.model()?.system_tags?.includes('archived')); archiveClicked() { // info header case - const selectedModels = this.selectedModels ? selectionDisabledArchive(this.selectedModels).selectedFiltered : [this.model]; + const selectedModels = this.selectedModels() ? selectionDisabledArchive(this.selectedModels()!).selectedFiltered : [this.model()]; if (selectedModels[0].system_tags?.includes('archived')) { this.store.dispatch(restoreSelectedModels({selectedEntities: selectedModels, skipUndo: false})); } else { @@ -89,7 +73,7 @@ export class ModelMenuComponent extends BaseContextMenuComponent { } public publishPopup() { - const selectedModels = this.selectedModels ? selectionDisabledPublishModels(this.selectedModels).selectedFiltered : [this.model]; + const selectedModels = this.selectedModels() ? selectionDisabledPublishModels(this.selectedModels()!).selectedFiltered : [this.model()]; const confirmDialogRef = this.dialog.open(ConfirmDialogComponent, { data: { @@ -114,7 +98,7 @@ export class ModelMenuComponent extends BaseContextMenuComponent { } public moveToProjectPopup() { - const selectedModels = this.selectedModels ? selectionDisabledMoveTo(this.selectedModels).selectedFiltered : [this.model]; + const selectedModels = this.selectedModels() ? selectionDisabledMoveTo(this.selectedModels()!).selectedFiltered : [this.model()]; const currentProjects = Array.from(new Set(selectedModels.map(exp => exp.project?.id).filter(p => p))); const dialog = this.dialog.open(ChangeProjectDialogComponent, { data: { @@ -135,7 +119,7 @@ export class ModelMenuComponent extends BaseContextMenuComponent { } public downloadModelFileClicked = () => { - const url = this.model.uri; + const url = this.model().uri; this.store.dispatch(getSignedUrl({url})); this.store.select(selectSignedUrl(url)) .pipe( @@ -160,10 +144,10 @@ export class ModelMenuComponent extends BaseContextMenuComponent { deleteModelPopup() { const confirmDialogRef = this.dialog.open(CommonDeleteDialogComponent, { data: { - entity: this._model, - numSelected: this.numSelected, + entity: this.model(), + numSelected: this.numSelected(), entityType: EntityTypeEnum.model, - useCurrentEntity: this.activateFromMenuButton || this.useCurrentEntity + useCurrentEntity: this.activateFromMenuButton() || this.useCurrentEntity() }, width: '600px', disableClose: true @@ -171,7 +155,7 @@ export class ModelMenuComponent extends BaseContextMenuComponent { confirmDialogRef.afterClosed().subscribe((confirmed) => { if (confirmed) { this.store.dispatch(setSelectedModels({models: []})); - this.store.dispatch(modelSelectionChanged({model: null, project: this.projectId() || this.model?.project?.id || '*'})); + this.store.dispatch(modelSelectionChanged({model: null, project: this.projectId() || this.model()?.project?.id || '*'})); this.store.dispatch(fetchModelsRequested()); this.store.dispatch(cancelModelEdit()); } @@ -181,7 +165,7 @@ export class ModelMenuComponent extends BaseContextMenuComponent { toggleDetails() { this.store.dispatch(setTableMode({mode:'info'})); this.store.dispatch(modelSelectionChanged({ - model: this._model, + model: this.model(), project: this.projectId() })); } diff --git a/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.ts b/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.ts index b0224c67..0147519c 100755 --- a/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.ts +++ b/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.ts @@ -61,7 +61,6 @@ export class ModelGeneralInfoComponent { return this._model; } - @Output() showModel = new EventEmitter(); @Output() commentChanged = new EventEmitter(); commentValueChanged(value) { @@ -72,10 +71,6 @@ export class ModelGeneralInfoComponent { return !!this.model && !'Custom'.includes(this.model.framework); } - onShowModel() { - this.showModel.emit(this.model); - } - editExperimentComment(edit) { edit && this.store.dispatch(activateModelEdit('ModelComment')); } diff --git a/src/app/webapp-common/models/dumbs/model-header/model-header.component.html b/src/app/webapp-common/models/dumbs/model-header/model-header.component.html index 5fca16f8..123b2317 100644 --- a/src/app/webapp-common/models/dumbs/model-header/model-header.component.html +++ b/src/app/webapp-common/models/dumbs/model-header/model-header.component.html @@ -5,7 +5,7 @@ } - + @if (!minimizedView() || sharedView()) { @@ -69,9 +69,9 @@ class="light-theme" #tagsMenu [tags]="model?.tags" - [tagsFilterByProject]="allProjects || (tagsFilterByProject$ | async)" - [projectTags]="(allProjects ? companyTags$ : projectTags$) | async" - [companyTags]="allProjects ? null : companyTags$ | async" + [tagsFilterByProject]="allProjects || (tagsFilterByProject$ | ngrxPush)" + [projectTags]="(allProjects ? companyTags$ : projectTags$) | ngrxPush" + [companyTags]="allProjects ? null : companyTags$ | ngrxPush" (tagSelected)="addTag($event)" >
diff --git a/src/app/webapp-common/models/effects/models-info.effects.ts b/src/app/webapp-common/models/effects/models-info.effects.ts index ab508dde..36ddad24 100755 --- a/src/app/webapp-common/models/effects/models-info.effects.ts +++ b/src/app/webapp-common/models/effects/models-info.effects.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Action, Store} from '@ngrx/store'; import { catchError, @@ -94,7 +95,7 @@ export class ModelsInfoEffects { if (this.previousSelectedId && currentSelected?.id != this.previousSelectedId) { this.previousSelectedLastUpdate = null; } - this.previousSelectedId = currentSelected?.id; + this.previousSelectedId = currentSelected?.id ?? action.id; if (!currentSelected || !visible) { return of([action, null, tableSelected, selected]); } diff --git a/src/app/webapp-common/models/effects/models-menu.effects.ts b/src/app/webapp-common/models/effects/models-menu.effects.ts index f03c3fd7..bcfafa96 100644 --- a/src/app/webapp-common/models/effects/models-menu.effects.ts +++ b/src/app/webapp-common/models/effects/models-menu.effects.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Action, Store} from '@ngrx/store'; import {ApiModelsService} from '~/business-logic/api-services/models.service'; import {catchError, map, mergeMap, switchMap, tap} from 'rxjs/operators'; diff --git a/src/app/webapp-common/models/effects/models-view.effects.ts b/src/app/webapp-common/models/effects/models-view.effects.ts index 1d8715ff..effce9dd 100755 --- a/src/app/webapp-common/models/effects/models-view.effects.ts +++ b/src/app/webapp-common/models/effects/models-view.effects.ts @@ -1,6 +1,7 @@ import {Injectable} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Action, Store} from '@ngrx/store'; import {flatten, isEqual} from 'lodash-es'; import {EMPTY, of} from 'rxjs'; diff --git a/src/app/webapp-common/models/models.component.html b/src/app/webapp-common/models/models.component.html index b7c575b2..40d62289 100755 --- a/src/app/webapp-common/models/models.component.html +++ b/src/app/webapp-common/models/models.component.html @@ -1,17 +1,17 @@
+ [class.footer-visible]="(selectedModels$ | ngrxPush)?.length > 1|| (showAllSelectedIsActive$ |ngrxPush)"> - @@ -91,7 +92,7 @@
({ CdkVirtualForOf, CdkFixedSizeVirtualScroll, SelectMetricForCustomColComponent, - ExperimentCustomColsMenuComponent + ExperimentCustomColsMenuComponent, + ModelInfoMetadataComponent, + PushPipe, ], - providers: [ - SmFormBuilderService, DatePipe, - {provide: MODELS_CONFIG_TOKEN, useFactory: getInitState, deps: [UserPreferences]}, - ], - exports: [ - ModelsComponent - ], - declarations: [ModelInfoComponent, ModelsComponent, ModelInfoHeaderComponent, - ModelViewNetworkComponent, ModelInfoNetworkComponent, - ModelInfoLabelsComponent, ModelInfoLabelsViewComponent, ModelInfoGeneralComponent, - ModelGeneralInfoComponent, ModelHeaderComponent, - ModelInfoMetadataComponent, - ModelInfoExperimentsComponent, - ModelExperimentsTableComponent, - ModelInfoPlotsComponent, - ModelInfoScalarsComponent - ] + providers: [ + SmFormBuilderService, DatePipe, + {provide: MODELS_CONFIG_TOKEN, useFactory: getInitState, deps: [UserPreferences]}, + ], + + declarations: [ModelInfoComponent, ModelsComponent, ModelInfoHeaderComponent, + ModelViewNetworkComponent, ModelInfoNetworkComponent, + ModelInfoLabelsComponent, ModelInfoLabelsViewComponent, ModelInfoGeneralComponent, + ModelGeneralInfoComponent, ModelHeaderComponent, + ModelInfoExperimentsComponent, + ModelExperimentsTableComponent, + ModelInfoPlotsComponent, + ModelInfoScalarsComponent + ] }) export class ModelsModule { } diff --git a/src/app/webapp-common/models/reducers/index.ts b/src/app/webapp-common/models/reducers/index.ts index f0752051..c72478ed 100755 --- a/src/app/webapp-common/models/reducers/index.ts +++ b/src/app/webapp-common/models/reducers/index.ts @@ -56,8 +56,7 @@ export const selectModelTableColumns = createSelector(selectModelsHiddenTableCol } as ISmCol))); export const selectMetadataColumns = createSelector(selectModelsView, state=> state.metadataCols); export const selectMetadataColsForProject = createSelector(selectMetadataColumns, selectSelectedProjectId, selectModelsHiddenTableCols, selectModelsTableColsWidth, (metadataCols, projectId, hidden, colWidth) => - metadataCols - .filter(metaCol => metaCol.projectId === projectId) + metadataCols?.filter(metaCol => metaCol.projectId === projectId) .map(col => ({ ...col, hidden: !!hidden[col.id], diff --git a/src/app/webapp-common/models/shared/model-shared.module.ts b/src/app/webapp-common/models/shared/model-shared.module.ts index a8521a9e..1536e0e0 100755 --- a/src/app/webapp-common/models/shared/model-shared.module.ts +++ b/src/app/webapp-common/models/shared/model-shared.module.ts @@ -33,6 +33,8 @@ import {TableCardComponent} from '@common/shared/ui-components/data/table-card/t import {TableModule} from 'primeng/table'; import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; +import {PushPipe} from '@ngrx/component'; + const DECLERATIONS = [ModelTypeIconLabelComponent, ModelStatusIconLabelComponent, SelectModelHeaderComponent, ModelsTableComponent]; @@ -62,7 +64,8 @@ const DECLERATIONS = [ModelTypeIconLabelComponent, ModelStatusIconLabelComponent TableCardComponent, TableModule, ShowTooltipIfEllipsisDirective, - ClickStopPropagationDirective + ClickStopPropagationDirective, + PushPipe, ], declarations: DECLERATIONS, exports : DECLERATIONS diff --git a/src/app/webapp-common/models/shared/model-status-icon-label/model-status-icon-label.component.html b/src/app/webapp-common/models/shared/model-status-icon-label/model-status-icon-label.component.html index 6e5b1bb3..03e14db1 100755 --- a/src/app/webapp-common/models/shared/model-status-icon-label/model-status-icon-label.component.html +++ b/src/app/webapp-common/models/shared/model-status-icon-label/model-status-icon-label.component.html @@ -1,4 +1,4 @@ - + diff --git a/src/app/webapp-common/models/shared/model-type-icon-label/model-type-icon-label.component.html b/src/app/webapp-common/models/shared/model-type-icon-label/model-type-icon-label.component.html index b7309bc3..4bdb577e 100755 --- a/src/app/webapp-common/models/shared/model-type-icon-label/model-type-icon-label.component.html +++ b/src/app/webapp-common/models/shared/model-type-icon-label/model-type-icon-label.component.html @@ -1,4 +1,4 @@ - + {{type | noUnderscore | titlecase}} diff --git a/src/app/webapp-common/models/shared/models-table/models-table.component.html b/src/app/webapp-common/models/shared/models-table/models-table.component.html index 7aa15481..881801b8 100755 --- a/src/app/webapp-common/models/shared/models-table/models-table.component.html +++ b/src/app/webapp-common/models/shared/models-table/models-table.component.html @@ -7,9 +7,9 @@ [selectedDisableAvailableIsMultiple]="!singleRowContext" [selectedDisableAvailable]="singleRowContext ? getSingleSelectedModelsDisableAvailable(selectedModel? selectedModel: contextModel) : selectedModelsDisableAvailable" [numSelected]="singleRowContext ? 1 : selectedModels.length" - [tagsFilterByProject]="tagsFilterByProject$ | async" - [projectTags]="projectTags$ | async" - [companyTags]="companyTags$ | async" + [tagsFilterByProject]="tagsFilterByProject$ | ngrxPush" + [projectTags]="projectTags$ | ngrxPush" + [companyTags]="companyTags$ | ngrxPush" [activateFromMenuButton]="false" [useCurrentEntity]="singleRowContext" [backdrop]="menuBackdrop" @@ -31,6 +31,7 @@ [scrollable]="true" [columnsOrder]="colsOrder" [lazyLoading]="true" + [columnResizeMode]="columnResizeMode" [selection]="selectedModel" [checkedItems]="selectedModels" [activeContextRow]="contextModel" @@ -181,7 +182,7 @@ [tagsTemplate]="tagList" [compactColDataTemplate]="compactCol" [class.no-tags]="getSysTags(model).length === 0 && model?.tags.length === 0" - (click)="selected && openContextMenu({e: $event, rowData: model, backdrop: true})" + (click)="selected && cardClicked($event, model)" >
diff --git a/src/app/webapp-common/models/shared/models-table/models-table.component.ts b/src/app/webapp-common/models/shared/models-table/models-table.component.ts index 3686c883..e350dc16 100755 --- a/src/app/webapp-common/models/shared/models-table/models-table.component.ts +++ b/src/app/webapp-common/models/shared/models-table/models-table.component.ts @@ -76,7 +76,7 @@ export class ModelsTableComponent extends BaseTableView implements OnChanges { readonly modelsReadyOptions = Object.entries(MODELS_READY_LABELS).map(([key, val]) => ({label: val, value: key})); readonly timeFormatString = TIME_FORMAT_STRING; - public override filtersOptions: { [colId: string]: IOption[] } = { + public override filtersOptions: Record = { [MODELS_TABLE_COL_FIELDS.FRAMEWORK]: [], [MODELS_TABLE_COL_FIELDS.READY]: this.modelsReadyOptions, [MODELS_TABLE_COL_FIELDS.USER]: [], @@ -94,11 +94,11 @@ export class ModelsTableComponent extends BaseTableView implements OnChanges { private _selectedModels: TableModel[]; private _models: SelectedModel[]; public getSysTags = getSysTags; - public filtersMatch: { [colId: string]: string } = {}; - public filtersSubValues: { [colId: string]: string[] } = {}; + public filtersMatch: Record = {}; + public filtersSubValues: Record = {}; public singleRowContext: boolean; - private _tableFilters: { [p: string]: FilterMetadata }; - public roundedMetricValues: { [colId: string]: { [expId: string]: boolean } } = {}; + private _tableFilters: Record; + public roundedMetricValues: Record> = {}; @Input() set models(models: SelectedModel[]) { @@ -177,7 +177,7 @@ export class ModelsTableComponent extends BaseTableView implements OnChanges { return this._selectedModel; } - @Input() set tableFilters(filters: { [s: string]: FilterMetadata }) { + @Input() set tableFilters(filters: Record) { this._tableFilters = filters; this.filtersValues = {}; this.filtersValues[MODELS_TABLE_COL_FIELDS.FRAMEWORK] = filters?.[MODELS_TABLE_COL_FIELDS.FRAMEWORK]?.value ?? []; @@ -236,6 +236,7 @@ export class ModelsTableComponent extends BaseTableView implements OnChanges { } @Input() systemTags = [] as string[]; + @Input() columnResizeMode = 'expand' as 'fit' | 'expand'; get validSystemTags() { return this.systemTags.filter(tag => tag !== 'archived'); @@ -247,7 +248,7 @@ export class ModelsTableComponent extends BaseTableView implements OnChanges { @Output() tagsMenuOpened = new EventEmitter(); @Output() sortedChanged = new EventEmitter<{ isShift: boolean; colId: ISmCol['id'] }>(); @Output() columnResized = new EventEmitter<{ columnId: string; widthPx: number }>(); - @Output() clearAllFilters = new EventEmitter<{ [s: string]: FilterMetadata }>(); + @Output() clearAllFilters = new EventEmitter>(); @ViewChild(TableComponent, {static: true}) override table: TableComponent; @ViewChild('contextMenuExtended') contextMenuExtended: ModelMenuExtendedComponent; @@ -335,8 +336,6 @@ export class ModelsTableComponent extends BaseTableView implements OnChanges { tableRowClicked(event: { e: Event; data: SelectedModel }) { if (this._selectedModels.some(exp => exp.id === event.data.id)) { this.openContextMenu({e: event.e, rowData: event.data, backdrop: true}); - } else { - this.modelsSelectionChanged.emit([event.data]); } } diff --git a/src/app/webapp-common/nested-project-view/nested-card/nested-card.component.html b/src/app/webapp-common/nested-project-view/nested-card/nested-card.component.html index 0c948348..e78c73b9 100644 --- a/src/app/webapp-common/nested-project-view/nested-card/nested-card.component.html +++ b/src/app/webapp-common/nested-project-view/nested-card/nested-card.component.html @@ -14,7 +14,7 @@ smClickStopPropagation (click)="subProjectClicked(subProject)" [smTooltip]="subProject?.name | cleanProjectPath " - [innerHTML]="subProject?.name | cleanProjectPath| breadcrumbsEllipsis | purify "> + [innerHTML]="subProject?.name | cleanProjectPath| breadcrumbsEllipsis">
diff --git a/src/app/webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.html b/src/app/webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.html index 2b9fbae4..da790add 100644 --- a/src/app/webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.html +++ b/src/app/webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.html @@ -1,5 +1,5 @@
+ [class.in-empty-state]="!(projectsList()?.length !== 0 || searching)">
- - + +
- -
- +
+
diff --git a/src/app/webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.ts b/src/app/webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.ts index 1e90fd4b..0b77e692 100644 --- a/src/app/webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.ts +++ b/src/app/webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.ts @@ -1,4 +1,4 @@ -import {Component, EventEmitter, Input, Output, TemplateRef} from '@angular/core'; +import {Component, effect, EventEmitter, input, Input, Output, TemplateRef} from '@angular/core'; import {Project} from '~/business-logic/model/projects/project'; import {CircleTypeEnum} from '~/shared/constants/non-common-consts'; import {trackById} from '@common/shared/utils/forms-track-by'; @@ -23,9 +23,16 @@ export class NestedProjectViewPageComponent { circleTypeEnum = CircleTypeEnum; entityTypeEnum = ProjectTypeEnum; - @Input() totalVirtualCards: number = 0; + constructor() { + effect(() => { + if (this.projectsList()) { + this.loading = false; + } + }); + } + @Input() totalVirtualCards = 0; @Input() entityType: ProjectTypeEnum; - @Input() projectsList: Project[]; + projectsList = input(); @Input() allExamples: boolean; @Input() showExamples: boolean; @Input() searching: boolean; @@ -34,7 +41,7 @@ export class NestedProjectViewPageComponent { @Input() projectsTags: string[]; @Input() noMoreProjects: boolean; @Input() cardContentTemplateRef: TemplateRef; - @Input() cardContentFooterTemplateRef: TemplateRef; + @Input() cardContentFooterTemplateRef: TemplateRef<{$implicit: Project}>; @Output() cardClicked = new EventEmitter<{ hasSubProjects: boolean; id: string; name: string }>(); @Output() toggleNestedView = new EventEmitter(); @Output() orderByChanged = new EventEmitter(); @@ -42,5 +49,10 @@ export class NestedProjectViewPageComponent { @Output() deleteProjectClicked = new EventEmitter(); @Output() removeTag = new EventEmitter<{ project: Project; tag: string }>(); @Output() loadMore = new EventEmitter(); + loading: boolean; + loadMoreAction() { + this.loading = true; + this.loadMore.emit(); + } } diff --git a/src/app/webapp-common/pipelines-controller/controllers.component.html b/src/app/webapp-common/pipelines-controller/controllers.component.html index a40cf260..06a482ed 100644 --- a/src/app/webapp-common/pipelines-controller/controllers.component.html +++ b/src/app/webapp-common/pipelines-controller/controllers.component.html @@ -1,39 +1,44 @@ - +
+ [class.footer-visible]="((selectedExperiments$ | ngrxPush) && (selectedExperiments$ | ngrxPush)?.length > 1) || (showAllSelectedIsActive$ |ngrxPush)"> - +
(PipelineControllerMenuComponent); constructor() { super(); @@ -46,7 +43,7 @@ export class ControllersComponent extends ExperimentsComponent implements OnInit override createFooterItems(config: { entitiesType: EntityTypeEnum; - selected$: Observable>; + selected$: Observable<{id :string}[]>; showAllSelectedIsActive$: Observable; tags$: Observable; data$?: Observable>; @@ -74,10 +71,10 @@ export class ControllersComponent extends ExperimentsComponent implements OnInit window.setTimeout(() => { switch (item.id) { case MenuItems.delete: - this.contextMenu.deleteExperimentPopup(entityType || EntityTypeEnum.controller, true); + this.contextMenu().deleteExperimentPopup(entityType || EntityTypeEnum.controller, true); break; case MenuItems.abort: - this.contextMenu.abortControllerPopup(); + (this.contextMenu() as PipelineControllerMenuComponent).abortControllerPopup(); break; default: super.onFooterHandler({emitValue, item}); @@ -90,7 +87,7 @@ export class ControllersComponent extends ExperimentsComponent implements OnInit } newRun() { - this.contextMenu.runPipelineController(true); + (this.contextMenu() as PipelineControllerMenuComponent).runPipelineController(true); } removeTag({experiment, tag}: { experiment: ISelectedExperiment; tag: string }) { @@ -105,7 +102,7 @@ export class ControllersComponent extends ExperimentsComponent implements OnInit } override downloadTableAsCSV() { - this.table.table.downloadTableAsCSV(`ClearML ${this.selectedProject.id === '*'? 'All': this.selectedProject?.basename?.substring(0,60)} Pipelines`); + this.table().table.downloadTableAsCSV(`ClearML ${this.selectedProject.id === '*'? 'All': this.selectedProject?.basename?.substring(0,60)} Pipelines`); } override setupBreadcrumbsOptions() { this.sub.add(this.selectedProject$.pipe( diff --git a/src/app/webapp-common/pipelines-controller/controllers.consts.ts b/src/app/webapp-common/pipelines-controller/controllers.consts.ts index fa42c2b3..7ab2925a 100644 --- a/src/app/webapp-common/pipelines-controller/controllers.consts.ts +++ b/src/app/webapp-common/pipelines-controller/controllers.consts.ts @@ -34,7 +34,7 @@ export const INITIAL_CONTROLLER_TABLE_COLS: ISmCol[] = [ headerType: ColHeaderTypeEnum.sortFilter, filterable: true, sortable: true, - isParam: true, + isParam: false, searchableFilter: true, asyncFilter: true, paginatedFilterPageSize: rootProjectsPageSize, 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 71715c24..d4b39133 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 @@ -1,4 +1,4 @@ - +
- + @if (showLog) {
- {{(selected$ | async)?.name}} + {{(selected$ | ngrxPush)?.name}}
-
- - - -
- -
- -

NO CODE

-
- - +
+ @switch (detailsPanelMode) { + @case (statusOption.preview) { + + } + @case (statusOption.log) { + + } + @case (statusOption.code) { + @if (stepDiff) { +
+ } @else { +
+ +

NO CODE

+
+ } + } + }
- + }
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 d8f61ede..1b6aa23d 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 @@ -1,13 +1,12 @@ import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, - Component, + Component, effect, ElementRef, HostListener, inject, NgZone, OnDestroy, OnInit, - QueryList, - ViewChild, - ViewChildren + viewChild, + viewChildren, } from '@angular/core'; import {DagModelItem} from '@ngneat/dag'; import {fromEvent, Observable, Subscription} from 'rxjs'; @@ -18,7 +17,7 @@ import {selectRouterParams} from '../../core/reducers/router-reducer'; import * as commonInfoActions from '../../experiments/actions/common-experiments-info.actions'; import { getSelectedPipelineStep, - setSelectedPipelineStep + setSelectedPipelineStep, StepStatusEnum, TreeStep } from '../../experiments/actions/common-experiments-info.actions'; import {selectPipelineSelectedStepWithFallback} from '../../experiments/reducers'; import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; @@ -27,32 +26,6 @@ import {Ace, edit} from 'ace-builds'; import {TaskStatusEnum} from '~/business-logic/model/tasks/taskStatusEnum'; import {selectScaleFactor} from '@common/core/reducers/view.reducer'; import {DagManagerUnsortedService} from '@common/shared/services/dag-manager-unsorted.service'; -import {TaskTypeEnum} from '~/business-logic/model/tasks/taskTypeEnum'; - -export enum StepStatusEnum { - queued = 'queued', - pending = 'pending', - skipped = 'skipped', - cached = 'cached', - executed = 'executed', - running = 'running', - failed = 'failed', - aborted = 'aborted', - completed = 'completed' -} - -export interface TreeStep { - base_task_id: string, - queue: string, - parents: string[], - executed: string; - status: StepStatusEnum; - job_type: TaskTypeEnum; - job_started: number; - job_ended: number; - job_code_section: string; - job_id: string; -} export interface PipelineItem extends DagModelItem { name: string; @@ -65,8 +38,8 @@ export interface Arrow { path2?: string; headTransform: string; selected: boolean; - targetId: number; - sourceId: number; + targetId: string; + sourceId: string; outgoing?: boolean; } @@ -87,11 +60,9 @@ export enum StatusOption { }) export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, OnDestroy { - @ViewChildren('taskEl', {read: ElementRef}) tasksElements!: QueryList; - @ViewChild('start', {read: ElementRef}) startingElement: ElementRef; - @ViewChild('end', {read: ElementRef}) endingElement: ElementRef; - @ViewChild('diagramContainer') diagramContainer: ElementRef; - @ViewChildren('aceEditor') private aceEditorElements: QueryList; + tasksElements = viewChildren('taskEl', {read: ElementRef}); + diagramContainer = viewChild>('diagramContainer'); + private aceEditorElement = viewChild>('aceEditor'); private aceEditor: Ace.Editor; private sub = new Subscription(); private dragging: boolean; @@ -113,8 +84,6 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O detailsPanelMode = StatusOption.log; defaultDetailsMode = StatusOption.log; - trackArrows = (index: number, arrow: Arrow) => arrow.path; - trackByStepId = (index: number, step) => step.stepId; public maximizeResults: boolean; protected _dagManager: DagManagerUnsortedService; protected store: Store; @@ -155,6 +124,13 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O this.projectId$ = this.store.select(selectRouterParams) .pipe(map(params => params?.projectId)); + + + effect(() => { + if(this.aceEditorElement()) { + this.initAceEditor(); + } + }); } ngOnInit(): void { @@ -166,7 +142,7 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O this.detailsPanelMode = this.getPanelMode(); } this.infoData = task; - const width = this.diagramContainer?.nativeElement.getBoundingClientRect().width; + const width = this.diagramContainer()?.nativeElement.getBoundingClientRect().width; this.chartWidth = Math.max(Number.isNaN(width) ? 0 : width, 4000); this.dagModel$ = this._dagManager.dagModel$ .pipe(filter(model => model?.length > 0), tap(model => @@ -177,7 +153,7 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O this._dagManager.setNewItemsArrayAsDagModel(this.pipelineController); window.setTimeout(() => { if (!this.skipAutoCenter) { - const element = this.diagramContainer.nativeElement; + const element = this.diagramContainer().nativeElement; element.scroll({left: (element.scrollWidth - element.getBoundingClientRect().width) / 2}); } this.removeLines(); @@ -238,29 +214,21 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O parentIds: [0].concat(pipelineObj[key].parents.map(parent => sortedNodes.indexOf(parent) + 1)), name: key, branchPath: 1, - data: { - ...pipelineObj[key], - ...( - this.infoData.status === TaskStatusEnum.Stopped && - [TaskStatusEnum.Queued, TaskStatusEnum.InProgress, 'running'].includes(pipelineObj[key].status) && - {status: 'aborted'} - ) - } + data: pipelineObj[key], } as PipelineItem)); } ngAfterViewInit(): void { - this.sub.add(this.aceEditorElements.changes.subscribe(() => this.initAceEditor())); - fromEvent(this.diagramContainer.nativeElement, 'wheel') + fromEvent(this.diagramContainer().nativeElement, 'wheel') .pipe(throttleTime(1000)) .subscribe(() => { this.skipAutoCenter = true; }); - const mousedown$ = fromEvent(this.diagramContainer.nativeElement, 'mousedown'); + const mousedown$ = fromEvent(this.diagramContainer().nativeElement, 'mousedown'); const mouseup$ = fromEvent(document, 'mouseup'); - const mousemove$ = fromEvent(this.diagramContainer.nativeElement, 'mousemove'); + const mousemove$ = fromEvent(this.diagramContainer().nativeElement, 'mousemove'); this.sub.add(mousedown$ .pipe( @@ -280,9 +248,9 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O )) ) .subscribe(({x, y}: { x: number; y: number }) => { - this.diagramContainer.nativeElement.scrollTo({ - top: this.diagramContainer.nativeElement.scrollTop - y, - left: this.diagramContainer.nativeElement.scrollLeft - x, + this.diagramContainer().nativeElement.scrollTo({ + top: this.diagramContainer().nativeElement.scrollTop - y, + left: this.diagramContainer().nativeElement.scrollLeft - x, }); }) ); @@ -295,14 +263,14 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O drawLines() { const pipeLineItems = this._dagManager.getSingleDimensionalArrayFromModel(); this.arrows = []; - this.diagramRect = this.diagramContainer.nativeElement.getBoundingClientRect(); + this.diagramRect = this.diagramContainer().nativeElement.getBoundingClientRect(); pipeLineItems.forEach((pipeLineItem) => { pipeLineItem.parentIds.forEach((parentId: number) => { if (parentId > 0) { - const parent: ElementRef = this.tasksElements.find( - (b: ElementRef) => parentId === +b.nativeElement.children[0].id + const parent: ElementRef = this.tasksElements().find((b: ElementRef) => + parentId === +b.nativeElement.children[0].id ); - const self: ElementRef = this.tasksElements.find( + const self: ElementRef = this.tasksElements().find( (b: ElementRef) => +b.nativeElement.children[0].id === pipeLineItem.stepId ); if (parent?.nativeElement && self?.nativeElement) { @@ -318,8 +286,8 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O headTransform: `translate(${ex},${ey}) rotate(${ae})`, selected: false, outgoing: false, - sourceId: parentId, - targetId: pipeLineItem.stepId, + sourceId: `${parentId}`, + targetId: `${pipeLineItem.stepId}`, }); } } @@ -339,7 +307,7 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O try { this.stepDiff = JSON.parse(this.infoData.configuration[step.data?.job_code_section || step.id]?.value)?.script?.diff; this.aceEditor?.getSession().setValue(this.stepDiff); - } catch (e) { + } catch { this.stepDiff = null; if (this.defaultDetailsMode === StatusOption.code) { this.detailsPanelMode = this.defaultDetailsMode; @@ -376,13 +344,13 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O } private initAceEditor() { - const aceEditorElement = this.aceEditorElements.first; + const aceEditorElement = this.aceEditorElement()?.nativeElement; if (!aceEditorElement) { this.aceEditor = null; return; } this.zone.runOutsideAngular(() => { - const aceEditor = edit(aceEditorElement.nativeElement) as Ace.Editor; + const aceEditor = edit(aceEditorElement) as Ace.Editor; this.aceEditor = aceEditor; aceEditor.setOptions({ readOnly: true, @@ -422,8 +390,8 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O protected highlightArrows() { this.arrows = this.arrows?.map(arrow => { - const isTarget = arrow.targetId === this.selectedEntity?.stepId; - const isSource = arrow.sourceId === this.selectedEntity?.stepId; + const isTarget = arrow.targetId === `${this.selectedEntity?.stepId}`; + const isSource = arrow.sourceId === `${this.selectedEntity?.stepId}`; return {...arrow, selected: isTarget || isSource, outgoing: isSource}; }).sort((a, b) => (a.selected === b.selected) ? 0 : a.selected ? 1 : -1); } diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/abort-controller-dialog/abort-controller-dialog.component.html b/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/abort-controller-dialog/abort-controller-dialog.component.html index 9699920a..850dab11 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/abort-controller-dialog/abort-controller-dialog.component.html +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/abort-controller-dialog/abort-controller-dialog.component.html @@ -1,15 +1,19 @@ -
-
This will abort the execution of {{experiments.length > 1 ? experiments.length : 'the '}} - {{experiments[0]?.name ? '"' + experiments[0]?.name + '"' : ''}} pipeline run{{experiments.length > 1 ? 's' : ''}} + @if (shouldBeAbortedTasks !== null) { +
+
This will abort the execution of {{experiments.length > 1 ? experiments.length : 'the '}} + @if (experiments.length === 1) { + {{experiments[0]?.name ? '"' + experiments[0]?.name + '"' : ''}} + } pipeline run{{experiments.length > 1 ? 's' : ''}} +
+
+ } +
+ +
-
-
- - -
- + 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 9a1f730f..a6773b1d 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 @@ -1,6 +1,5 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; -import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; -import {Store} from '@ngrx/store'; +import {ChangeDetectionStrategy, Component, inject } from '@angular/core'; import {ISelectedExperiment} from '~/features/experiments/shared/experiment-info.model'; @Component({ @@ -10,17 +9,16 @@ import {ISelectedExperiment} from '~/features/experiments/shared/experiment-info changeDetection: ChangeDetectionStrategy.OnPush }) export class AbortControllerDialogComponent { + public dialogRef = inject>(MatDialogRef); public experiments: ISelectedExperiment[]; shouldBeAbortedTasks: ISelectedExperiment[] = null; - constructor( - private store: Store, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) data: { + constructor() { + const data = inject<{ tasks: ISelectedExperiment[]; shouldBeAbortedTasks: ISelectedExperiment[]; - } - ) { + }>(MAT_DIALOG_DATA); + this.experiments = data.tasks; this.shouldBeAbortedTasks = data.shouldBeAbortedTasks; diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/pipeline-controller-menu.component.html b/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/pipeline-controller-menu.component.html index ff9a88f4..81aa688e 100755 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/pipeline-controller-menu.component.html +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/pipeline-controller-menu.component.html @@ -1,66 +1,70 @@ -
-
-
+@if (activateFromMenuButton()) { +
+} @else { +
+
+} - - -
- - + @if (selectedDisableAvailable()[menuItems.queue]) { + @if (tableMode()) { + +
+ } + @if (!selectedDisableAvailable()[menuItems.run]?.disable) { + + } - - - + @if (!isArchive()) { + + } - - - - - + @if (isArchive()) { + + } + } 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 76db2aa9..5e15c363 100755 --- 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 @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {ExperimentMenuComponent} from '@common/experiments/shared/components/experiment-menu/experiment-menu.component'; import {selectionDisabledAbort, selectionDisabledContinue} from '@common/shared/entity-page/items.utils'; import * as commonMenuActions from '@common/experiments/actions/common-experiments-menu.actions'; @@ -15,18 +15,15 @@ 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'] + styleUrls: ['./pipeline-controller-menu.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, }) export class PipelineControllerMenuComponent extends ExperimentMenuComponent { entityTypeEnum = EntityTypeEnum; - constructor() { - super(); - } - runPipelineController(runNew = false) { this.dialog.open(RunPipelineControllerDialogComponent, { - data: {task: runNew ? null : this._experiment} + data: {task: runNew ? null : this.experiment()} }).afterClosed() .pipe(filter(res => !!res.confirmed)) .subscribe((res) => { @@ -39,17 +36,17 @@ export class PipelineControllerMenuComponent extends ExperimentMenuComponent { } continueController() { - const selectedExperiments = this.selectedExperiments ? selectionDisabledContinue(this.selectedExperiments).selectedFiltered : [this._experiment]; + const selectedExperiments = this.selectedExperiments() ? selectionDisabledContinue(this.selectedExperiments()).selectedFiltered : [this.experiment()]; this.store.dispatch(commonMenuActions.enqueueClicked({ selectedEntities: selectedExperiments, - queue: this._experiment.execution?.queue, + queue: this.experiment().execution?.queue, verifyWatchers: false })); } abortControllerPopup() { - const selectedExperiments = this.selectedExperiments ? selectionDisabledAbort(this.selectedExperiments).selectedFiltered : [this._experiment]; + const selectedExperiments = this.selectedExperiments() ? selectionDisabledAbort(this.selectedExperiments()).selectedFiltered : [this.experiment()]; this.store.dispatch(abortAllChildren({experiments: selectedExperiments})); } } diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.html b/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.html index 6b80e452..d018b9bc 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.html +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.html @@ -1,14 +1,18 @@ -
-
- -
{{step.name}}
+
+
+ +
{{stepWithStatus().name}}
-
- -
- {{runTime | duration}} -
+
+ @if (stepWithStatus().data.status !== 'pending') { + + } + @if (stepWithStatus().data?.job_started) { +
+ {{runTime() | duration}} +
+ }
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 dec34b44..30c56857 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 @@ -76,6 +76,9 @@ &.completed { background-color: mix($pipeline-completed, $blue-950, 20%); } + &.published { + background-color: mix($pipeline-published, $blue-950, 20%); + } } // STEP FOOTER @@ -112,4 +115,7 @@ &.completed { background-color: $pipeline-completed } + &.published { + background-color: $pipeline-published + } } 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 84a273b8..911fd3dc 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 @@ -1,17 +1,13 @@ import { ChangeDetectionStrategy, - ChangeDetectorRef, Component, - EventEmitter, - Input, - OnDestroy, - Output + inject, output, input, effect, computed, signal, DestroyRef } from '@angular/core'; import { PipelineItem, - StepStatusEnum } from '@common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component'; import {interval, Subscription} from 'rxjs'; +import {StepStatusEnum} from '@common/experiments/actions/common-experiments-info.actions'; @Component({ selector: 'sm-pipeline-controller-step', @@ -19,39 +15,37 @@ import {interval, Subscription} from 'rxjs'; styleUrls: ['./pipeline-controller-step.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class PipelineControllerStepComponent implements OnDestroy { - protected _step: PipelineItem; - public runTime: number; +export class PipelineControllerStepComponent { + private destroyRef = inject(DestroyRef); + protected runTime = signal(null); private timeSub: Subscription; - constructor(private cdr: ChangeDetectorRef) { } + step = input(); + selected = input(); + openConsole = output(); + protected stepWithStatus = computed(() => + ({...this.step(), data: {...this.step().data, status: this. step().data?.status || StepStatusEnum.pending}}) + ); - @Input() set step(step: PipelineItem) { - this._step = {...step, data: {...step.data, status: step.data?.status || StepStatusEnum.pending}}; - this.timeSub?.unsubscribe(); - if (step?.data?.job_ended) { - this.runTime = step.data.job_ended - step?.data?.job_started; - } else if (step?.data?.job_started && step.data.status === 'running') { - this.timeSub = interval(1000) - .subscribe(() => this.updateRunningTime()) - this.updateRunningTime(); - } else { - this.runTime = null; - } - } + constructor() { + effect(() => { + const step = this.step(); + this.timeSub?.unsubscribe(); + if (step?.data?.job_ended) { + this.runTime.set(step.data.job_ended - step?.data?.job_started); + } else if (step?.data?.job_started && step.data.status === 'running') { + this.timeSub = interval(1000) + .subscribe(() => this.updateRunningTime()) + this.updateRunningTime(); + } else { + this.runTime.set(null); + } + }, {allowSignalWrites: true}); - get step() { - return this._step; + this.destroyRef.onDestroy(() => this.timeSub?.unsubscribe()); } - @Input() selected: boolean; - @Output() openConsole = new EventEmitter(); updateRunningTime() { - this.runTime = (Date.now() / 1000) - this.step.data.job_started; - this.cdr.detectChanges(); - } - - ngOnDestroy(): void { - this.timeSub?.unsubscribe(); + this.runTime.set((Date.now() / 1000) - this.step().data.job_started); } } 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 a8b3708b..68834404 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,82 +1,99 @@ -
{{controller ? 'RUN INFO' : 'STEP INFO'}}
+
{{controller() ? 'RUN INFO' : 'STEP INFO'}}
 -
-
- -
{{step.name}}
-
-
{{step.data.status}}
- -
-
- -
- -
- - -
-
PARAMETERS
- -
-
{{param.key}}
-
{{param.value.value}}
+ @if (entity()) { +
+ @if (stepWithStatus()) { +
+ +
{{stepWithStatus().name}}
+
+
{{stepWithStatus().data.status}}
+
- -
-
-
METRICS
- - -
-
{{$any(variant.value).metric}}/{{$any(variant.value).variant}}
-
{{$any(variant.value).value}}
-
- - -
-
-
ARTIFACTS
- -
-
{{artifact.key}}
-
{{(artifact?.content_size | filesize : fileSizeConfigStorage) || ''}}
+ + } @else { + @if (entity()?.id) { +
+
- -
-
-
MODELS
- -
-
{{model.name || model.model.name}}
-
- -
- - - -
No data to show
- - -
-
+ } + } + @if (!stepWithStatus() || stepWithStatus().data.job_id === entity()?.id) { +
+
PARAMETERS
+ @for (section of (entity()?.type === 'controller' ? {'Args': {}} : entity()?.hyperparams) | keyvalue; track section) { + @for (param of entity()?.hyperparams[section.key] | keyvalue | filterRegex: '^(?!_).+$'; track param) { +
+
{{param.key}}
+
{{param.value.value}}
+
+ } + } +
+
+
METRICS
+ @if ((entity()?.last_metrics | keyvalue)?.length > 0) { + @for (metric of entity().last_metrics | keyvalue; track metric) { + @for (variant of $any($any(metric.value) | keyvalue) | filterMonitorMetric; track variant) { +
+
{{$any(variant.value).metric}}/{{$any(variant.value).variant}}
+
{{$any(variant.value).value}}
+
+ } + } + } @else { +
No data to show
+ } +
+
+
ARTIFACTS
+ @if (entity()?.execution?.artifacts?.length > 0) { + @for (artifact of entity().execution.artifacts; track artifact.hash || artifact.uri) { +
+
{{artifact.key}}
+
{{(artifact?.content_size | filesize : fileSizeConfigStorage) || ''}}
+
+ } + } @else { +
No data to show
+ } +
+
+
MODELS
+ @if (entity()?.models?.output?.length > 0) { + @for (model of entity().models?.output; track model) { +
+
{{model.name || model.model.name}}
+
+ } + } @else { +
No data to show
+ } +
+ } + +
No data to show
+ +
+ } + @if (entity()?.id) { + + + + } 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 aa5f17b4..559a83c7 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 @@ -124,6 +124,9 @@ &.completed { background-color: $pipeline-completed; } + &.published { + background-color: $pipeline-published; + } } .empty-msg { 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 90c2615f..27d077d3 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 @@ -1,16 +1,14 @@ -import {Component, Input} from '@angular/core'; +import {Component, inject, input, computed} from '@angular/core'; import {Store} from '@ngrx/store'; -import {Artifact} from '~/business-logic/model/tasks/artifact'; import { PipelineItem, - StepStatusEnum, - TreeStep } from '@common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component'; import {TaskTypeEnum} from '~/business-logic/model/tasks/taskTypeEnum'; import {addMessage} from '@common/core/actions/layout.actions'; import {fileSizeConfigStorage} from '@common/shared/pipes/filesize.pipe'; import {MESSAGES_SEVERITY} from '@common/constants'; import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; +import {StepStatusEnum} from '@common/experiments/actions/common-experiments-info.actions'; @Component({ selector: 'sm-pipeline-info', @@ -18,32 +16,17 @@ import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.mod styleUrls: ['./pipeline-info.component.scss'] }) export class PipelineInfoComponent { - private _entity: IExperimentInfo; - public controller: boolean; + private store = inject(Store); public fileSizeConfigStorage = fileSizeConfigStorage; - private _step: { branchPath: number; data: TreeStep; name: string; stepId: number; parentIds: number[]; id: string }; - @Input() set entity(task: IExperimentInfo) { - this._entity = task; - this.controller = task?.type === TaskTypeEnum.Controller; - } - get entity() { - return this._entity; - } - - @Input() set step(step: PipelineItem) { - this._step = step ? {...step, data: {...step.data, status: step.data?.status || StepStatusEnum.pending}} : null; - } - - get step() { - return this._step; - } - @Input() project: string; - - constructor(private store: Store) { - } - - trackByFn = (index: number, artifact: Artifact) => artifact.hash || artifact.uri; + project = input(); + entity = input(); + step = input(); + protected stepWithStatus = computed(() => this.step() ? + {...this.step(), data: {...this.step().data, status: this.step().data?.status || StepStatusEnum.pending}} : + null + ); + protected controller = computed(() => this.entity()?.type === TaskTypeEnum.Controller); copyToClipboard() { this.store.dispatch(addMessage(MESSAGES_SEVERITY.SUCCESS, 'ID copied successfully')); 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 cd945ecf..62599e83 100644 --- a/src/app/webapp-common/pipelines-controller/pipelines-controller.module.ts +++ b/src/app/webapp-common/pipelines-controller/pipelines-controller.module.ts @@ -1,4 +1,4 @@ -import {NgModule} from '@angular/core'; +import {importProvidersFrom, NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {ControllersComponent} from './controllers.component'; import {AngularSplitModule} from 'angular-split'; @@ -47,12 +47,51 @@ 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 {compareNavigationGuard} from '@common/experiments/compare-navigation.guard'; +import {compareViewStateGuard} from '@common/experiments/compare-view-state.guard'; +import {ExperimentCompareScalarChartsComponent} from '@common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component'; +import {COMPARE_CONFIG_TOKEN, COMPARE_STORE_KEY, getCompareConfig} from '@common/experiments-compare/experiments-compare.module'; +import {UserPreferences} from '@common/user-preferences'; +import {StoreModule} from '@ngrx/store'; +import {experimentsCompareReducers} from '@common/experiments-compare/reducers'; +import {ExperimentComparePlotsComponent} from '@common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component'; +import {ExperimentHeaderComponent} from '@common/experiments/dumb/experiment-header/experiment-header.component'; export const routes: Routes = [ { path: '', component: ControllersComponent, children: [ + { + path: 'compare', + canActivate: [compareNavigationGuard], + children: [] + }, + { + path: 'compare/scalars', + canActivate: [compareViewStateGuard], + component: ExperimentCompareScalarChartsComponent, + data: {minimized: true}, + providers: [ + {provide: COMPARE_CONFIG_TOKEN, useFactory: getCompareConfig, deps: [UserPreferences]}, + importProvidersFrom( + StoreModule.forFeature(COMPARE_STORE_KEY, experimentsCompareReducers, COMPARE_CONFIG_TOKEN), + ), + ], + }, + { + path: 'compare/plots', + canActivate: [compareViewStateGuard], + component: ExperimentComparePlotsComponent, + data: {minimized: true}, + providers: [ + {provide: COMPARE_CONFIG_TOKEN, useFactory: getCompareConfig, deps: [UserPreferences]}, + importProvidersFrom( + StoreModule.forFeature(COMPARE_STORE_KEY, experimentsCompareReducers, COMPARE_CONFIG_TOKEN), + ), + ], + }, { path: ':controllerId', component: PipelineControllerInfoComponent, }, @@ -112,6 +151,8 @@ export const routes: Routes = [ MatMenuModule, ShowTooltipIfEllipsisDirective, SelectQueueModule, + PushPipe, + ExperimentHeaderComponent ], 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 0ca88296..e33d7427 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 @@ -1,56 +1,72 @@ + [pageHeader]="title" + iconClass="al-color blue-300 al-ico-pipelines"> -
Parameters
-
-
{{param.name}}
- - - - - Please provide an float - - - - - - Please provide an integer - - - - - - -
+ @if (params?.length > 0) { +
Parameters
+ } + @for (param of params; track param.name) { +
+
{{param.name}}
+ @switch (param.type) { + @case ('float') { + + + @if (floatInput?.errors && floatInput?.errors['pattern']) { + + Please provide an float + + } + + } + @case ('int') { + + + @if (intInput?.errors && intInput?.errors['pattern']) { + + Please provide an integer + + } + + } + @default { + + + + } + } +
+ }
Configuration
Pipeline controller queue*
+ > + #queueInput + #queueInputModel="ngModel" + matInput + name="queue" + [(ngModel)]="selectedQueue" + [matAutocomplete]="auto" + required + data-id="queueFiled"> - -
{{queue.name }}
- + @for (queue of queues | filter:queueInput.value:'name'; track queue) { + +
{{queue.name }}
+ + }
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 4f96b6b2..073b7030 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 @@ -1,4 +1,4 @@ -import {Component, Inject, OnDestroy, OnInit} from '@angular/core'; +import {Component, OnDestroy, OnInit, inject } from '@angular/core'; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {Store} from '@ngrx/store'; import {combineLatest, filter, Subscription} from 'rxjs'; @@ -27,7 +27,10 @@ export interface RunPipelineResult { styleUrls: ['./run-pipeline-controller-dialog.component.scss'] }) export class RunPipelineControllerDialogComponent implements OnInit, OnDestroy { - public queues: Array; + public dialogRef = inject>(MatDialogRef); + private store = inject(Store); + public data = inject<{ task }>(MAT_DIALOG_DATA); + public queues: Queue[]; public selectedQueue: Queue; public queues$ = this.store.select(selectQueuesList); public baseController$ = this.store.select(selectStartPipelineDialogTask); @@ -38,15 +41,11 @@ export class RunPipelineControllerDialogComponent implements OnInit, OnDestroy { private baseControllerSub: Subscription; private selectedQueueSub: Subscription; - constructor( - public dialogRef: MatDialogRef, - private store: Store, - @Inject(MAT_DIALOG_DATA) public data: { task } - ) { - if (data?.task?.hyperparams?.Args) { - this.store.dispatch(setControllerForStartPipelineDialog({task: data.task})); + constructor() { + if (this.data?.task?.hyperparams?.Args) { + this.store.dispatch(setControllerForStartPipelineDialog({task: this.data.task})); } else { - this.store.dispatch(getControllerForStartPipelineDialog({task: data.task?.id})); + this.store.dispatch(getControllerForStartPipelineDialog({task: this.data.task?.id})); } this.queuesSub = this.queues$.subscribe(queues => { 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 35d7adcb..8606320a 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 @@ -1,9 +1,9 @@ + [class.in-empty-state]="!(((projectsList$ | ngrxPush)?.length !== 0 && (!allExamples || (showExamples$ | ngrxPush))) || searching)"> + *ngIf="((projectsList$ | ngrxPush)?.length !== 0 && (!allExamples || (showExamples$ | ngrxPush))) || searching; else emptyState"> -
- +
+
diff --git a/src/app/webapp-common/pipelines/pipelines.module.ts b/src/app/webapp-common/pipelines/pipelines.module.ts index 87d42f9c..ea95d6be 100644 --- a/src/app/webapp-common/pipelines/pipelines.module.ts +++ b/src/app/webapp-common/pipelines/pipelines.module.ts @@ -9,6 +9,9 @@ import {merge} from 'lodash-es'; import {PipelinesRouterModule} from '@common/pipelines/pipelines.route'; import {PipelineCardComponent} from '@common/pipelines/pipeline-card/pipeline-card.component'; import {ButtonToggleComponent} from '@common/shared/ui-components/inputs/button-toggle/button-toggle.component'; +import {PushPipe} from '@ngrx/component'; +import {DotsLoadMoreComponent} from '@common/shared/ui-components/indicators/dots-load-more/dots-load-more.component'; + export const pipelinesSyncedKeys = [ @@ -50,6 +53,8 @@ const getPipelineConfig = () => ({ StoreModule.forFeature('projects', projectsReducer, PIPELINES_CONFIG_TOKEN), PipelineCardComponent, ButtonToggleComponent, + PushPipe, + DotsLoadMoreComponent, ], exports: [PipelinesPageComponent], providers: [ 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 544cbf1b..bdca8951 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 @@ -28,7 +28,7 @@ import { import {ScatterPlotComponent} from '@common/shared/components/charts/scatter-plot/scatter-plot.component'; import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {createMetricColumn, MetricColumn} from '@common/shared/utils/tableParamEncode'; -import {concatLatestFrom} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {presetColors} from '@common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component'; import {selectMetricVariants} from '@common/experiments/reducers'; 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 622c135e..a57f635d 100644 --- a/src/app/webapp-common/project-info/project-info.component.html +++ b/src/app/webapp-common/project-info/project-info.component.html @@ -25,7 +25,7 @@ [class.editor]="editor.editMode" [data]="info" [readOnly]="example" - [blockUserScripts]="blockUserScripts$ | async" + [blockUserScripts]="blockUserScripts$ | ngrxPush" (saveInfo)="saveInfo($event)" >
diff --git a/src/app/webapp-common/project-info/project-info.module.ts b/src/app/webapp-common/project-info/project-info.module.ts index b0dcd9f4..4d953c73 100644 --- a/src/app/webapp-common/project-info/project-info.module.ts +++ b/src/app/webapp-common/project-info/project-info.module.ts @@ -16,6 +16,8 @@ import { ShowTooltipIfEllipsisDirective } from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; import {SelectMetricForCustomColComponent} from '@common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component'; +import {PushPipe} from '@ngrx/component'; + @NgModule({ declarations: [ProjectInfoComponent, ProjectStatsComponent, MetricForStatsDialogComponent], @@ -31,7 +33,8 @@ import {SelectMetricForCustomColComponent} from '@common/experiments/dumb/select TooltipDirective, DialogTemplateComponent, ShowTooltipIfEllipsisDirective, - SelectMetricForCustomColComponent + SelectMetricForCustomColComponent, + PushPipe, ] }) export class ProjectInfoModule { diff --git a/src/app/webapp-common/projects/common-projects.consts.ts b/src/app/webapp-common/projects/common-projects.consts.ts index 81422661..a8a7d51b 100755 --- a/src/app/webapp-common/projects/common-projects.consts.ts +++ b/src/app/webapp-common/projects/common-projects.consts.ts @@ -1,3 +1,3 @@ export const PROJECTS_PREFIX = 'PROJECTS_'; -export const pageSize = 12; +export const pageSize = 16; diff --git a/src/app/webapp-common/projects/common-projects.effects.ts b/src/app/webapp-common/projects/common-projects.effects.ts index 4fc3900b..ac045012 100755 --- a/src/app/webapp-common/projects/common-projects.effects.ts +++ b/src/app/webapp-common/projects/common-projects.effects.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {ApiProjectsService} from '~/business-logic/api-services/projects.service'; import {requestFailed} from '../core/actions/http.actions'; import {activeLoader, deactivateLoader, setServerError} from '../core/actions/layout.actions'; diff --git a/src/app/webapp-common/projects/common-projects.module.ts b/src/app/webapp-common/projects/common-projects.module.ts index 57fba496..33abfa38 100755 --- a/src/app/webapp-common/projects/common-projects.module.ts +++ b/src/app/webapp-common/projects/common-projects.module.ts @@ -12,6 +12,9 @@ import {LabeledFormFieldDirective} from '@common/shared/directive/labeled-form-f import {ProjectCardComponent} from '@common/shared/ui-components/panel/project-card/project-card.component'; import {StoreModule} from '@ngrx/store'; import {projectsReducer} from '~/features/projects/projects.reducer'; +import {PushPipe} from '@ngrx/component'; +import {DotsLoadMoreComponent} from '@common/shared/ui-components/indicators/dots-load-more/dots-load-more.component'; + @NgModule({ imports: [ @@ -24,6 +27,8 @@ import {projectsReducer} from '~/features/projects/projects.reducer'; EffectsModule.forFeature([ProjectsEffects, CommonProjectsEffects]), LabeledFormFieldDirective, ProjectCardComponent, + PushPipe, + DotsLoadMoreComponent, ], declarations: [CommonProjectsPageComponent, ProjectsListComponent], exports: [CommonProjectsPageComponent, ProjectsListComponent] diff --git a/src/app/webapp-common/projects/containers/projects-page/common-projects-page.component.html b/src/app/webapp-common/projects/containers/projects-page/common-projects-page.component.html index 03520264..b53543db 100755 --- a/src/app/webapp-common/projects/containers/projects-page/common-projects-page.component.html +++ b/src/app/webapp-common/projects/containers/projects-page/common-projects-page.component.html @@ -1,18 +1,19 @@ +
diff --git a/src/app/webapp-common/projects/dumb/projects-list/projects-list.component.ts b/src/app/webapp-common/projects/dumb/projects-list/projects-list.component.ts index da3b3ccb..d7f03eab 100755 --- a/src/app/webapp-common/projects/dumb/projects-list/projects-list.component.ts +++ b/src/app/webapp-common/projects/dumb/projects-list/projects-list.component.ts @@ -17,11 +17,13 @@ export class ProjectsListComponent { private _projects: Project[]; public projectsNames: string[]; totalVirtualCards = 1; + public loading: boolean; @Input() set projects(projects: Array) { this._projects = projects; this.projectsNames = projects?.map(p => p.basename); this.totalVirtualCards = projects?.[1]?.['isRoot'] ? 2 : 1; + this.loading = false; } get projects() { @@ -36,5 +38,10 @@ export class ProjectsListComponent { @Output() loadMore = new EventEmitter(); @Output() moveToClicked = new EventEmitter(); @Output() createNewProjectClicked = new EventEmitter(); + @Output() projectEditClicked = new EventEmitter(); + loadMoreAction() { + this.loading = true; + this.loadMore.emit(); + } } 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 5ecf4cca..26a9b566 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 @@ -1,9 +1,9 @@ +
Report name - Please add name. - Report name already exists. - Report name should contain more than 3 characters. + Please add name. + Report name already exists. + Report name should contain more than 3 characters. - - - Project - - - Please provide a project - Please provide a different name as this project name is taken as an Example project - - - - - - - - - - -
{{project.label}}
- -
- -
- - - + > + - Please add description. + Please add description. Description
diff --git a/src/app/webapp-common/reports/report-dialog/create-new-report-form/create-new-report-form.component.ts b/src/app/webapp-common/reports/report-dialog/create-new-report-form/create-new-report-form.component.ts index 9c5fcd54..54e1b02a 100644 --- a/src/app/webapp-common/reports/report-dialog/create-new-report-form/create-new-report-form.component.ts +++ b/src/app/webapp-common/reports/report-dialog/create-new-report-form/create-new-report-form.component.ts @@ -1,22 +1,19 @@ import { ChangeDetectionStrategy, - Component, - EventEmitter, - Input, - OnChanges, OnDestroy, OnInit, - Output, - ViewChild + Component, computed, effect, + EventEmitter, inject, input, + Output, signal, } from '@angular/core'; -import {NgModel} from '@angular/forms'; -import {Observable, Subscription} from 'rxjs'; +import {FormBuilder, Validators} from '@angular/forms'; import {Project} from '~/business-logic/model/projects/project'; import {trackByValue} from '@common/shared/utils/forms-track-by'; -import {MatOptionSelectionChange} from '@angular/material/core'; import {rootProjectsPageSize} from '@common/constants'; -import { - IOption -} from '@common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component'; +export interface NewReportData { + name: string; + description: string; + project: Project; +} @Component({ selector: 'sm-create-new-report-form', @@ -24,112 +21,81 @@ import { styleUrls: ['./create-new-report-form.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class CreateNewReportFormComponent implements OnChanges, OnInit, OnDestroy { - public filteredProjects$: Observable<{ label: string; value: string }[]>; - private _projects: Project[]; - public projectsOptions: { label: string; value: string }[]; +export class CreateNewReportFormComponent { + private builder = inject(FormBuilder); + public trackByValue = trackByValue; - public panelHeight: number; - private subs = new Subscription(); - private rootFiltered: boolean; - public readonly projectsRoot = {label: 'Projects root', value: null}; - @ViewChild('projectInput') projectInput: NgModel; - - public reportsNames: Array; - public projectsNames: Array; - public report: { name: string; description: string; project: { label: string; value: string } } = { - name: null, + private createNew: string; + public readonly projectsRoot = {name: 'Projects root', id: null}; + + // public reportsNames: string[]; + protected reportForm = this.builder.group({ + name: [null as string, [Validators.required, Validators.minLength(3)]], description: '', - project: null - }; - filterText: string = ''; - isAutoCompleteOpen: boolean; + project: [null as string, [Validators.required, Validators.minLength(3)]] + }); - @Input() readOnlyProjectsNames: string[]; - @Input() defaultProjectId: string; - public loading: boolean; - public noMoreOptions: boolean; - private previousLength: number | undefined; - - @Input() set projects(projects: Project[]) { - this.loading = false; - this.noMoreOptions = projects?.length === this.previousLength || projects?.length < rootProjectsPageSize; - this.previousLength = projects?.length; - this._projects = projects; - this.projectsOptions = [ - ...((this.rootFiltered || projects === null) ? [] : [this.projectsRoot]), - ...(projects ? projects.map(project => ({label: project.name, value: project.id})) : []) - ]; - this.projectsNames = this.projectsOptions.map(project => project.label); - } + filterText = ''; + isAutoCompleteOpen: boolean; - get projects() { - return this._projects; - } + readOnlyProjectsNames = input(); + defaultProjectId = input(); + projects = input(null); @Output() filterSearchChanged = new EventEmitter<{value: string; loadMore?: boolean}>(); - @Output() reportCreated = new EventEmitter(); - - ngOnInit(): void { - this.searchChanged(['*', null].includes(this.defaultProjectId) ? '' : this.defaultProjectId); - setTimeout(() => { - this.subs.add(this.projectInput.valueChanges.subscribe(searchString => { - if (searchString !== this.report.project) { - this.searchChanged(searchString?.label || searchString || ''); - } - }) - ); + @Output() reportCreated = new EventEmitter(); + + protected loading = signal(true); + private initialized = false; + protected noMoreOptions = computed(() => this.projects()?.length < rootProjectsPageSize); + protected projectsOptions = computed(() => [ + ...((this.reportForm.controls.project.value && !this.projectsRoot.name.toLowerCase().includes(this.reportForm.controls.project.value.toLowerCase()) || this.projects() === null) ? [] : [this.projectsRoot]), + ...(this.projects() ?? []) + ]); + protected projectsNames = computed(() => [this.projectsRoot.name, ...this.projectsOptions().map(project => project.name)]); + + + constructor() { + effect(() => { + if (this.projects() !== null) { + this.loading.set(false); + } + }, {allowSignalWrites: true}); + + effect(() => { + if (this.projects()?.length > 0 && !this.initialized) { + this.initialized = true; + this.reportForm.controls.project.setValue(this.projectsOptions().find(p => p.id === this.defaultProjectId())?.name || this.projectsRoot.name); + this.reportForm.controls.project.updateValueAndValidity(); + } }); - } - ngOnDestroy(): void { - this.subs.unsubscribe(); - } - - ngOnChanges(): void { - if (this.projects?.length > 0 && this.report.project === null) { - this.report.project = this.projectsOptions.find(p => p.value === this.defaultProjectId) || {label: this.projectsRoot.label, value: null}; - this.projectInput.control.updateValueAndValidity(); - } - } - - createNewSelected($event: MatOptionSelectionChange) { - this.report.project = {label: $event.source.value, value: null}; - } - - projectSelected($event: MatOptionSelectionChange) { - this.report.project = {label: $event.source.value.label, value: $event.source.value.value}; - } - setIsAutoCompleteOpen(focus: boolean) { - this.isAutoCompleteOpen = focus; - } - - displayFn(project: IOption | string) { - return typeof project === 'string' ? project : project?.label; + effect(() => { + this.searchChanged(['*', null].includes(this.defaultProjectId()) ? '' : this.defaultProjectId()); + }); } - clear() { - this.projectInput.control.setValue(''); + createNewSelected($event: string) { + this.createNew = $event; } send() { - this.reportCreated.emit(this.report); + const project = this.reportForm.controls.project.value; + this.reportCreated.emit({ + ...this.reportForm.value, + project: project === this.createNew ? {name: project} : this.projectsOptions().find(p => p.name === project) + } as NewReportData); } searchChanged(searchString: string) { - this.projectsOptions = null; - this.projectsNames = null; - this.rootFiltered = searchString && !this.projectsRoot.label.toLowerCase().includes(searchString.toLowerCase()); - searchString !== null && this.filterSearchChanged.emit({value: searchString, loadMore: false}); - } - - loadMore(searchString) { - this.loading = true; - this.filterSearchChanged.emit({value: searchString || '', loadMore: true}); + if (searchString !== null) { + this.filterSearchChanged.emit({value: searchString, loadMore: false}); + } } - isFocused(locationRef: HTMLInputElement) { - return document.activeElement === locationRef; + loadMore(term: string, loadMore: boolean) { + this.loading.set(true); + this.filterSearchChanged.emit({value: term || '', loadMore}); } } diff --git a/src/app/webapp-common/reports/report-dialog/report-dialog.component.html b/src/app/webapp-common/reports/report-dialog/report-dialog.component.html index c2fe1d89..3b428779 100644 --- a/src/app/webapp-common/reports/report-dialog/report-dialog.component.html +++ b/src/app/webapp-common/reports/report-dialog/report-dialog.component.html @@ -1,7 +1,7 @@ , - @Inject(MAT_DIALOG_DATA) public data: { defaultProjectId: string} + @Inject(MAT_DIALOG_DATA) public data: { defaultProjectId: string } ) { this.projects$ = this.store.select(selectTablesFilterProjectsOptions); this.readOnlyProjectsNames$ = this.store.select(selectTablesFilterProjectsOptions) - .pipe(map(projects => projects?.filter(project => isReadOnly(project)).map(project=> project.name))); + .pipe(map(projects => projects?.filter(project => isReadOnly(project)).map(project => project.name))); this.store.dispatch(resetTablesFilterProjectsOptions()); } - public createReport(reportForm) { + public createReport(reportForm: NewReportData) { const report = this.convertFormToReport(reportForm); this.matDialogRef.close(report); } - - private convertFormToReport(reportForm: any): ReportsCreateRequest { + private convertFormToReport(reportForm: NewReportData): IReportsCreateRequest { return { name: reportForm.name, comment: reportForm.description, - project:reportForm.project.value + project: reportForm.project.id, + projectName: reportForm.project.name }; } - filterSearchChanged($event: {value: string; loadMore?: boolean}) { + filterSearchChanged($event: { value: string; loadMore?: boolean }) { !$event.loadMore && this.store.dispatch(resetTablesFilterProjectsOptions()); - this.store.dispatch(getTablesFilterProjectsOptions({searchString: $event.value || '', loadMore: $event.loadMore, allowPublic: false})); + this.store.dispatch(getTablesFilterProjectsOptions({ + searchString: $event.value || '', + loadMore: $event.loadMore, + allowPublic: false + })); } } diff --git a/src/app/webapp-common/reports/report/report.component.html b/src/app/webapp-common/reports/report/report.component.html index aabbaf6e..f99dbeeb 100644 --- a/src/app/webapp-common/reports/report/report.component.html +++ b/src/app/webapp-common/reports/report/report.component.html @@ -1,6 +1,6 @@
{{report?.name}}
-
+
@@ -96,7 +96,7 @@ [readOnly]="!draft || example" [resources]="resources" [handleUpload]="handleUpload" - [blockUserScripts]="blockUserScripts$ | async" + [blockUserScripts]="blockUserScripts$ | ngrxPush" (saveInfo)="save($event)" (editModeChanged)="editModeChanged();" (dirtyChanged)="dirtyChanged($event);" diff --git a/src/app/webapp-common/reports/report/report.component.ts b/src/app/webapp-common/reports/report/report.component.ts index 7c66c9ec..3d7792d5 100644 --- a/src/app/webapp-common/reports/report/report.component.ts +++ b/src/app/webapp-common/reports/report/report.component.ts @@ -89,11 +89,11 @@ export class ReportComponent implements OnInit, OnDestroy { th: {border: '1px solid gray'}, td: {border: '1px solid gray'}, details: {border: '1px solid #ccc', margin: '6px 0', padding: '6px'}, - // eslint-disable-next-line @typescript-eslint/naming-convention + code: {'white-space': 'pre'}, iframe: {border: 'none', width: '840px'} }; - public widthExpanded: boolean = false; + public widthExpanded = false; public handleUpload: (files: File[]) => Promise; public showDescription = false; public resources: { unused: boolean; url: string }[]; @@ -132,7 +132,7 @@ export class ReportComponent implements OnInit, OnDestroy { .subscribe(id => this.store.dispatch(getReport({id}))) ); - this.handleUpload = (files: Array): Promise => { + this.handleUpload = (files: File[]): Promise => { this.store.dispatch(activeLoader('upload')); const filesServerUrl = convertToReverseProxy(HTTP.FILE_BASE_URL); @@ -180,7 +180,10 @@ export class ReportComponent implements OnInit, OnDestroy { .forEach(file => { const url = `reports/${this.report.id}/${replaceSlash(file.name)}`; formData.append(url, file); - results.push({name: file.name, url: `${filesServerUrl}/${url}`, isImg: true}); + results.push({ + name: file.name, + url: `${filesServerUrl}/${encodeURI(url)}`, + isImg: true}); }); return this.http.post(filesServerUrl, formData, {withCredentials: true}) @@ -194,7 +197,7 @@ export class ReportComponent implements OnInit, OnDestroy { this.store.dispatch(deactivateLoader('upload')); this.store.dispatch(updateReport({ id: this.report.id, - // eslint-disable-next-line @typescript-eslint/naming-convention + changes: {report_assets: Array.from(new Set((this.report.report_assets || []).concat(results.map(r => r.url))))} })); return results; 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 556153d0..48dbcd6c 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,8 +1,8 @@ -
+
- + -
- +
+
diff --git a/src/app/webapp-common/reports/reports-list/reports-list.component.ts b/src/app/webapp-common/reports/reports-list/reports-list.component.ts index 223ae958..80e983a9 100644 --- a/src/app/webapp-common/reports/reports-list/reports-list.component.ts +++ b/src/app/webapp-common/reports/reports-list/reports-list.component.ts @@ -1,4 +1,4 @@ -import {Component, EventEmitter, Input, Output} from '@angular/core'; +import {Component, effect, EventEmitter, input, Input, Output} from '@angular/core'; import {trackById} from '@common/shared/utils/forms-track-by'; import {pageSize} from '@common/projects/common-projects.consts'; import {IReport} from '../reports.consts'; @@ -9,8 +9,15 @@ import {IReport} from '../reports.consts'; styleUrls: ['./reports-list.component.scss'] }) export class ReportsListComponent { + constructor() { + effect(() => { + if (this.reports()) { + this.loading = false; + } + }); + } pageSize = pageSize; - @Input() reports = [] as IReport[]; + reports = input([]); @Input() hideMenu = false; @Input() noMoreReports = false; @Input() allTags: string[] = []; @@ -18,15 +25,21 @@ export class ReportsListComponent { @Input() projectId; @Output() reportSelected = new EventEmitter(); @Output() loadMore = new EventEmitter(); - @Output() reportCardUpdateMetadata = new EventEmitter<{report: IReport; readOnly: boolean}>(); - @Output() reportCardUpdateName = new EventEmitter<{name: string; report: IReport}>(); + @Output() reportCardUpdateMetadata = new EventEmitter<{ report: IReport; readOnly: boolean }>(); + @Output() reportCardUpdateName = new EventEmitter<{ name: string; report: IReport }>(); @Output() newReport = new EventEmitter(); - @Output() addTag = new EventEmitter<{report: IReport; tag: string}>(); - @Output() moveToArchive = new EventEmitter<{report: IReport; archive: boolean}>(); - @Output() removeTag = new EventEmitter<{report: IReport; tag: string}>(); + @Output() addTag = new EventEmitter<{ report: IReport; tag: string }>(); + @Output() moveToArchive = new EventEmitter<{ report: IReport; archive: boolean }>(); + @Output() removeTag = new EventEmitter<{ report: IReport; tag: string }>(); @Output() moveTo = new EventEmitter(); @Output() delete = new EventEmitter(); @Output() share = new EventEmitter(); trackByFn = trackById; + loading: boolean; + + loadMoreAction() { + this.loading = true; + this.loadMore.emit(); + } } diff --git a/src/app/webapp-common/reports/reports-page/reports-page.component.html b/src/app/webapp-common/reports/reports-page/reports-page.component.html index 0cd86efb..0ec5a5d5 100644 --- a/src/app/webapp-common/reports/reports-page/reports-page.component.html +++ b/src/app/webapp-common/reports/reports-page/reports-page.component.html @@ -1,9 +1,9 @@ () + props<{ reportsCreateRequest: IReportsCreateRequest }>() ); export const resetReports = createAction(REPORTS_PREFIX + '[reset reports]'); diff --git a/src/app/webapp-common/reports/reports.effects.ts b/src/app/webapp-common/reports/reports.effects.ts index 7583f531..6ae52052 100644 --- a/src/app/webapp-common/reports/reports.effects.ts +++ b/src/app/webapp-common/reports/reports.effects.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Action, Store} from '@ngrx/store'; import {ActivatedRoute, Router} from '@angular/router'; import {catchError, filter, map, mergeMap, switchMap, tap} from 'rxjs/operators'; @@ -64,6 +65,8 @@ import {selectRouterParams} from '@common/core/reducers/router-reducer'; import {setMainPageTagsFilter} from '@common/core/actions/projects.actions'; import {cleanTag} from '@common/shared/utils/helpers.util'; import {excludedKey, getTagsFilters} from '@common/shared/utils/tableParamEncode'; +import {of} from 'rxjs'; +import {ApiProjectsService} from '~/business-logic/api-services/projects.service'; @Injectable() export class ReportsEffects { @@ -74,6 +77,7 @@ export class ReportsEffects { private route: ActivatedRoute, private router: Router, private reportsApiService: ApiReportsService, + private projectsApi: ApiProjectsService, private http: HttpClient, private matDialog: MatDialog ) { @@ -87,16 +91,20 @@ export class ReportsEffects { createReport$ = createEffect(() => this.actions.pipe( ofType(createReport), - switchMap((action) => this.reportsApiService.reportsCreate(action.reportsCreateRequest) - .pipe(mergeMap((res: ReportsCreateResponse) => { - this.router.navigate(['reports', res.project_id, res.id]); - return [deactivateLoader(createReport.type)]; - }), - catchError(err => [ - requestFailed(err), - setServerError(err, null, 'failed to create a new report'), - deactivateLoader(createReport.type), - ]))) + switchMap((action) => action.reportsCreateRequest.project !== undefined ? of(action) : + this.projectsApi.projectsCreate({name: action.reportsCreateRequest.projectName}).pipe( + map((res) => ({...action, reportsCreateRequest:{...action.reportsCreateRequest, project: res.id}})) + )), + switchMap((action) => this.reportsApiService.reportsCreate(action.reportsCreateRequest)), + mergeMap((res: ReportsCreateResponse) => { + this.router.navigate(['reports', res.project_id, res.id]); + return [deactivateLoader(createReport.type)]; + }), + catchError(err => [ + requestFailed(err), + setServerError(err, null, 'failed to create a new report'), + deactivateLoader(createReport.type), + ]) )); getReports = createEffect(() => this.actions.pipe( @@ -116,7 +124,7 @@ export class ReportsEffects { ]), switchMap(([action, scroll, archive, orderBy, sortOrder, showOnlyUserWork, mainPageTagsFilter, mainPageTagsFilterMatchMode, user, searchQuery, hideExamples, projectId]) => this.reportsApiService.reportsGetAllEx({ - /* eslint-disable @typescript-eslint/naming-convention */ + only_fields: ['name', 'comment', 'company', 'tags', 'report', 'project.name', 'user.name', 'status', 'last_update', 'system_tags'] as (keyof Report)[], size: PAGE_SIZE, project: projectId === '*' ? null : projectId, @@ -136,7 +144,7 @@ export class ReportsEffects { fields: ['id', 'name', 'tags', 'project', 'comment', 'report'] } }) - /* eslint-enable @typescript-eslint/naming-convention */ + }) .pipe( mergeMap((res: ReportsGetAllExResponse) => [ @@ -189,7 +197,7 @@ export class ReportsEffects { map(() => action))), switchMap(action => this.reportsApiService.reportsGetAllEx({ id: [action.id], - // eslint-disable-next-line @typescript-eslint/naming-convention + only_fields: ['name', 'status', 'company.id', 'user.id', 'comment', 'report', 'tags', 'system_tags', 'report_assets', 'project.name'] })), tap(res => { @@ -238,10 +246,10 @@ export class ReportsEffects { type: 'report' } }).afterClosed() - // eslint-disable-next-line @typescript-eslint/naming-convention + .pipe( filter(project => !!project), - // eslint-disable-next-line @typescript-eslint/naming-convention + map(project => ({task: action.report.id, project: project.id, project_name: project.name})) ) ), @@ -318,10 +326,10 @@ export class ReportsEffects { ...(!action.skipUndo ? [addMessage(MESSAGES_SEVERITY.SUCCESS, 'Report archived successfully', [null, ...undoActions ].filter(a => a))] : []), - // eslint-disable-next-line @typescript-eslint/naming-convention + setReportChanges({ id: action.report.id, - // eslint-disable-next-line @typescript-eslint/naming-convention + changes: {system_tags: (action.report.system_tags || []).concat('archived')} }) ]; @@ -355,7 +363,7 @@ export class ReportsEffects { [(addMessage(MESSAGES_SEVERITY.SUCCESS, 'Report restored successfully', [null, ...undoActions].filter(a => a)))] : []), setReportChanges({ id: action.report.id, - // eslint-disable-next-line @typescript-eslint/naming-convention + changes: {system_tags: (action.report.system_tags || []).filter(tag => tag !== 'archived')} }) ]; @@ -412,7 +420,7 @@ export class ReportsEffects { mergeMap(([, report]) => [updateReport({ id: report.id, changes: { - // eslint-disable-next-line @typescript-eslint/naming-convention + report_assets: report.report_assets?.filter(r => r !== action.resource), } })]) diff --git a/src/app/webapp-common/reports/reports.module.ts b/src/app/webapp-common/reports/reports.module.ts index 745c38cd..6ed8455c 100644 --- a/src/app/webapp-common/reports/reports.module.ts +++ b/src/app/webapp-common/reports/reports.module.ts @@ -47,6 +47,19 @@ import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indic import {DotsLoadMoreComponent} from '@common/shared/ui-components/indicators/dots-load-more/dots-load-more.component'; import {ReportCardComponent} from '@common/reports/report-card/report-card.component'; import {CommonProjectsModule} from '@common/projects/common-projects.module'; +import {PushPipe} from '@ngrx/component'; +import {StringIncludedInArrayPipe} from '@common/shared/pipes/string-included-in-array.pipe'; +import { + PaginatedEntitySelectorComponent +} from '@common/shared/components/paginated-entity-selector/paginated-entity-selector.component'; +import { + InvalidPrefixValidatorDirective +} from '@common/shared/ui-components/template-forms-ui/invalid-prefix-validator.directive'; +import {ProjectLocationPipe} from '@common/shared/pipes/project-location.pipe'; +import {ShortProjectNamePipe} from '@common/shared/pipes/short-project-name.pipe'; +import { + UniquePathValidatorDirective +} from '@common/shared/ui-components/template-forms-ui/unique-path-validator.directive'; const reportsSyncedKeys = ['orderBy', 'sortOrder']; @@ -94,7 +107,14 @@ const getInitState = (userPreferences: UserPreferences) => ({ ScrollEndDirective, ClickStopPropagationDirective, ShowTooltipIfEllipsisDirective, - DotsLoadMoreComponent + DotsLoadMoreComponent, + PushPipe, + StringIncludedInArrayPipe, + PaginatedEntitySelectorComponent, + InvalidPrefixValidatorDirective, + ProjectLocationPipe, + ShortProjectNamePipe, + UniquePathValidatorDirective ], declarations: [ReportsPageComponent, ReportsListComponent, ReportsHeaderComponent, ReportDialogComponent, CreateNewReportFormComponent, ReportComponent], diff --git a/src/app/webapp-common/select-model/select-model.actions.ts b/src/app/webapp-common/select-model/select-model.actions.ts index 873f219e..21a8bbbd 100755 --- a/src/app/webapp-common/select-model/select-model.actions.ts +++ b/src/app/webapp-common/select-model/select-model.actions.ts @@ -29,7 +29,6 @@ export const setTableSort = createAction(`${SELECT_MODEL_PREFIX} 'set table sort export const showArchive = createAction(`${SELECT_MODEL_PREFIX} show archive`, props<{showArchive: boolean}>()); export const clearTableFilter = createAction(`${SELECT_MODEL_PREFIX} table filter clear`); export const tableFilterChanged = createAction(`${SELECT_MODEL_PREFIX} table filter changed`, props<{ col: ISmCol; value: any }>()); - export const globalFilterChanged = createAction(`${SELECT_MODEL_PREFIX} global filter changed`, props<{ filter: string }>()); export const setCurrentScrollId = createAction(SELECT_MODEL_PREFIX + 'set current scrollId', props<{ scrollId: string }>()); @@ -37,3 +36,8 @@ export const setCurrentScrollId = createAction(SELECT_MODEL_PREFIX + 'set curren export const setViewMode = createAction(`${SELECT_MODEL_PREFIX} set view mode`, props<{ viewMode: ModelsViewModesEnum }>()); export const resetSelectModelState = createAction(`${SELECT_MODEL_PREFIX} reset state`, props<{fullReset: boolean}>()); + +export const getFrameworks = createAction(`${SELECT_MODEL_PREFIX} get frameworks`); +export const setFrameworks = createAction(`${SELECT_MODEL_PREFIX} set frameworks`, props<{ frameworks: string[] }>()); +export const getTags = createAction(`${SELECT_MODEL_PREFIX} get tags`); +export const setTags = createAction(`${SELECT_MODEL_PREFIX} set tags`, props<{ tags: string[] }>()); diff --git a/src/app/webapp-common/select-model/select-model.component.html b/src/app/webapp-common/select-model/select-model.component.html index b2cd7028..1b758f7a 100755 --- a/src/app/webapp-common/select-model/select-model.component.html +++ b/src/app/webapp-common/select-model/select-model.component.html @@ -3,12 +3,12 @@
; - private columns$: Observable; - private metadataTableCols$: Observable; public tableCols$: Observable; - public metadataColsOptions$: Observable>; public showArchive$: Observable; constructor(private store: Store, @@ -83,7 +79,7 @@ export class SelectModelComponent implements OnInit, OnDestroy { this.noMoreModels$ = this.store.select(selectNoMoreModels); this.showArchive$ = this.store.select(selectShowArchive); this.users$ = this.store.select(selectAllProjectsUsers); - this.tags$ = this.store.select(selectModelsTags); + this.tags$ = this.store.select(selectTags); this.systemTags$ = this.store.select(selectProjectSystemTags); this.subs.add(this.store.select(selectSelectedProject).pipe(debounceTime(100)) .subscribe(selectedProject => { @@ -92,19 +88,12 @@ export class SelectModelComponent implements OnInit, OnDestroy { this.store.dispatch(actions.tableFilterChanged({col: {id: 'project.name'}, value: [selectedProject.id]})); } })); - this.frameworks$ = this.store.select(selectModelsFrameworks); + this.frameworks$ = this.store.select(selectFrameworks); this.projectsOptions$ = this.store.select(selectTablesFilterProjectsOptions); - this.metadataColsOptions$ = this.store.select(selectMetadataColsOptions); - this.columns$ = this.store.select(selectModelTableColumns); - this.metadataTableCols$ = this.store.select(selectMetadataColsForProject); - this.tableCols$ = combineLatest([this.columns$, this.metadataTableCols$]) + this.tableCols$ = of(this.tableCols) .pipe( - map(([tableCols, metricCols]) => - (tableCols.length > 0 ? tableCols : this.tableCols) - .concat(metricCols.map(col => ({...col, metric: true}))) - ), distinctUntilChanged((a, b) => isEqual(a, b)), map(cols => cols.filter(col => (!col.hidden || col.id === 'project.name')).map(col => ({ ...col, @@ -126,9 +115,9 @@ export class SelectModelComponent implements OnInit, OnDestroy { ngOnInit() { this.store.dispatch(resetTablesFilterProjectsOptions()); this.store.dispatch(actions.getNextModels()); + this.store.dispatch(actions.getFrameworks()); + this.store.dispatch(actions.getTags()); this.data.selectedModels && this.store.dispatch(actions.getSelectedModels({selectedIds: this.data.selectedModels})); - this.store.dispatch(modelsActions.getAllProjectsFrameworks()); - this.store.dispatch(modelsActions.getTagsForAllProjects()); window.setTimeout(() => this.table.table.rowRightClick = new EventEmitter()); } diff --git a/src/app/webapp-common/select-model/select-model.effects.ts b/src/app/webapp-common/select-model/select-model.effects.ts index 49b102ae..45630032 100755 --- a/src/app/webapp-common/select-model/select-model.effects.ts +++ b/src/app/webapp-common/select-model/select-model.effects.ts @@ -1,6 +1,7 @@ -import {Injectable} from '@angular/core'; +import {inject, Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import * as actions from './select-model.actions'; import {getNextModels, getSelectedModels, setSelectedModels, setSelectedModelsList} from './select-model.actions'; import * as exSelectors from './select-model.reducer'; @@ -11,7 +12,7 @@ import {get} from 'lodash-es'; import {MODEL_TAGS, MODELS_TABLE_COL_FIELDS} from '../models/shared/models.const'; import {ApiModelsService} from '~/business-logic/api-services/models.service'; import {requestFailed} from '../core/actions/http.actions'; -import {activeLoader, deactivateLoader, setServerError} from '../core/actions/layout.actions'; +import {activeLoader, addMessage, deactivateLoader, setServerError} from '../core/actions/layout.actions'; import {addMultipleSortColumns} from '../shared/utils/shared-utils'; import {of} from 'rxjs'; import {FilterMetadata} from 'primeng/api/filtermetadata'; @@ -19,22 +20,65 @@ import {ModelsGetAllExRequest} from '~/business-logic/model/models/modelsGetAllE import {SortMeta} from 'primeng/api'; import {createFiltersFromStore, encodeOrder, excludedKey, getTagsFilters} from '../shared/utils/tableParamEncode'; import {escapeRegex} from '@common/shared/utils/escape-regex'; -import {selectMetadataColsForProject} from '@common/models/reducers'; import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {selectRouterProjectId} from '@common/core/reducers/projects.reducer'; +import {selectRouterParams} from '@common/core/reducers/router-reducer'; +import {ApiProjectsService} from '~/business-logic/api-services/projects.service'; @Injectable() export class SelectModelEffects { private selectModelsOnlyFields = ['created', 'framework', 'id', 'labels', 'name', 'ready', 'tags', 'system_tags', 'task.name', 'uri', 'user.name', 'parent', 'design', 'company', 'project.name', 'comment', 'last_update']; - constructor(private actions$: Actions, private store: Store, private apiModels: ApiModelsService) { - } + private actions$ = inject(Actions); + private store = inject(Store); + private apiModels = inject(ApiModelsService); + private apiProjects = inject(ApiProjectsService); activeLoader = createEffect(() => this.actions$.pipe( ofType(actions.getNextModels, actions.globalFilterChanged, actions.tableSortChanged, actions.tableFilterChanged), map(action => activeLoader(action.type)) )); + getFrameworksEffect = createEffect(() => this.actions$.pipe( + ofType(actions.getFrameworks), + concatLatestFrom(() => + this.store.select(selectRouterParams).pipe(map(params => params?.projectId ?? '*')), + ), + switchMap(([, projectId]) => this.apiModels.modelsGetFrameworks({projects: projectId !== '*' ? [projectId] : []}) + .pipe( + mergeMap(res => [ + actions.setFrameworks({frameworks: res.frameworks.concat(null)}), + ]), + catchError(error => [ + requestFailed(error), + addMessage('warn', 'Fetch frameworks failed', [{ + name: 'More info', + actions: [setServerError(error, null, 'Fetch frameworks failed')] + }])] + ) + ) + ) + )); + + getTagsEffect = createEffect(() => this.actions$.pipe( + ofType(actions.getTags), + concatLatestFrom(() => this.store.select(selectRouterParams).pipe(map(params => params?.projectId ?? '*'))), + switchMap(([, projectId]) => this.apiProjects.projectsGetModelTags({ + projects: (projectId === '*') ? [] : [projectId] + }).pipe( + mergeMap(res => [ + actions.setTags({tags: res.tags.concat(null)}), + ]), + catchError(error => [ + requestFailed(error), + addMessage('warn', 'Fetch tags failed', [{ + name: 'More info', + actions: [setServerError(error, null, 'Fetch tags failed')] + }])] + ) + )) + )); + tableSortChange = createEffect(() => this.actions$.pipe( ofType(actions.tableSortChanged), concatLatestFrom(() => this.store.select(selectTableSortFields)), @@ -92,7 +136,7 @@ export class SelectModelEffects { getGetAllQuery( scrollId: string, projectId: string, searchQuery: string, orderFields: SortMeta[], - tableFilters: { [s: string]: FilterMetadata }, showArchived: boolean, metadataCols: ISmCol[] + tableFilters: { [s: string]: FilterMetadata }, showArchived: boolean ): ModelsGetAllExRequest { const userFilter = get(tableFilters, [MODELS_TABLE_COL_FIELDS.USER, 'value']); const tagsFilter = tableFilters?.[MODELS_TABLE_COL_FIELDS.TAGS]?.value; @@ -120,7 +164,7 @@ export class SelectModelEffects { } }), system_tags: (systemTagsFilter && systemTagsFilter.length > 0) ? systemTagsFilter : [], - only_fields: [...this.selectModelsOnlyFields, ...metadataCols.map(col => col.id)], + only_fields: this.selectModelsOnlyFields, ...(tableFilters?.[MODELS_TABLE_COL_FIELDS.READY]?.value.length == 1 && !!tableFilters) ? {ready: tableFilters?.[MODELS_TABLE_COL_FIELDS.READY]?.value[0] === 'true'} : {ready: undefined}, ...(!window.location.href.includes('compare') && {ready: true}), @@ -139,11 +183,10 @@ export class SelectModelEffects { this.store.select(exSelectors.selectGlobalFilter), this.store.select(exSelectors.selectTableSortFields), this.store.select(exSelectors.selectSelectModelTableFilters), - this.store.select(exSelectors.selectShowArchive), - this.store.select(selectMetadataColsForProject), + this.store.select(exSelectors.selectShowArchive) ]), - switchMap(([scrollId, projectId, gb, sortFields, filters, showArchive, metadataCols]) => - this.apiModels.modelsGetAllEx(this.getGetAllQuery(scrollId, projectId, gb, sortFields, filters, showArchive, metadataCols)) + switchMap(([scrollId, projectId, gb, sortFields, filters, showArchive]) => + this.apiModels.modelsGetAllEx(this.getGetAllQuery(scrollId, projectId, gb, sortFields, filters, showArchive)) ) ); } diff --git a/src/app/webapp-common/select-model/select-model.module.ts b/src/app/webapp-common/select-model/select-model.module.ts index 84fc47ce..12ab1323 100755 --- a/src/app/webapp-common/select-model/select-model.module.ts +++ b/src/app/webapp-common/select-model/select-model.module.ts @@ -7,6 +7,7 @@ import {selectModelReducer} from './select-model.reducer'; import {SelectModelEffects} from './select-model.effects'; import {ModelSharedModule} from '../models/shared/model-shared.module'; import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dialog-template/dialog-template.component'; +import {PushPipe} from '@ngrx/component'; @NgModule({ imports: [ @@ -15,6 +16,7 @@ import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dial EffectsModule.forFeature([SelectModelEffects]), StoreModule.forFeature('selectModel', selectModelReducer), DialogTemplateComponent, + PushPipe, ], providers: [], declarations: [SelectModelComponent], diff --git a/src/app/webapp-common/select-model/select-model.reducer.ts b/src/app/webapp-common/select-model/select-model.reducer.ts index 6fc0ae34..43c501cf 100755 --- a/src/app/webapp-common/select-model/select-model.reducer.ts +++ b/src/app/webapp-common/select-model/select-model.reducer.ts @@ -22,6 +22,8 @@ export interface SelectModelState { scrollId: string; globalFilter: string; showArchive: boolean; + frameworks: string[]; + tags: string[]; } const selectModelInitState: SelectModelState = { @@ -37,7 +39,9 @@ const selectModelInitState: SelectModelState = { tableSortFields: [{field: MODELS_TABLE_COL_FIELDS.CREATED, order: TABLE_SORT_ORDER.DESC}], scrollId: null, globalFilter: null, - showArchive: null + showArchive: null, + frameworks: [], + tags: [] }; @@ -90,6 +94,10 @@ export function selectModelReducer(state: SelectModelState = sele return state; case actions.showArchive.type: return {...state, showArchive: action.showArchive}; + case actions.setFrameworks.type: + return {...state, frameworks: action.frameworks}; + case actions.setTags.type: + return {...state, tags: action.tags}; } } @@ -105,3 +113,5 @@ export const selectViewMode = createSelector(models, (state): ModelsViewModesEnu export const selectSelectedModels = createSelector(models, (state): Array => state.selectedModels); export const selectNoMoreModels = createSelector(models, (state): boolean => state.noMoreModels); export const selectShowArchive = createSelector(models, (state): boolean => state.showArchive); +export const selectFrameworks = createSelector(models, (state): string[] => state.frameworks); +export const selectTags = createSelector(models, (state): string[] => state.tags); diff --git a/src/app/webapp-common/serving/serving-general-info/serving-general-info.component.html b/src/app/webapp-common/serving/serving-general-info/serving-general-info.component.html new file mode 100644 index 00000000..285a563a --- /dev/null +++ b/src/app/webapp-common/serving/serving-general-info/serving-general-info.component.html @@ -0,0 +1,77 @@ +@for (kpi of kpis(); track kpi) { +
+ + @if (!kpi.href) { +
+ {{ kpi.value }} +
+ } + @if (kpi.href && kpi.value) { +
+ + {{ kpi.value }} + + +
+ } + @if (kpi.href && (!kpi.value)) { +
N/A
+ } + +
+} + +
MODEL INSTANCES LIST
+ + + @switch (col.id) { + @case ('id') { + @if (instancesLinks()?.[i]) { + + {{ instancesLinks()?.[i]?.name }} + + } @else { + + {{ row?.id }} + + } + } + @case ('uptime_sec') { + + {{ row?.uptime_sec | duration }} + + } + @case ('requests') { + + {{ row?.requests | number }} + + } + @case ('requests_min') { + + {{ row?.requests_min | number }} + + } + @case ('latency_ms') { + + {{ row?.latency_ms }}ms + + } + @default { + {{ row?.[col.id] }} + } + } + + + diff --git a/src/app/webapp-common/serving/serving-general-info/serving-general-info.component.scss b/src/app/webapp-common/serving/serving-general-info/serving-general-info.component.scss new file mode 100644 index 00000000..4dbb9592 --- /dev/null +++ b/src/app/webapp-common/serving/serving-general-info/serving-general-info.component.scss @@ -0,0 +1,44 @@ +@import "variables"; +@import "mixins/link"; + +:host { + display: flex; + flex-direction: column; + padding: 24px 16px 24px 24px; + + .preserve-spaces { + white-space: pre-wrap; + } + + ::ng-deep .editable-div .form-control { + height: 74px; + } + + .info-value { + height: 36px; + display: flex; + align-items: center; + sm-copy-clipboard { + visibility: hidden; + margin-left: 6px; + } + &:hover sm-copy-clipboard { + visibility: visible; + } + .link { + color: $blue-100; + &:hover { + color: white; + } + } + } + + .mid-title { + padding: 32px 0 12px; + } + + sm-table { + display: block; + height: 400px; + } +} diff --git a/src/app/webapp-common/serving/serving-general-info/serving-general-info.component.ts b/src/app/webapp-common/serving/serving-general-info/serving-general-info.component.ts new file mode 100644 index 00000000..b4592849 --- /dev/null +++ b/src/app/webapp-common/serving/serving-general-info/serving-general-info.component.ts @@ -0,0 +1,102 @@ +import {ChangeDetectionStrategy, Component, computed, inject, Signal} from '@angular/core'; +import {NA} from '~/app.constants'; +import {Store} from '@ngrx/store'; +import {DurationPipe} from '@common/shared/pipes/duration.pipe'; +import {servingFeature} from '@common/serving/serving.reducer'; +import {trackByIndex} from '@common/shared/utils/forms-track-by'; +import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; +import {TableComponent} from '@common/shared/ui-components/data/table/table.component'; +import {selectRouterParams} from '@common/core/reducers/router-reducer'; +import {combineLatestWith, debounceTime, distinctUntilChanged, filter, map} from 'rxjs/operators'; +import {ServingActions} from '@common/serving/serving.actions'; +import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; +import {fileSizeConfigStorage, FileSizePipe} from '@common/shared/pipes/filesize.pipe'; + +@Component({ + selector: 'sm-serving-general-info', + templateUrl: './serving-general-info.component.html', + styleUrls: ['./serving-general-info.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class ServingGeneralInfoComponent { + private store = inject(Store); + + private duration = new DurationPipe(); + private fileSize = new FileSizePipe(); + endpoint = this.store.selectSignal(servingFeature.selectEndpointDetails); + instancesLinks = this.store.selectSignal(servingFeature.selectInstancesLinks); + lines = computed(() => this.endpoint()?.instances); + + kpis: Signal<{ label: string; value: string; downloadable?: boolean; href?: string; task?: string }[]> = computed(() => { + if (this.endpoint()) { + const modelUrl = this.endpoint().instances[0]?.reference.find(ref => ref.type === 'url'); + return [ + {label: 'ENDPOINT NAME', value: this.endpoint().endpoint || NA}, + {label: 'ENDPOINT URL', value: this.endpoint().url || NA, href: ''}, + {label: 'MODEL NAME', value: this.endpoint().model || NA, href: modelUrl?.value}, + {label: 'UPTIME', value: this.endpoint().uptime_sec ? (this.duration.transform(this.endpoint().uptime_sec)) : NA}, + {label: 'PREPROCESS ARTIFACT', value: this.endpoint().preprocess_artifact || NA}, + {label: 'INPUT TYPE', value: this.endpoint().input_type || NA}, + {label: 'INPUT SIZE', value: this.endpoint().input_size ? this.fileSize.transform(this.endpoint().input_size, fileSizeConfigStorage) : NA} + ]; + } else { + return []; + } + }); + + columns: ISmCol[] = [ + { + id: 'id', + header: 'INSTANCE ID', + key: '', + bodyStyleClass: '' + }, + { + id: 'uptime_sec', + header: 'UPTIME', + key: '', + style: {maxWidth: '360px'} + }, + { + id: 'requests', + header: '# REQUESTS', + key: '' + }, { + id: 'requests_min', + header: 'REQUESTS/MIN', + key: '' + }, + { + id: 'cpu_count', + header: 'CPU COUNT', + key: '' + }, + { + id: 'gpu_count', + header: 'GPU COUNT', + key: '' + }, + { + id: 'latency_ms', + header: 'LATENCY', + key: '', + style: {maxWidth: '80px'} + } + ]; + public table: TableComponent<{ id: string }>; + + constructor() { + this.store.select(selectRouterParams) + .pipe( + takeUntilDestroyed(), + combineLatestWith(this.store.select(servingFeature.selectEndpoints)), + debounceTime(150), + filter(([params, endpoints]) => !!params?.endpointId && !!endpoints), + map(([params]) => params?.endpointId), + distinctUntilChanged() + ) + .subscribe(id => this.store.dispatch(ServingActions.getEndpointInfo({id}))); + } + + protected readonly trackByIndex = trackByIndex; +} diff --git a/src/app/webapp-common/serving/serving-header/serving-header.component.html b/src/app/webapp-common/serving/serving-header/serving-header.component.html new file mode 100644 index 00000000..28234064 --- /dev/null +++ b/src/app/webapp-common/serving/serving-header/serving-header.component.html @@ -0,0 +1,27 @@ +
+
+ @if (!hideNavigation()) { + + } +
+
+ @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 new file mode 100644 index 00000000..c072b2d5 --- /dev/null +++ b/src/app/webapp-common/serving/serving-header/serving-header.component.scss @@ -0,0 +1,53 @@ +@import '../../../shared/ui-components/styles/variables'; + +:host { + + .header-container { + padding-left: 24px; + height: 66px; + transition: background-color 0.5s; + + .hide-item { + visibility: hidden; + } + + ::ng-deep button { + border-color: $blue-600; + box-shadow: none; + } + + &.archive-mode { + transition: background-color 0.5s; + background-color: #333746; + + ::ng-deep button { + border-color: #636e97; + box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.16); + } + } + .right-buttons { + margin-right: 28px; + sm-custom-cols-menu { + margin-right: 25px; + } + sm-clear-filters-button { + margin-right: 24px; + } + .download-btn { + margin-right: 24px; + color: $blue-300; + + &.disabled { + opacity: 0.6; + cursor: default; + } + } + } + } +} + +sm-select-metric-for-custom-col { + display: block; + height: 640px; + max-height: calc(100vh - 120px); +} 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 new file mode 100644 index 00000000..69a2795d --- /dev/null +++ b/src/app/webapp-common/serving/serving-header/serving-header.component.ts @@ -0,0 +1,45 @@ +import {Component, computed, input, output } from '@angular/core'; +import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; +import {FilterMetadata} from 'primeng/api/filtermetadata'; +import {BaseEntityHeaderComponent} from '@common/shared/entity-page/base-entity-header/base-entity-header.component'; +import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; +import { + SelectionEvent +} 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'] +}) +export class ServingHeaderComponent extends BaseEntityHeaderComponent { + + minimizedView = input(); + tableFilters = input>(); + sharedView = input(false); + isArchived = input(); + hideArchiveToggle = input(); + disableCreateNewButton = input(); + metadataKeys = input(); + metricVariants = input(); + tableMode = input<'table' | 'info'>(); + rippleEffect = input(); + hideNavigation = input(); + tableCols = input(); + tableCols2 = computed(() => this.tableCols()?.filter(col => col.header !== '')); + + isArchivedChanged = output(); + addModelClicked = output(); + refreshListClicked = output(); + setAutoRefresh = output(); + selectedTableColsChanged = output(); + selectedMetricToShow = output(); + selectMetadataKeysActiveChanged = output(); + clearTableFilters = output>(); + addOrRemoveMetadataKeyFromColumns = output<{ + key: string; + show: boolean; + }>(); + tableModeChanged = output<'table' | 'info'>(); + removeColFromList = output(); +} diff --git a/src/app/webapp-common/serving/serving-info/serving-info.component.html b/src/app/webapp-common/serving/serving-info/serving-info.component.html new file mode 100644 index 00000000..7eadc1aa --- /dev/null +++ b/src/app/webapp-common/serving/serving-info/serving-info.component.html @@ -0,0 +1,15 @@ +
+
+ + + + + +
+
+ +
+
diff --git a/src/app/webapp-common/serving/serving-info/serving-info.component.scss b/src/app/webapp-common/serving/serving-info/serving-info.component.scss new file mode 100644 index 00000000..14cf1b3c --- /dev/null +++ b/src/app/webapp-common/serving/serving-info/serving-info.component.scss @@ -0,0 +1,72 @@ +@import "../../../layout/layout.scss"; + +:host { + + sm-serving-info-header { + display: block; + } + + sm-router-tab-nav-bar { + overflow: hidden; + flex-grow: 1; + } + + .serving-info-container { + height: calc(100% - 34px); + } + + } + + .serving-info-body { + height: calc(100% - 14px); + overflow: auto; + background-color: $blue-950; + } + + .tab-nav { + display: grid; + grid-template-columns: 200px 1fr 200px; + align-items: center; + background-color: $blue-700; + //border-bottom: 1px solid $dark-border; + padding-right: 30px; + + ::ng-deep .mat-mdc-tab-link.mdc-tab { + height: 48px !important; + + @media(max-width: 1200px) { + grid-template-columns: 0 1fr 200px; + } + } + + sm-router-tab-nav-bar { + overflow: hidden; + flex-grow: 1; + } + + .setting-icon { + margin-right: 30px; + margin-left: auto; + } + + sm-experiment-settings.maximized { + display: block; + padding-top: 6px; + } + + .refresh-position { + display: flex; + align-items: center; + margin-left: auto; + } + + .refreshIcon { + margin-right: 10px; + } + + sm-experiment-settings.maximized { + display: block; + padding-top: 6px; + } +} + 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 new file mode 100644 index 00000000..dc40882c --- /dev/null +++ b/src/app/webapp-common/serving/serving-info/serving-info.component.ts @@ -0,0 +1,92 @@ +import {ChangeDetectorRef, Component, OnDestroy, OnInit} from '@angular/core'; +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'; +import {ALL_PROJECTS_OBJECT} from '@common/core/effects/projects.effects'; +import {servingFeature} from '@common/serving/serving.reducer'; +import {EndpointStats} from '~/business-logic/model/serving/endpointStats'; +import {ServingActions} from '@common/serving/serving.actions'; + + +@Component({ + selector: 'sm-serving-info', + templateUrl: './serving-info.component.html', + styleUrls: ['./serving-info.component.scss'] +}) +export class ServingInfoComponent implements OnInit, OnDestroy { + public minimized: boolean; + + 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']}, + {name: 'monitor', url: ['monitor']} + ] as Link[]; + public isSharedAndNotOwner$: Observable; + private modelsFeature: boolean; + + constructor( + private router: Router, + private store: Store, + 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; + if (this.modelsFeature) { + this.store.dispatch(setSelectedProject({project: ALL_PROJECTS_OBJECT})); + this.store.dispatch(getCompanyTags()); + } + this.minimized = this.route.snapshot.firstChild?.data.minimized; + if (!this.minimized) { + this.setupBreadcrumbsOptions(); + } + } + + ngOnInit() { + this.sub.add(this.store.select(servingFeature.selectSelectedEndpoint) + .subscribe(model => { + this.selectedModel = model; + this.isExample = isReadOnly(model); + this.cdr.detectChanges(); + }) + ); + + this.selectedModel$ = this.store.select(servingFeature.selectSelectedEndpoint) + .pipe(filter(endpoint => !!endpoint)); + } + + ngOnDestroy(): void { + this.sub.unsubscribe(); + this.store.dispatch(ServingActions.setSelectedServingEndpoint({endpoint: null})); + this.store.dispatch(ServingActions.setTableViewMode({mode: 'table'})); + } + + setupBreadcrumbsOptions() { + this.store.dispatch(setBreadcrumbsOptions({ + breadcrumbOptions: { + showProjects: false, + featureBreadcrumb: {name: 'Model Endpoints'} + } + })); + } + + closePanel() { + this.router.navigate(['..'], {relativeTo: this.route, queryParamsHandling: 'merge'}); + } +} + diff --git a/src/app/webapp-common/serving/serving-loading.component.ts b/src/app/webapp-common/serving/serving-loading.component.ts new file mode 100644 index 00000000..00ada453 --- /dev/null +++ b/src/app/webapp-common/serving/serving-loading.component.ts @@ -0,0 +1,262 @@ +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 {FilterMetadata} from 'primeng/api/filtermetadata'; +import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; +import {distinctUntilChanged, filter, skip, tap} from 'rxjs/operators'; +import {isEqual} from 'lodash-es'; +import {Params} from '@angular/router'; +import {decodeColumns, decodeFilter, decodeOrder} from '@common/shared/utils/tableParamEncode'; +import {initSearch, resetSearch} from '@common/common-search/common-search.actions'; +import {BaseEntityPageComponent} from '@common/shared/entity-page/base-entity-page'; +import {modelServingRoutes, servingLoadingTableCols} from '@common/serving/serving.consts'; +import {ServingActions} from '@common/serving/serving.actions'; +import {ServingTableComponent} from '@common/serving/serving-table/serving-table.component'; +import {servingFeature} from '@common/serving/serving.reducer'; +import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; +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' +}) +export class ServingLoadingComponent extends BaseEntityPageComponent implements OnInit, OnDestroy { + public readonly originalTableColumns = servingLoadingTableCols; + public entityTypeEnum = EntityTypeEnum; + 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 override setSplitSizeAction = ServingActions.setSplitSize; + protected setTableModeAction = ServingActions.setTableViewMode; + private selectedEndpoints: EndpointStats[]; + private searchQuery$: Observable; + private readonly tagsFilter$: Observable; + private readonly companyTags$: Observable; + modelNamesOptions$ = this.store.select(servingFeature.modelLoadingNamesOptions); + inputTypesOptions$ = this.store.select(servingFeature.inputTypesOptions); + preprocessArtifactOptions$ = this.store.select(servingFeature.preprocessArtifactOptions); + + @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()); + let prevQueryParams: Params; + + this.sub.add(this.route.queryParams + .pipe( + filter(queryParams => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const {q, qreg, ...queryParamsWithoutSearch} = queryParams; + const equal = isEqual(queryParamsWithoutSearch, prevQueryParams); + prevQueryParams = queryParamsWithoutSearch; + return !equal; + }) + ) + .subscribe(params => { + if (Object.keys(params || {}).length === 0) { + this.emptyUrlInit(); + } else { + if (params.order) { + const orders = decodeOrder(params.order); + this.store.dispatch(ServingActions.setLoadingTableSort({orders})); + } + if (params.filter) { + const filters = decodeFilter(params.filter); + this.store.dispatch(ServingActions.setLoadingTableFilters({filters})); + } else { + if (params.order) { + this.store.dispatch(ServingActions.setLoadingTableFilters({filters: []})); + } + } + + if (params.columns) { + const [, , , , allIds] = decodeColumns(params.columns, this.originalTableColumns); + this.columnsReordered(allIds, false); + } + } + }) + ); + } + + override ngOnDestroy(): void { + super.ngOnDestroy(); + this.store.dispatch(ServingActions.resetState()); + this.stopSyncSearch(); + } + + private emptyUrlInit() { + this.store.dispatch(ServingActions.updateUrlParamsFromLoadingState()); + this.shouldOpenDetails = true; + } + + getSelectedEntities() { + return this.selectedEndpoints; + } + + stopSyncSearch() { + this.store.dispatch(resetSearch()); + this.store.dispatch(ServingActions.resetGlobalFilter()); + } + + 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()); + } + + + endpointsSelectionChanged(endpoints: EndpointStats[]) { + this.store.dispatch(ServingActions.setSelectedServingEndpoint({endpoint: endpoints[0]})); + } + + sortedChanged({colId, isShift}: { isShift: boolean; colId: string }) { + this.store.dispatch(ServingActions.loadingTableSortChanged({colId, isShift})); + } + + filterChanged({col, value, andFilter}: { col: ISmCol; value: any; andFilter?: boolean }) { + + this.store.dispatch(ServingActions.loadingTableFiltersChanged({ + filters: [{ + col: col.id, + value, + filterMatchMode: col.filterMatchMode || andFilter ? 'AND' : undefined + }], + })); + } + + refreshList(isAutorefresh: boolean) { + this.store.dispatch(ServingActions.refreshLoadingEndpoints({hideLoader: isAutorefresh, autoRefresh: isAutorefresh})); + } + + setAutoRefresh(autoRefresh: boolean) { + this.store.dispatch(setAutoRefresh({autoRefresh})); + } + + columnsReordered(cols: string[], updateUrl = true) { + this.store.dispatch(ServingActions.setLoadingColsOrder({cols})); + if (updateUrl) { + this.store.dispatch(ServingActions.updateUrlParamsFromLoadingState()); + } + } + + selectedTableColsChanged(col) { + // this.store.dispatch(ServingActions.toggleColHidden({columnId: col.id})); + } + + columnResized(event: { columnId: string; widthPx: number }) { + this.store.dispatch(ServingActions.setLoadingColumnWidth({...event})); + } + + refreshTagsList() { + // this.store.dispatch(ServingActions.getTags()); + } + + protected getParamId(params) { + return params?.endpointId; + } + + clearTableFiltersHandler(tableFilters: Record) { + const filters = Object.keys(tableFilters).map(col => ({col, value: []})); + this.store.dispatch(ServingActions.loadingTableFiltersChanged({filters})); + } + + getCustomMetrics() { + } + + removeColFromList(id: string) { + + } + + modeChanged(mode: 'table' | 'info') { + } + + override closePanel(queryParams?: Params): Promise { + return null + } + + selectedMetricToShow(event) { + } + + downloadTableAsCSV() { + this.table.table.downloadTableAsCSV(`ClearML All Endpoints`); + } + + override onFooterHandler(): void { + return; + } + override afterArchiveChanged() { + return; + } + + private setContextMenu() { + this.route.url + .pipe( + takeUntilDestroyed(), + filter(config => !!config), + ) .subscribe((conf) => { + const contextMenu = modelServingRoutes + .map(route => { + const baseLink = route.link.at(-1); + return { + ...route, + isActive: baseLink === conf[0]?.path + }; + }); + this.store.dispatch(headerActions.setTabs({contextMenu})); + }); + } + + endpointSelectionChanged(event: { endpoint: EndpointStats; openInfo?: boolean }) { + return event; + } + +} 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 new file mode 100644 index 00000000..0f02aaf1 --- /dev/null +++ b/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.html @@ -0,0 +1,51 @@ + + + +
+ + +
+ + +
+ + + + @for (timeFrame of timeFrameOptions; track timeFrame.label) { + + {{ timeFrame.label }} + + } + + +
+
+ @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 new file mode 100644 index 00000000..254029eb --- /dev/null +++ b/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.scss @@ -0,0 +1,50 @@ +@import "variables"; + +:host { + display: block; + height: 100%; + padding: 24px 8px 24px 0; +} + +mat-drawer { + background-color: $blue-950; +} + +mat-drawer-container { + width: 100%; + height: 100%; + background-color: $blue-950; +} + +.close { + cursor: pointer; + position: absolute; + right: 8px; + top: 6px; + z-index: 1; +} + +.header { + display: flex; + align-items: center; + justify-content: space-between; + margin: 0 8px 24px 24px; + + button { + padding: 6px; + display: inline-flex; + align-items: center; + background: transparent; + color: $blue-300; + border-color: $blue-300; + } + + .time-selector { + margin-left: auto; + } +} + +.charts-container { + overflow-y: auto; + height: calc(100% - 64px); +} 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 new file mode 100644 index 00000000..5afc66d5 --- /dev/null +++ b/src/app/webapp-common/serving/serving-monitor/serving-monitor.component.ts @@ -0,0 +1,96 @@ +import {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 {PushPipe} from '@ngrx/component'; +import {ServingStatsComponent} from '@common/serving/serving-stats/serving-stats.component'; +import {timeFrameOptions} from '@common/constants'; +import {MatFormField} from '@angular/material/form-field'; +import {MatOption} from '@angular/material/autocomplete'; +import {MatSelect} from '@angular/material/select'; +import {servingFeature} from '@common/serving/serving.reducer'; +import {FormsModule} from '@angular/forms'; +import {ServingActions} from '@common/serving/serving.actions'; +import {ServingGetEndpointMetricsHistoryRequest} from '~/business-logic/model/serving/servingGetEndpointMetricsHistoryRequest'; +import MetricTypeEnum = ServingGetEndpointMetricsHistoryRequest.MetricTypeEnum; +import {NgTemplateOutlet} from '@angular/common'; +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {SelectableListItem} from '@common/shared/ui-components/data/selectable-list/selectable-list.model'; + +@Component({ + selector: 'sm-serving-monitor', + standalone: true, + imports: [ + MatDrawerContent, + SelectableFilterListComponent, + MatDrawerContainer, + MatDrawer, + AngularSplitModule, + PushPipe, + ServingStatsComponent, + MatFormField, + MatOption, + MatSelect, + FormsModule, + NgTemplateOutlet, + TooltipDirective + ], + templateUrl: './serving-monitor.component.html', + styleUrl: './serving-monitor.component.scss' +}) +export class ServingMonitorComponent { + private store = inject(Store); + private elmRef = inject(ElementRef); + + private charts = viewChild>('charts'); + public searchTerm = signal(''); + public currentTimeFrame = this.store.selectSignal(servingFeature.selectStatsTimeFrame); + public hiddenCharts = this.store.selectSignal(servingFeature.selectHiddenCharts); + public selectedCharts = computed(() => + this.chartParamOptions.map(name => name.label).filter(metric => !this.hiddenCharts().includes(metric)) + ); + + timeFrameOptions = timeFrameOptions; + public chartParamOptions: { label: string; value: MetricTypeEnum }[] = [ + {label: 'NUMBER OF REQUESTS', value: MetricTypeEnum.Requests}, + {label: 'REQUESTS PER MINUTE', value: MetricTypeEnum.RequestsMin}, + {label: 'AVERAGE LATENCY (ms)', value: MetricTypeEnum.LatencyMs}, + {label: 'CPU COUNT', value: MetricTypeEnum.CpuCount}, + {label: 'GPU COUNT', value: MetricTypeEnum.GpuCount}, + {label: 'AVERAGE CPU LOAD (%)', value: MetricTypeEnum.CpuUtil}, + {label: 'AVERAGE GPU UTILIZATION (%)', value: MetricTypeEnum.GpuUtil}, + {label: 'MEMORY USAGE (GB)', value: MetricTypeEnum.RamTotal}, + {label: 'MEMORY FREE (GB)', value: MetricTypeEnum.RamFree}, + {label: 'VIDEO MEMORY USAGE (GB)', value: MetricTypeEnum.GpuRamTotal}, + {label: 'VIDEO MEMORY FREE (GB)', value: MetricTypeEnum.GpuRamFree}, + {label: 'NETWORK THROUGHPUT RX (MBps)', value: MetricTypeEnum.NetworkRx}, + {label: 'NETWORK THROUGHPUT TX (MBps)', value: MetricTypeEnum.NetworkTx} + ]; + + chartsList: SelectableListItem[] = this.chartParamOptions.map(option => ({name: option.label, value: option.label})); + + searchTermChanged(searchTerm: string) { + this.searchTerm.set(searchTerm); + } + + metricSelected(id: string) { + const element = this.charts().nativeElement.getElementsByClassName(id)?.[0] as HTMLDivElement; + if (element) { + this.charts().nativeElement.scrollTo({top: element.offsetTop - 60, behavior: 'smooth'}); + } else { + this.charts().nativeElement.scrollTo({top: 0, behavior: 'smooth'}); + } + } + + selectedMetricListChanged(selectedList: string[]) { + this.store.dispatch(ServingActions.setChartHidden({ + // hiddenList: selectedList as MetricTypeEnum[] + hiddenList: this.chartParamOptions.map(name => name.label).filter(metric => !selectedList.includes(metric)) as MetricTypeEnum[] + })); + } + + timeFrameChange(event) { + this.store.dispatch(ServingActions.setStatsTimeframe({timeFrame: event})); + } +} diff --git a/src/app/webapp-common/serving/serving-routing.module.ts b/src/app/webapp-common/serving/serving-routing.module.ts new file mode 100644 index 00000000..045f1959 --- /dev/null +++ b/src/app/webapp-common/serving/serving-routing.module.ts @@ -0,0 +1,60 @@ +import {RouterModule, Routes} from '@angular/router'; +import {NgModule} from '@angular/core'; +import {CrumbTypeEnum, IBreadcrumbsLink} from '@common/layout/breadcrumbs/breadcrumbs.component'; +import {ServingComponent} from '@common/serving/serving.component'; +import {ServingInfoComponent} from '@common/serving/serving-info/serving-info.component'; +import {ServingGeneralInfoComponent} from '@common/serving/serving-general-info/serving-general-info.component'; +import {ServingMonitorComponent} from '@common/serving/serving-monitor/serving-monitor.component'; +import {ServingLoadingComponent} from '@common/serving/serving-loading.component'; + +export const routes: Routes = [ + { + path: '', + data: { + staticBreadcrumb: [[{ + name: 'MODEL ENDPOINTS', + type: CrumbTypeEnum.Feature + } as IBreadcrumbsLink]] + }, + children: [ + { + path: 'active', component: ServingComponent, + children: [ + { + path: ':endpointId', component: ServingInfoComponent, + children: [ + {path: '', redirectTo: 'general', pathMatch: 'full', data: {minimized: true}}, + {path: 'general', component: ServingGeneralInfoComponent, data: { + minimized: true, + staticBreadcrumb: [[{ + name: 'MODEL ENDPOINTS', + type: CrumbTypeEnum.Feature + } as IBreadcrumbsLink]]} + }, + {path: 'monitor', component: ServingMonitorComponent, data: { + minimized: true, + staticBreadcrumb: [[{ + name: 'MODEL ENDPOINTS', + type: CrumbTypeEnum.Feature + } as IBreadcrumbsLink]]} + } + ] + } + ] + }, + { + path: 'loading', component: ServingLoadingComponent, + } + ] + } +]; + +@NgModule({ + imports: [ + RouterModule.forChild(routes) + ], + exports: [RouterModule] +}) +export class ServingRouterModule { +} + 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 new file mode 100644 index 00000000..657f9c0c --- /dev/null +++ b/src/app/webapp-common/serving/serving-stats/serving-stats.component.html @@ -0,0 +1,15 @@ +
+
+
{{ metricType().label }}
+
+
+
+ +
diff --git a/src/app/webapp-common/serving/serving-stats/serving-stats.component.scss b/src/app/webapp-common/serving/serving-stats/serving-stats.component.scss new file mode 100644 index 00000000..337cb566 --- /dev/null +++ b/src/app/webapp-common/serving/serving-stats/serving-stats.component.scss @@ -0,0 +1,42 @@ +@import "variables"; +@import "../../../../webapp-common/layout/layout.scss"; + +:host { + display: block; + height: $graph-height; + min-height: $graph-height; + padding: 20px 20px 0; + background-color: $black; + border-bottom: 1px solid $dark-grey-blue; + + .header { + padding: 0 4px; + margin-bottom: 12px; + + .title { + font-size: 15px; + } + + .time-selector { + width: 180px; + position: relative; + } + + .param-selector { + width: 210px; + position: relative; + } + + .warnning { + margin-left: 10px; + line-height: 20px; + color: $neon-yellow; + } + } + + .line-chart-container { + height: calc(100% - 48px); + position: relative; + z-index: 500; + } +} diff --git a/src/app/webapp-common/serving/serving-stats/serving-stats.component.ts b/src/app/webapp-common/serving/serving-stats/serving-stats.component.ts new file mode 100644 index 00000000..dd43f6fd --- /dev/null +++ b/src/app/webapp-common/serving/serving-stats/serving-stats.component.ts @@ -0,0 +1,129 @@ +import {ChangeDetectionStrategy, Component, computed, effect, inject, input, OnDestroy, signal} from '@angular/core'; +import {Store} from '@ngrx/store'; +import {servingFeature} from '@common/serving/serving.reducer'; +import {ServingActions} from '@common/serving/serving.actions'; +import {MatFormField} from '@angular/material/form-field'; +import {MatOption, MatSelect} from '@angular/material/select'; +import {FormsModule} from '@angular/forms'; +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {LineChartComponent} from '@common/shared/components/charts/line-chart/line-chart.component'; +import {ServingGetEndpointMetricsHistoryRequest} from '~/business-logic/model/serving/servingGetEndpointMetricsHistoryRequest'; +import {interval, Subscription} from 'rxjs'; +import {filter, withLatestFrom} from 'rxjs/operators'; +import {selectAppVisible, selectAutoRefresh} from '@common/core/reducers/view.reducer'; +import {EndpointStats} from '~/business-logic/model/serving/endpointStats'; +import {ColorHashService} from '@common/shared/services/color-hash/color-hash.service'; +import {presetColorsDark} from '@common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component'; + +const REFRESH_INTERVAL = 45000; + +@Component({ + selector: 'sm-serving-stats', + templateUrl: './serving-stats.component.html', + styleUrls: ['./serving-stats.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + MatFormField, + MatSelect, + FormsModule, + MatOption, + TooltipDirective, + LineChartComponent + ], + standalone: true +}) +export class ServingStatsComponent implements OnDestroy { + private store = inject(Store); + private colorService = inject(ColorHashService); + private subs = new Subscription(); + + public metricType = input<{ label: string; value: ServingGetEndpointMetricsHistoryRequest.MetricTypeEnum }>(); + public currentTimeFrame = input(); + + public allChartsData = this.store.selectSignal(servingFeature.selectStats); + public statsError = this.store.selectSignal(servingFeature.selectShowNoStatsNotice); + public selectedEndpoint = this.store.selectSignal(servingFeature.selectSelectedEndpoint); + + public refreshChart = signal(true); + public yAxisLabel = signal(''); + + chartData = computed(() => this.allChartsData()?.[this.metricType().value] ?? null); + private selectedWorkerId: string | undefined; + + public presetColors = presetColorsDark; + + public yAxisLabels = { + 'cpu_usage;gpu_usage': 'Usage %', + memory_used: 'Bytes', + gpu_memory_used: 'Bytes', + 'network_rx;network_tx': 'Bytes/sec' + }; + private previousEndpoint: EndpointStats; + private previousTimeFrame: string; + + tickFormater = (value) => value; + + constructor() { + effect(() => { + if (this.selectedEndpoint()?.id !== this.selectedWorkerId) { + if (this.selectedEndpoint()) { + this.yAxisLabel.update(label => label?.[this.metricType().value]); + } + } + this.selectedWorkerId = this.selectedEndpoint()?.id; + }, {allowSignalWrites: true}); + + effect(() => { + if (!!this.currentTimeFrame() && !!this.metricType() && this.selectedEndpoint()) { + this.yAxisLabel.set(this.yAxisLabels[this.metricType().value]); + if (this.selectedEndpoint()?.id !== this.previousEndpoint?.id || this.currentTimeFrame() !== this.previousTimeFrame) { + this.chartChanged(); + } + this.previousEndpoint = this.selectedEndpoint(); + this.previousTimeFrame = this.currentTimeFrame(); + } + }, {allowSignalWrites: true}); + + effect(() => { + if (this.chartData()) { + this.refreshChart.set(false); + } + }, {allowSignalWrites: true}); + + effect(() => { + if (this.currentTimeFrame()) { + this.autoRefreshSubscription(); + } + }); + + } + + ngOnDestroy(): void { + this.subs.unsubscribe(); + } + + chartChanged() { + this.refreshChart.set(true); + this.store.dispatch(ServingActions.getStats({metricType: this.metricType().value})); + } + + autoRefreshSubscription() { + this.subs.unsubscribe(); + this.subs = (interval(REFRESH_INTERVAL) + .pipe( + withLatestFrom( + this.store.select(selectAutoRefresh), + this.store.select(selectAppVisible) + ), + filter(([, auto, visible]) => auto && visible) + ) + .subscribe(() => { + // Many charts with many points stuck the UI. Better show loader + if (Object.keys(this.allChartsData() ?? {}).length > 4 && parseInt(this.currentTimeFrame()) > 604000) { + this.refreshChart.set(true); + } + this.store.dispatch(ServingActions.getStats({refresh: true, metricType: this.metricType().value})); + }) + ); + } +} diff --git a/src/app/webapp-common/serving/serving-table/serving-table.component.html b/src/app/webapp-common/serving/serving-table/serving-table.component.html new file mode 100644 index 00000000..81bfc1f5 --- /dev/null +++ b/src/app/webapp-common/serving/serving-table/serving-table.component.html @@ -0,0 +1,182 @@ +
+ + + + + + + + + + + + + + + + @switch (col.id) { + @case (endpointsTableColFields.name) { + + {{ endpoint?.endpoint }} + + } + + + + @case (endpointsTableColFields.id) { + + + {{ endpoint?.id }} + + } + @case (endpointsTableColFields.modelName) { + + {{ endpoint?.model }} + + } + @case (endpointsTableColFields.endpointURL) { + + {{ endpoint?.url }} + + } + @case (endpointsTableColFields.instances) { + + {{ endpoint?.instances | number }} + + } + @case (endpointsTableColFields.uptime) { + + {{ endpoint?.uptime_sec | duration }} + + } + @case (endpointsLoadingTableColFields.age) { + + {{ endpoint?.age_sec | duration }} + + } + @case (endpointsLoadingTableColFields.inputSize) { + + {{ endpoint?.input_size | filesize : fileSizeConfigStorage }} + + } + @case (endpointsTableColFields.totalRequests) { + + {{ endpoint?.requests | number }} + + } + @case (endpointsTableColFields.rpm) { + + {{ endpoint?.requests_min | number }} + + } + @case (endpointsTableColFields.latency) { + + {{ endpoint?.latency_ms }}ms + + } + @default { + @if (col.type === 'metadata') { + {{ endpoint | colGetter: col }} + } @else { + + + } + } + } + + + + + Uptime: {{ endpoint.uptime_sec | duration }} + + + + @if (!cardsCollapsed) { + {{ endpoint.model }} + } + + + + + + + +
+ + + + diff --git a/src/app/webapp-common/serving/serving-table/serving-table.component.scss b/src/app/webapp-common/serving/serving-table/serving-table.component.scss new file mode 100644 index 00000000..368ac0eb --- /dev/null +++ b/src/app/webapp-common/serving/serving-table/serving-table.component.scss @@ -0,0 +1,30 @@ +@import "variables"; +@import "../../../layout/layout.scss"; + +:host { + sm-table { + display: block; + height: 100%; + } + + .table-container { + height: 100%; + width: 100%; + } + + sm-table-card-filter-template { + margin-left: 1em; + } +} + +.model-name { + color: $blue-250; + font-weight: normal; +} + +.center-message { + position: absolute; + left: 50%; + top: 50%; + transform: translateX(-50%) translateY(-50%); +} 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 new file mode 100644 index 00000000..63f36989 --- /dev/null +++ b/src/app/webapp-common/serving/serving-table/serving-table.component.ts @@ -0,0 +1,342 @@ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostListener, Input, OnChanges, Output, ViewChild} from '@angular/core'; +import {TableComponent} from '@common/shared/ui-components/data/table/table.component'; +import {ICONS, TIME_FORMAT_STRING} from '@common/constants'; +import {IOption} from '@common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component'; +import {Observable} from 'rxjs'; +import {FilterMetadata} from 'primeng/api/filtermetadata'; +import {get, parseInt} from 'lodash-es'; +import {getRoundedNumber} from '@common/experiments/shared/common-experiments.utils'; +import {ColHeaderTypeEnum, ISmCol} from '@common/shared/ui-components/data/table/table.consts'; +import {createFiltersFromStore} from '@common/shared/utils/tableParamEncode'; +import {Store} from '@ngrx/store'; +import {selectCompanyTags, selectProjectTags, selectTagsFilterByProject} from '@common/core/reducers/projects.reducer'; +import {animate, style, transition, trigger} from '@angular/animations'; +import {BaseTableView} from '@common/shared/ui-components/data/table/base-table-view'; +import {ServingActions, servingLoadingTableColFields, servingTableColFields} from '@common/serving/serving.actions'; +import {isExample} from '@common/shared/utils/shared-utils'; +import {servingTableCols} from '@common/serving/serving.consts'; +import {EndpointStats} from '~/business-logic/model/serving/endpointStats'; +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})) + ] + ) + ] + ) + ] +}) +export class ServingTableComponent extends BaseTableView implements OnChanges { + readonly endpointsTableColFields = servingTableColFields; + readonly endpointsLoadingTableColFields = servingLoadingTableColFields; + protected readonly EntityTypeEnum = EntityTypeEnum; + protected readonly fileSizeConfigCount = fileSizeConfigCount; + protected readonly fileSizeConfigStorage = fileSizeConfigStorage; + readonly timeFormatString = TIME_FORMAT_STRING; + + public override filtersOptions: Record = { + [servingTableColFields.modelName]: [], + [servingLoadingTableColFields.preprocessArtifact]: [], + }; + + readonly icons = ICONS; + public menuOpen: boolean; + public sortOrder = 1; + + public contextEndpoint: EndpointStats; + public tagsFilterByProject$: Observable; + public projectTags$: Observable; + public companyTags$: Observable; + private _selectedEndpoints: EndpointStats[]; + private _endpoints: EndpointStats[]; + public getSysTags = (endpoint) => endpoint?.system_tags?.concat(isExample(endpoint) ? 'example' : []); + public filtersMatch: Record = {}; + public filtersSubValues: Record = {}; + public singleRowContext: boolean; + private _tableFilters: Record; + public roundedMetricValues: Record> = {}; + private allEndpoints: EndpointStats[]; + + + @Input() set endpoints(endpoints: EndpointStats[]) { + this._endpoints = endpoints; + + if (!this.allEndpoints && endpoints?.length > 0) { + this.allEndpoints = [...endpoints]; + } + + this.tableCols?.filter(tableCol => tableCol.id.startsWith('last_metrics')).forEach(col => this._endpoints?.forEach(exp => { + const value = get(exp, col.id); + this.roundedMetricValues[col.id] = this.roundedMetricValues[col.id] || {}; + this.roundedMetricValues[col.id][exp.id] = value && getRoundedNumber(value) !== value; + })); + + if (this.contextEndpoint) { + this.contextEndpoint = this.endpoints.find(endpoint => endpoint.id === this.contextEndpoint.id); + } + } + + get endpoints() { + return this._endpoints; + } + + // @Input() noMoreEndpoints: boolean; + @Input() reorderableColumns = true; + @Input() tableCols: ISmCol[]; + @Input() enableMultiSelect: boolean; + + @Input() set modelNames(modelNames: string[]) { + if (!modelNames) { + this.filtersOptions[servingTableColFields.modelName] = null; + return; + } + this.filtersOptions[servingTableColFields.modelName] = modelNames.map(modelName => ({ + label: modelName, + value: modelName + })); + this.sortOptionsList(servingTableColFields.modelName); + } + @Input() set inputTypes(inputTypes: string[]) { + if (!inputTypes) { + this.filtersOptions[servingLoadingTableColFields.inputType] = null; + return; + } + this.filtersOptions[servingLoadingTableColFields.inputType] = inputTypes.map(inputType => ({ + label: inputType, + value: inputType + })); + this.sortOptionsList(servingLoadingTableColFields.inputType); + } + @Input() set preprocessArtifact(preprocessArtifacts: string[]) { + if (!preprocessArtifacts) { + this.filtersOptions[servingLoadingTableColFields.preprocessArtifact] = null; + return; + } + this.filtersOptions[servingLoadingTableColFields.preprocessArtifact] = preprocessArtifacts.map(preprocessArtifact => ({ + label: preprocessArtifact, + value: preprocessArtifact + })); + this.sortOptionsList(servingLoadingTableColFields.preprocessArtifact); + } + + @Input() set selectedEndpoints(selection) { + this._selectedEndpoints = selection; + this.updateSelectionState(); + } + + get selectedEndpoints() { + return this._selectedEndpoints; + } + + @Input() set colRatio(ratio: number) { + if (ratio) { + this.tableCols.forEach(col => { + if (col.headerType != ColHeaderTypeEnum.checkBox && col.style?.width?.endsWith('px')) { + const width = parseInt(col.style.width, 10); + col.style.width = ratio * width + 'px'; + } + }); + } + } + + private _selectedEndpoint; + @Input() set selectedEndpoint(endpoint) { + if (endpoint && endpoint.id !== this._selectedEndpoint?.id) { + window.setTimeout(() => this.table?.focusSelected()); + } + this._selectedEndpoint = endpoint; + } + + get selectedEndpoint(): EndpointStats { + return this._selectedEndpoint; + } + + @Input() set tableFilters(filters: Record) { + this._tableFilters = filters; + this.filtersValues = {}; + this.filtersValues[servingTableColFields.modelName] = filters?.[servingTableColFields.modelName] ?? null; + this.filtersValues[servingTableColFields.endpointURL] = filters?.[servingTableColFields.endpointURL] ?? null; + this.filtersValues[servingTableColFields.totalRequests] = filters?.[servingTableColFields.totalRequests] ?? null; + this.filtersValues[servingTableColFields.uptime] = filters?.[servingTableColFields.uptime] ?? null; + this.filtersValues[servingTableColFields.rpm] = filters?.[servingTableColFields.rpm] ?? null; + this.filtersValues[servingTableColFields.latency] = filters?.[servingTableColFields.latency] ?? null; + this.filtersValues[servingTableColFields.instances] = filters?.[servingTableColFields.instances] ?? null; + this.filtersValues[servingLoadingTableColFields.inputType] = filters?.[servingLoadingTableColFields.inputType] ?? null; + this.filtersValues[servingLoadingTableColFields.preprocessArtifact] = filters?.[servingLoadingTableColFields.preprocessArtifact] ?? null; + // this.filtersValues[servingTableColFields.tags] = filters?.[servingTableColFields.tags] ?? null; + // dynamic filters + const filtersValues = createFiltersFromStore(filters || {}, false); + this.filtersValues = Object.assign({}, {...this.filtersValues}, {...filtersValues}); + } + + get tableFilters() { + return this._tableFilters; + } + + // @Input() set users(users: User[]) { + // this.filtersOptions[servingTableColFields.USER] = users.map(user => ({ + // label: user.name ? user.name : 'Unknown User', + // value: user.id + // })); + // this.sortOptionsList(servingTableColFields.USER); + // } + + @Input() set metadataValuesOptions(metadataValuesOptions: Record) { + Object.entries(metadataValuesOptions).forEach(([id, values]) => { + this.filtersOptions[id] = values === null ? null : [{ + label: '(No Value)', + value: null + }].concat(values.map(value => ({ + label: value, + value + }))); + }); + } + + // @Input() set tags(tags) { + // const tagsAndActiveFilter = Array.from(new Set(tags.concat(this.filtersValues[servingTableColFields.tags]))); + // this.filtersOptions[servingTableColFields.tags] = tagsAndActiveFilter.map(tag => ({ + // label: tag === null ? '(No tags)' : tag, + // value: tag + // }) as IOption); + // this.sortOptionsList(servingTableColFields.tags); + // } + + @Input() systemTags = [] as string[]; + + @Output() endpointsSelectionChanged = new EventEmitter(); + @Output() endpointSelectionChanged = new EventEmitter<{ endpoint: EndpointStats; openInfo?: boolean }>(); + @Output() loadMoreEndpoints = new EventEmitter(); + @Output() tagsMenuOpened = new EventEmitter(); + @Output() sortedChanged = new EventEmitter<{ isShift: boolean; colId: ISmCol['id'] }>(); + @Output() columnResized = new EventEmitter<{ columnId: string; widthPx: number }>(); + @Output() clearAllFilters = new EventEmitter>(); + + @ViewChild(TableComponent, {static: true}) override table: TableComponent; + public readonly initialColumns = servingTableCols; + + @HostListener('document:click', ['$event']) + clickHandler(event) { + if (event.button != 2) { // Bug in firefox: right click triggers `click` event + this.menuOpen = false; + } + } + + constructor(private changeDetector: ChangeDetectorRef, private store: Store) { + super(); + this.tagsFilterByProject$ = this.store.select(selectTagsFilterByProject); + this.projectTags$ = this.store.select(selectProjectTags); + this.companyTags$ = this.store.select(selectCompanyTags); + this.entitiesKey = 'endpoints'; + this.selectedEntitiesKey = 'ServingEndpoints'; + + } + + ngOnChanges() { + if (this.tableCols?.length > 0) { + this.tableCols[0].hidden = this.enableMultiSelect === false; + const statusColumn = this.tableCols.find(col => col.id === 'ready'); + if (statusColumn) { + statusColumn.filterable = this.enableMultiSelect; + statusColumn.sortable = this.enableMultiSelect; + } + } + } + + + onRowSelectionChanged(event) { + this.endpointSelectionChanged.emit({endpoint: event.data}); + } + + + onLoadMoreClicked() { + this.loadMoreEndpoints.emit(); + } + + onSortChanged(isShift: boolean, colId: ISmCol['id']) { + this.sortedChanged.emit({isShift, colId}); + this.scrollTableToTop(); + } + + get sortableCols() { + return this.tableCols?.filter(col => col.sortable); + } + + getColName(colId: ISmCol['id']) { + return this.tableCols?.find(col => colId === col.id)?.header; + } + + rowSelectedChanged(change: { field: string; value: boolean; event: Event }, endpoint: EndpointStats) { + if (change.value) { + const addList = this.getSelectionRange(change, endpoint); + this.endpointsSelectionChanged.emit([...this.selectedEndpoints, ...addList]); + } else { + const removeList = this.getDeselectionRange(change, endpoint); + this.endpointsSelectionChanged.emit(this.selectedEndpoints.filter((ServingEndpoint) => + !removeList.includes(ServingEndpoint.id))); + } + } + + emitSelection(selection: EndpointStats[]) { + this.endpointsSelectionChanged.emit(selection); + } + + + // addTag(tag: string) { + // this.store.dispatch(addTag({ + // tag, + // models: this.selectedEndpoints.length > 1 ? this.selectedEndpoints : [this.contextEndpoint] + // })); + // this.filtersOptions[servingTableColFields.TAGS] = []; + // } + + tableRowClicked(event: { e: Event; data: EndpointStats }) { + this.endpointsSelectionChanged.emit([event.data]); + this.endpointSelectionChanged.emit({endpoint: event.data, openInfo: !this.minimizedView}) + } + + columnFilterOpened(col: ISmCol) { + this.sortOptionsList(col.id); + // if (col.id === servingTableColFields.tags && !this.filtersOptions[servingTableColFields.tags]?.length) { + if (false) { //lala - do we skip tags? + this.tagsMenuOpened.emit(); + } else if (col.type === 'hyperparams') { + this.store.dispatch(ServingActions.getCustomMetrics()); + } + } + + columnsWidthChanged({columnId, width}) { + const colIndex = this.tableCols.findIndex(col => col.id === columnId); + const delta = width - parseInt(this.tableCols[colIndex].style.width, 10); + this.table?.updateColumnsWidth(columnId, width, delta); + } + + override updateSelectionState() { + return; + } + + openContextMenu(data: { e: Event; rowData; single?: boolean; backdrop?: boolean }) { + } +} diff --git a/src/app/webapp-common/serving/serving.actions.ts b/src/app/webapp-common/serving/serving.actions.ts new file mode 100644 index 00000000..62d06b80 --- /dev/null +++ b/src/app/webapp-common/serving/serving.actions.ts @@ -0,0 +1,123 @@ +import {createActionGroup, emptyProps, props} from '@ngrx/store'; +import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; +import {SortMeta} from 'primeng/api'; +import {TableFilter} from '@common/shared/utils/tableParamEncode'; +import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; +import {Topic} from '@common/shared/utils/statistics'; +import {ServingGetEndpointDetailsResponse} from '~/business-logic/model/serving/servingGetEndpointDetailsResponse'; +import {ServingGetEndpointMetricsHistoryRequest} from '~/business-logic/model/serving/servingGetEndpointMetricsHistoryRequest'; +import MetricTypeEnum = ServingGetEndpointMetricsHistoryRequest.MetricTypeEnum; +import {EndpointStats} from '~/business-logic/model/serving/endpointStats'; +import {ContainerInstanceStats} from '~/business-logic/model/serving/containerInstanceStats'; + + +export type servingTableColFields = + 'selected' + | 'id' + | 'name' + | 'tags' + | 'model.name' + | 'url' + | 'uptime' + | 'request_per_min' + | 'latency' + | 'parent.name' + | 'PreprocessArtifact' + | 'inputType' + | 'inputSize' + | 'instancesList' + | 'instances' + | 'totalRequests'; + +export const servingTableColFields = { + id: 'id' as servingTableColFields, + name: 'endpoint' as servingTableColFields, + modelName: 'model' as servingTableColFields, + endpointURL: 'url' as servingTableColFields, + uptime: 'uptime_sec' as servingTableColFields, + rpm: 'requests_min' as servingTableColFields, + totalRequests: 'requests' as servingTableColFields, + latency: 'latency_ms' as servingTableColFields, + instances: 'instances' as servingTableColFields, +}; + +export type servingLoadingTableColFields = + 'id' | 'endpoint' | 'model' | 'url' | 'model_source' | 'model_version' | 'preprocess_artifact' | 'input_type' | 'input_size' | 'age_sec'; + +export const servingLoadingTableColFields = { + id: 'id' as servingLoadingTableColFields, + name: 'endpoint' as servingLoadingTableColFields, + age: 'age_sec' as servingLoadingTableColFields, + modelName: 'model' as servingLoadingTableColFields, + endpointURL: 'url' as servingLoadingTableColFields, + modelSource: 'model_source' as servingLoadingTableColFields, + modelVersion: 'model_version' as servingLoadingTableColFields, + preprocessArtifact: 'preprocess_artifact' as servingLoadingTableColFields, + inputType: 'input_type' as servingLoadingTableColFields, + inputSize: 'input_size' as servingLoadingTableColFields, +}; + +export const ServingActions = createActionGroup({ + source: 'serving', + events: { + 'fetch serving endpoints': emptyProps(), + 'fetch serving 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 no more servingEndpoints': props<{ payload: boolean }>(), + 'toggle col hidden': props<{ columnId: string }>(), + 'set hidden cols': props<{ hiddenCols: Record }>(), + 'get tags': emptyProps(), + 'set tags': props<{ tags: string[] }>(), + 'Add tag': props<{ tag: string[] }>(), + 'set cols order': props<{ cols: string[] }>(), + 'set loading cols order': props<{ cols: string[] }>(), + 'set extra columns': props<{ columns: any[] }>(), + 'add column': props<{ col: ISmCol }>(), + 'remove column': props<{ id: string }>(), + 'remove metric column': props<{ id: string }>(), + 'add servingEndpoints': props<{ servingEndpoints: EndpointStats[] }>(), + 'set selected servingEndpoints': props<{ servingEndpoints: EndpointStats[] }>(), + 'set selected servingEndpoint': props<{ endpoint: EndpointStats }>(), + 'set servingEndpoint details': props<{ endpoint: ServingGetEndpointDetailsResponse }>(), + 'table sort changed': props<{ isShift: boolean; colId: ISmCol['id'] }>(), + 'loading table sort changed': props<{ isShift: boolean; colId: ISmCol['id'] }>(), + 'set table sort': props<{ orders: SortMeta[] }>(), + 'set loading table sort': props<{ orders: SortMeta[] }>(), + 'table filters changed': props<{ filters: TableFilter[] }>(), + 'loading table filters changed': props<{ filters: TableFilter[] }>(), + 'get custom metrics': emptyProps(), + 'set table filters': props<{ filters: TableFilter[] }>(), + 'set loading table filters': props<{ filters: TableFilter[] }>(), + 'set column width': props<{ columnId: string; widthPx: number }>(), + 'set loading column width': props<{ columnId: string; widthPx: number }>(), + 'set column loading width': props<{ columnId: string; widthPx: number }>(), + 'update url params from state': emptyProps(), + 'update url params from loading state': emptyProps(), + 'servingEndpoint selection changed': props<{ servingEndpoint: EndpointStats }>(), + 'show selected only': props<{ active: boolean }>(), + 'global filter changed': props<{ query: string; regExp?: boolean }>(), + 'reset global filter': emptyProps(), + 'reset state': emptyProps(), + // 'set current scrollId': props<{ scrollId: string }>(), + 'after set archive': emptyProps(), + 'set split size': props<{ splitSize: number }>(), + 'set table view mode': props<{ mode: 'info' | 'table' }>(), + 'set custom metrics': props<{ metrics: MetricVariantResult[] }>(), + 'get endpoint info': props<{ id: string }>(), + 'get endpoint': props<{ id: string; autoRefresh: boolean }>(), + 'refresh endpoint info': props<{ id: string }>(), + 'get stats': props<{ metricType: MetricTypeEnum; refresh?:boolean }>(), + 'set stats': props<{ data: Record }>(), + 'set stats timeframe': props<{ timeFrame: string }>(), + 'show stats error notice': props<{ show: boolean }>(), + 'set chart hidden': props<{ hiddenList: MetricTypeEnum[] }>(), + 'get models source links': props<{ instances: ContainerInstanceStats[], insideModel: boolean }>(), + 'set models source links': props<{ modelsLinks: Record[] }>(), + } +}); diff --git a/src/app/webapp-common/serving/serving.component.html b/src/app/webapp-common/serving/serving.component.html new file mode 100644 index 00000000..be82669c --- /dev/null +++ b/src/app/webapp-common/serving/serving.component.html @@ -0,0 +1,79 @@ +
+ +
+
+ + + + + + + + + +
+ diff --git a/src/app/webapp-common/serving/serving.component.scss b/src/app/webapp-common/serving/serving.component.scss new file mode 100644 index 00000000..3b127473 --- /dev/null +++ b/src/app/webapp-common/serving/serving.component.scss @@ -0,0 +1,20 @@ +@import "variables"; +@import "../layout/layout.scss"; + +:host { + + .models-body { + width: 100%; + height: calc(100% - #{$project-header-height}); + transition: height 0.3s; + } + + .model-table-container { + transition: all 0.3s; + + } + + ::ng-deep .card-view table { + width: unset !important; + } +} diff --git a/src/app/webapp-common/serving/serving.component.ts b/src/app/webapp-common/serving/serving.component.ts new file mode 100644 index 00000000..c435e2fb --- /dev/null +++ b/src/app/webapp-common/serving/serving.component.ts @@ -0,0 +1,370 @@ +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 {distinctUntilChanged, filter, map, skip, tap, withLatestFrom} from 'rxjs/operators'; +import {isEqual} from 'lodash-es'; +import {Params} from '@angular/router'; +import {createMetricColumn, decodeColumns, decodeFilter, decodeOrder} from '@common/shared/utils/tableParamEncode'; +import {initSearch, resetSearch} from '@common/common-search/common-search.actions'; +import {SelectionEvent} from '@common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component'; +import {BaseEntityPageComponent} from '@common/shared/entity-page/base-entity-page'; +import {modelServingRoutes, servingTableCols} from '@common/serving/serving.consts'; +import {ServingActions} from '@common/serving/serving.actions'; +import {ServingTableComponent} from '@common/serving/serving-table/serving-table.component'; +import {servingFeature} from '@common/serving/serving.reducer'; +import {selectRouterParams} from '@common/core/reducers/router-reducer'; +import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; +import {headerActions} from '@common/core/actions/router.actions'; +import {EndpointStats} from '~/business-logic/model/serving/endpointStats'; + +type EndpointsTableViewMode = 'active' | 'loading'; + +@Component({ + selector: 'sm-serving', + templateUrl: './serving.component.html', + styleUrl: './serving.component.scss' +}) +export class ServingComponent extends BaseEntityPageComponent implements OnInit, OnDestroy { + public readonly originalTableColumns = servingTableCols; + public entityTypeEnum = EntityTypeEnum; + 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); + + @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(); + } + + override ngOnInit() { + super.ngOnInit(); + this.store.dispatch(ServingActions.fetchServingEndpoints()); + let prevQueryParams: Params; + + this.sub.add(this.route.queryParams + .pipe( + filter(queryParams => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const {q, qreg, ...queryParamsWithoutSearch} = queryParams; + const equal = isEqual(queryParamsWithoutSearch, prevQueryParams); + prevQueryParams = queryParamsWithoutSearch; + return !equal; + }) + ) + .subscribe(params => { + if (Object.keys(params || {}).length === 0) { + this.emptyUrlInit(); + } else { + if (params.order) { + const orders = decodeOrder(params.order); + this.store.dispatch(ServingActions.setTableSort({orders})); + } + if (params.filter) { + const filters = decodeFilter(params.filter); + this.store.dispatch(ServingActions.setTableFilters({filters})); + } else { + if (params.order) { + this.store.dispatch(ServingActions.setTableFilters({filters: []})); + } + } + + if (params.columns) { + const [, metrics, , , allIds] = decodeColumns(params.columns, this.originalTableColumns); + const hiddenCols = {}; + this.originalTableColumns.forEach((tableCol) => { + if (tableCol.id !== 'selected') { + hiddenCols[tableCol.id] = !params.columns.includes(tableCol.id); + } + }); + this.store.dispatch(ServingActions.setHiddenCols({hiddenCols})); + this.store.dispatch(ServingActions.setExtraColumns({ + columns: metrics.map(metricCol => createMetricColumn(metricCol, undefined)) + })); + this.columnsReordered(allIds, false); + } + } + }) + ); + + this.sub.add(this.selectedEndpoints$.subscribe(ServingEndpoints => this.selectedEndpoints = ServingEndpoints)); + + this.selectEndpointFromUrl(); + // this.store.dispatch(ServingActions.getTags()); + // this.store.dispatch(getTags()); + } + + override ngOnDestroy(): void { + super.ngOnDestroy(); + this.store.dispatch(ServingActions.resetState()); + this.stopSyncSearch(); + } + + private emptyUrlInit() { + this.store.dispatch(ServingActions.updateUrlParamsFromState()); + this.shouldOpenDetails = true; + } + + getSelectedEntities() { + return this.selectedEndpoints; + } + + stopSyncSearch() { + this.store.dispatch(resetSearch()); + this.store.dispatch(ServingActions.resetGlobalFilter()); + } + + 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()); + } + + selectEndpointFromUrl() { + this.sub.add(combineLatest([ + this.store.select(selectRouterParams).pipe( + map(params => params.endpointId), + distinctUntilChanged()), + this.endpoints$.pipe(filter(items => items?.length > 0)) + ]) + .pipe( + withLatestFrom(this.store.select(servingFeature.selectTableMode)), + map(([[id, endpoints], mode]) => { + this.firstEndpoint = endpoints?.[0]; + if (!id && this.shouldOpenDetails && this.firstEndpoint && mode === 'info') { + this.shouldOpenDetails = false; + this.store.dispatch(ServingActions.servingEndpointSelectionChanged({servingEndpoint: this.firstEndpoint})); + } else { + this.store.dispatch(ServingActions.setTableViewMode({mode: id ? 'info' : 'table'})); + } + return id ? endpoints?.find(endpoint => endpoint.id === id) ?? endpoints[0] : null; + }), + distinctUntilChanged(), + filter(a => !!a) + ) + .subscribe((endpoint) => { + this.store.dispatch(ServingActions.setSelectedServingEndpoint({endpoint})); + }) + ); + } + + endpointSelectionChanged(event: { endpoint: EndpointStats; openInfo?: boolean }) { + if ((this.minimizedView || event.openInfo) && event.endpoint) { + this.store.dispatch(ServingActions.servingEndpointSelectionChanged({ + servingEndpoint: event.endpoint + })); + } + if (this.minimizedView && !event.openInfo && !event.endpoint) { + this.router.navigate(['..', 'active'], {relativeTo: this.route, queryParamsHandling: 'merge'}); + } + } + + endpointsSelectionChanged(endpoints: EndpointStats[]) { + this.store.dispatch(ServingActions.setSelectedServingEndpoint({endpoint: endpoints[0]})); + } + + sortedChanged({colId, isShift}: { isShift: boolean; colId: string }) { + this.store.dispatch(ServingActions.tableSortChanged({colId, isShift})); + } + + filterChanged({col, value, andFilter}: { col: ISmCol; value: any; andFilter?: boolean }) { + + this.store.dispatch(ServingActions.tableFiltersChanged({ + filters: [{ + col: col.id, + value, + filterMatchMode: col.filterMatchMode || andFilter ? 'AND' : undefined + }], + })); + } + + refreshList(isAutorefresh: boolean) { + this.store.dispatch(ServingActions.refreshEndpoints({hideLoader: isAutorefresh, autoRefresh: isAutorefresh})); + } + + setAutoRefresh(autoRefresh: boolean) { + this.store.dispatch(setAutoRefresh({autoRefresh})); + } + + columnsReordered(cols: string[], updateUrl = true) { + this.store.dispatch(ServingActions.setColsOrder({cols})); + if (updateUrl) { + this.store.dispatch(ServingActions.updateUrlParamsFromState()); + } + } + + selectedTableColsChanged(col) { + this.store.dispatch(ServingActions.toggleColHidden({columnId: col.id})); + } + + columnResized(event: { columnId: string; widthPx: number }) { + this.store.dispatch(ServingActions.setColumnWidth({...event})); + } + + refreshTagsList() { + this.store.dispatch(ServingActions.getTags()); + } + + protected getParamId(params) { + return params?.endpointId; + } + + clearTableFiltersHandler(tableFilters: Record) { + const filters = Object.keys(tableFilters).map(col => ({col, value: []})); + this.store.dispatch(ServingActions.tableFiltersChanged({filters})); + } + + getCustomMetrics() { + this.store.dispatch(ServingActions.getCustomMetrics()); + } + + removeColFromList(id: string) { + if (id.startsWith('last_metrics')) { + this.store.dispatch(ServingActions.removeMetricColumn({id})); + } else { + this.store.dispatch(ServingActions.removeColumn({id: id.split('.')[1]})); + } + } + + modeChanged(mode: 'table' | 'info') { + if (mode === 'info') { + this.store.dispatch(ServingActions.setTableViewMode({mode})); + if (this.firstEndpoint) { + this.store.dispatch(ServingActions.servingEndpointSelectionChanged({ + servingEndpoint: this.selectedEndpoints?.[0] || this.firstEndpoint + })); + } + return Promise.resolve() + } else { + return this.closePanel(); + } + } + + override closePanel(queryParams?: Params) { + window.setTimeout(() => this.infoDisabled = false); + this.store.dispatch(this.setTableModeAction({mode: 'table'})); + return this.router.navigate(this.minimizedView ? [{}] : [], { + relativeTo: this.route, + queryParamsHandling: 'merge', + queryParams + }); + } + + selectedMetricToShow(event: SelectionEvent) { + if (!event.valueType) { + return; + } + const variantCol = createMetricColumn({ + metricHash: event.variant.metric_hash, + variantHash: event.variant.variant_hash, + valueType: event.valueType, + metric: event.variant.metric, + variant: event.variant.variant + }, this.projectId); + if (event.addCol) { + this.store.dispatch(ServingActions.addColumn({col: variantCol})); + } else { + this.store.dispatch(ServingActions.removeMetricColumn({id: variantCol.id})); + } + } + + downloadTableAsCSV() { + this.table.table.downloadTableAsCSV(`ClearML All Endpoints`); + } + + override onFooterHandler(): void { + return; + } + override afterArchiveChanged() { + return; + } + + private setContextMenu() { + this.route.url + .pipe( + takeUntilDestroyed(), + filter(config => !!config), + ) .subscribe((conf) => { + const contextMenu = modelServingRoutes + .map(route => { + const baseLink = route.link.at(-1); + return { + ...route, + isActive: baseLink === conf[0]?.path + }; + }); + this.store.dispatch(headerActions.setTabs({contextMenu})); + }); + } + +} diff --git a/src/app/webapp-common/serving/serving.consts.ts b/src/app/webapp-common/serving/serving.consts.ts new file mode 100644 index 00000000..e1e14d13 --- /dev/null +++ b/src/app/webapp-common/serving/serving.consts.ts @@ -0,0 +1,179 @@ +import {ColHeaderFilterTypeEnum, ColHeaderTypeEnum, ISmCol} from '../shared/ui-components/data/table/table.consts'; +import {servingLoadingTableColFields, servingTableColFields} from '@common/serving/serving.actions'; +import {HeaderNavbarTabConfig} from '@common/layout/header-navbar-tabs/header-navbar-tabs-config.types'; +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 { ContainerInfo } from '~/business-logic/model/serving/containerInfo'; + +export const servingTableCols: ISmCol[] = [ + { + id: servingTableColFields.name, + headerType: ColHeaderTypeEnum.sortFilter, + sortable: true, + header: 'ENDPOINT', + style: {width: '300px'} + }, + { + id: servingTableColFields.modelName, + headerType: ColHeaderTypeEnum.sortFilter, + filterable: true, + searchableFilter: true, + sortable: true, + getter: 'model', + header: 'MODEL', + showInCardFilters: true, + style: {width: '135px'} + }, + { + id: servingTableColFields.endpointURL, + headerType: ColHeaderTypeEnum.sortFilter, + sortable: true, + header: 'URL', + style: {width: '340px'} + }, + { + id: servingTableColFields.instances, + headerType: ColHeaderTypeEnum.sortFilter, + sortable: true, + header: '# INSTANCES', + style: {width: '150px'} + }, + { + id: servingTableColFields.uptime, + headerType: ColHeaderTypeEnum.sortFilter, + sortable: true, + filterable: true, + filterType: ColHeaderFilterTypeEnum.duration, + header: 'UPTIME', + style: {width: '240px'} + }, + { + id: servingTableColFields.totalRequests, + headerType: ColHeaderTypeEnum.sortFilter, + sortable: true, + filterType: ColHeaderFilterTypeEnum.durationNumeric, + filterable: true, + header: '# REQUESTS', + style: {width: '150px'} + }, + { + id: servingTableColFields.rpm, + headerType: ColHeaderTypeEnum.sortFilter, + sortable: true, + filterable: true, + filterType: ColHeaderFilterTypeEnum.durationNumeric, + header: 'REQUEST / MIN (avg)', + style: {width: '240px'} + }, + { + id: servingTableColFields.latency, + headerType: ColHeaderTypeEnum.sortFilter, + sortable: true, + filterType: ColHeaderFilterTypeEnum.durationNumeric, + filterable: true, + header: 'LATENCY (avg)', + style: {width: '150px'} + } +]; +export const servingLoadingTableCols: ISmCol[] = [ + { + id: servingLoadingTableColFields.id, + headerType: ColHeaderTypeEnum.sortFilter, + sortable: true, + header: 'INSTANCE ID', + style: {width: '200px'} + }, + { + id: servingLoadingTableColFields.modelName, + headerType: ColHeaderTypeEnum.sortFilter, + filterable: true, + searchableFilter: true, + sortable: true, + getter: 'model', + header: 'MODEL', + style: {width: '400px'} + }, + { + id: servingLoadingTableColFields.age, + headerType: ColHeaderTypeEnum.sortFilter, + sortable: true, + filterable: true, + filterType: ColHeaderFilterTypeEnum.duration, + header: 'AGE', + style: {width: '240px'} + }, + { + id: servingLoadingTableColFields.preprocessArtifact, + headerType: ColHeaderTypeEnum.sortFilter, + sortable: true, + filterable: true, + searchableFilter: true, + header: 'PREPROCESS ARTIFACT', + style: {width: '340px'} + }, + { + id: servingLoadingTableColFields.inputType, + headerType: ColHeaderTypeEnum.sortFilter, + sortable: true, + filterable: true, + searchableFilter: true, + header: 'INPUT TYPE', + style: {width: '250px'} + }, + { + id: servingLoadingTableColFields.inputSize, + headerType: ColHeaderTypeEnum.sortFilter, + sortable: true, + filterable: true, + filterType: ColHeaderFilterTypeEnum.durationNumeric, + header: 'INPUT SIZE', + style: {width: '340px'} + } +]; + +const MiB = 1024 * 1024; +export const endpointsStatsParamInfo = { + cpu_usage : {title: 'CPU Usage', multiply: 1}, + gpu_usage : {title: 'GPU Usage', multiply: 1}, + memory_used : {title: 'Memory Used', multiply: MiB}, + gpu_memory_used: {title: 'GPU Memory', multiply: MiB}, + network_rx : {title: 'Network Receive', multiply: MiB}, + network_tx : {title: 'Network Transmit', multiply: MiB} +}; + +export const modelServingRoutes = [ + {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[] { + if (endpoints === null) { + return null; + } + let tempEndpoints = [...endpoints]; + Object.entries(filters).forEach(([key, filter]) => { + tempEndpoints = tempEndpoints.filter(endpoint => { + if (['model', 'input_type', 'preprocess_artifact'].includes(key)) { // Need a better rule for not range + return filter.value.includes(endpoint[key]); + } else { + return parseInt(endpoint[key]) >= (filter.value[0] || -Infinity) && parseInt(endpoint[key]) <= (filter.value[1] || Infinity); + } + }); + }); + + return tempEndpoints.sort((a, b) => { + let res = 0; + sortFields.some(sortField => { + if (a[sortField.field] < b[sortField.field]) { + res = -1 * sortField.order; + } + if (a[sortField.field] > b[sortField.field]) { + res = sortField.order; + } + return res; + }); + return res; + }); +} diff --git a/src/app/webapp-common/serving/serving.effects.ts b/src/app/webapp-common/serving/serving.effects.ts new file mode 100644 index 00000000..398fdb74 --- /dev/null +++ b/src/app/webapp-common/serving/serving.effects.ts @@ -0,0 +1,497 @@ +import {inject, Injectable} from '@angular/core'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; + +import {auditTime, catchError, filter, map, mergeMap, switchMap, tap} from 'rxjs/operators'; +import {forkJoin, iif, Observable, of} from 'rxjs'; +import {ServingActions} from './serving.actions'; +import {concatLatestFrom} from '@ngrx/operators'; +import {servingFeature} from '@common/serving/serving.reducer'; +import {addMultipleSortColumns} from '@common/shared/utils/shared-utils'; +import {setURLParams} from '@common/core/actions/router.actions'; +import {FilterMetadata} from 'primeng/api/filtermetadata'; +import {selectActiveWorkspaceReady} from '~/core/reducers/view.reducer'; +import {activeLoader, addMessage, deactivateLoader, setServerError} from '@common/core/actions/layout.actions'; +import {requestFailed} from '@common/core/actions/http.actions'; +import {selectRouterConfig} from '@common/core/reducers/router-reducer'; +import {getFilteredUsers, setProjectUsers} from '@common/core/actions/projects.actions'; +import {emptyAction} from '~/app.constants'; +import {selectAppVisible, selectScaleFactor} from '@common/core/reducers/view.reducer'; +import {Action, Store} from '@ngrx/store'; +import {isEqual} from 'lodash-es'; +import {createFiltersFromStore, encodeColumns, encodeOrder} from '@common/shared/utils/tableParamEncode'; +import {SearchState} from '@common/common-search/common-search.reducer'; +import {SortMeta} from 'primeng/api'; +import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; +import {escapeRegex} from '@common/shared/utils/escape-regex'; +import {ActivatedRoute, Router} from '@angular/router'; +import {servingLoadingTableCols, servingTableCols} from '@common/serving/serving.consts'; +import {selectActiveWorkspace} from '@common/core/reducers/users-reducer'; +import {activitySeriesToTopic, Topic} from '@common/shared/utils/statistics'; +import {ApiServingService} from '~/business-logic/api-services/serving.service'; +import {ServingGetEndpointDetailsResponse} from '~/business-logic/model/serving/servingGetEndpointDetailsResponse'; +import {ServingGetEndpointsResponse} from '~/business-logic/model/serving/servingGetEndpointsResponse'; +import {ServingGetLoadingInstancesResponse} from '~/business-logic/model/serving/servingGetLoadingInstancesResponse'; +import {MESSAGES_SEVERITY} from '@common/constants'; +import {ServingGetEndpointMetricsHistoryRequest} from '~/business-logic/model/serving/servingGetEndpointMetricsHistoryRequest'; +import {ServingGetEndpointMetricsHistoryResponse} from '~/business-logic/model/serving/servingGetEndpointMetricsHistoryResponse'; +import {EndpointStats} from '~/business-logic/model/serving/endpointStats'; +import MetricTypeEnum = ServingGetEndpointMetricsHistoryRequest.MetricTypeEnum; +import {v5 as uuidv5} from 'uuid'; +import {ContainerInstanceStatsReference} from '~/business-logic/model/serving/containerInstanceStatsReference'; +import {ApiModelsService} from '~/business-logic/api-services/models.service'; +import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; + +@Injectable() +export class ServingEffects { + private actions$ = inject(Actions); + private store = inject(Store); + private router = inject(Router); + private route = inject(ActivatedRoute); + private servingApi = inject(ApiServingService); + private modelsApi = inject(ApiModelsService); + private tasksApi = inject(ApiTasksService); + + activeLoader = createEffect(() => this.actions$.pipe( + ofType(ServingActions.getNextServingEndpoints, ServingActions.fetchServingEndpoints, ServingActions.fetchServingLoadingEndpoints), + filter((action) => !(action as unknown as ReturnType).hideLoader), + map(() => activeLoader('Fetch Endpoint')) + )); + + tableSortChange = createEffect(() => this.actions$.pipe( + ofType(ServingActions.tableSortChanged, ServingActions.loadingTableSortChanged), + concatLatestFrom((action) => iif(() => action.type === ServingActions.tableSortChanged.type, + this.store.select(servingFeature.selectTableSortFields), this.store.select(servingFeature.selectLoadingTableSortFields))), + switchMap(([action, oldOrders]) => { + const orders = addMultipleSortColumns(oldOrders, action.colId, action.isShift); + return [setURLParams({orders, update: true})]; + }) + )); + + tableFilterChange = createEffect(() => this.actions$.pipe( + ofType(ServingActions.tableFiltersChanged, ServingActions.loadingTableFiltersChanged), + concatLatestFrom((action) => iif(() => action.type === ServingActions.tableFiltersChanged.type, + this.store.select(servingFeature.selectColumnFilters), this.store.select(servingFeature.selectLoadingColumnFilters))), + switchMap(([action, oldFilters]) => + [setURLParams({ + filters: { + ...oldFilters, + ...action.filters.reduce((acc, updatedFilter) => { + acc[updatedFilter.col] = {value: updatedFilter.value, matchMode: updatedFilter.filterMatchMode}; + return acc; + }, {} as Record) + }, update: true + })] + ) + )); + + + reFetchEndpoint = createEffect(() => this.actions$.pipe( + ofType( + ServingActions.fetchServingEndpoints, ServingActions.getNextServingEndpoints, ServingActions.fetchServingLoadingEndpoints + ), + switchMap((action) => this.store.select(selectActiveWorkspaceReady).pipe( + filter(ready => ready), + map(() => action))), + auditTime(100), + switchMap(action => iif(() => action.type === ServingActions.fetchServingEndpoints.type, + this.fetchEndpoint$(), this.fetchLoadingEndpoint$()) + .pipe( + mergeMap(res => [ + action.type === ServingActions.fetchServingEndpoints.type ? + ServingActions.setServingEndpoints({servingEndpoints: res.endpoints}) : ServingActions.setLoadingServingEndpoints({servingEndpoints: res.endpoints}), + deactivateLoader('Fetch Endpoint') + ]), + catchError(error => [ + requestFailed(error), + deactivateLoader('Fetch Endpoint'), + addMessage(MESSAGES_SEVERITY.WARN, 'Fetch Endpoint for selection failed', [{ + name: 'More info', + actions: [setServerError(error, null, 'Fetch Endpoint for selection failed')] + }]) + ]) + ) + ) + )); + + getUsersEffect = createEffect(() => this.actions$.pipe( + ofType(setProjectUsers), + concatLatestFrom(() => this.store.select(servingFeature.selectColumnFilters)), + map(([action, filters]) => { + const userFiltersValue = filters?.user?.['name']?.value ?? []; + const resIds = action.users.map(user => user.id); + const shouldGetFilteredUsersNames = !(userFiltersValue.every(id => resIds.includes(id))); + return shouldGetFilteredUsersNames ? getFilteredUsers({filteredUsers: userFiltersValue}) : emptyAction(); + }) + )); + + lockRefresh = false; + refreshEndpoints = createEffect(() => this.actions$.pipe( + ofType(ServingActions.refreshEndpoints, ServingActions.refreshLoadingEndpoints), + filter(() => !this.lockRefresh), + concatLatestFrom(() => [ + this.store.select(servingFeature.selectSelectedEndpoint), + this.store.select(servingFeature.selectEndpoints), + this.store.select(selectAppVisible), + this.store.select(selectRouterConfig) + ]), + filter(([, , , isVisible]) => isVisible), + //TODO: replace with exhaust map instead of lock mechanism + switchMap(([action, selectedEndpoint, endpoints, , routerConfig]) => { + this.lockRefresh = !action.autoRefresh; + return iif(() => action.type === ServingActions.refreshEndpoints.type, + this.fetchEndpoint$(), this.fetchLoadingEndpoint$()) + .pipe( + mergeMap(res => { + this.lockRefresh = false; + const resActions: Action[] = [deactivateLoader('Fetch Endpoint')]; + + if (selectedEndpoint && routerConfig.at(-1) === 'general') { + if (action.hideLoader || action.autoRefresh) { + resActions.push(ServingActions.refreshEndpointInfo({id: selectedEndpoint.id})); + } else { + resActions.push(ServingActions.getEndpointInfo({id: selectedEndpoint.id})); + } + } + if (selectedEndpoint && action.autoRefresh && isEqual(endpoints.map(endpoint => endpoint.id).sort(), res.endpoints.map(model => model.id).sort())) { + resActions.push(ServingActions.setServingEndpointsInPlace({servingEndpoints: res.endpoints})); + } else { + if (action.type === ServingActions.refreshEndpoints.type) { + resActions.push(ServingActions.setServingEndpoints({servingEndpoints: res.endpoints})); + } else { + resActions.push(ServingActions.setLoadingServingEndpoints({servingEndpoints: res.endpoints})); + } + } + return resActions; + }), + catchError(error => { + this.lockRefresh = false; + return [ + requestFailed(error), + deactivateLoader('Fetch Endpoint') + // addMessage(MESSAGES_SEVERITY.WARN, 'Fetch endpoints failed', [{ + // name: 'More info', + // actions: [setServerError(error, null, 'Fetch endpoints failed')] + // }]) + ]; + }) + ); + } + ) + )); + + updateEndpointUrlParamsLoading = createEffect(() => this.actions$.pipe( + ofType(ServingActions.updateUrlParamsFromLoadingState), + concatLatestFrom(() => [ + this.store.select(servingFeature.selectLoadingColumnFilters), + this.store.select(servingFeature.selectLoadingTableSortFields), + this.store.select(servingFeature.selectLoadingColsOrder) + ]), + mergeMap(([, filters, sortFields, colsOrder]) => + [setURLParams({ + filters: filters as any, + orders: sortFields, + columns: encodeColumns(servingLoadingTableCols, [], [], colsOrder) + })] + ) + )); + + updateEndpointUrlParams = createEffect(() => this.actions$.pipe( + ofType(ServingActions.updateUrlParamsFromState, ServingActions.toggleColHidden, ServingActions.addColumn, ServingActions.removeColumn), + concatLatestFrom(() => [ + this.store.select(servingFeature.selectColumnFilters), + this.store.select(servingFeature.selectTableSortFields), + this.store.select(servingFeature.selectMetricsCols), + this.store.select(servingFeature.selectColsOrder), + this.store.select(servingFeature.selectHiddenTableCols) + ]), + mergeMap(([, filters, sortFields, metadataCols, colsOrder, hiddenCols]) => + [setURLParams({ + filters: filters as any, + orders: sortFields, + columns: encodeColumns(servingTableCols, hiddenCols, metadataCols, colsOrder) + })] + ) + )); + + endpointSelectionChanged = createEffect(() => this.actions$.pipe( + ofType(ServingActions.servingEndpointSelectionChanged), + tap(action => this.navigateAfterEndpointSelectionChanged(action.servingEndpoint)), + mergeMap(() => [ServingActions.setTableViewMode({mode: 'info'})]) + )); + + selectNextEndpointEffect = createEffect(() => this.actions$.pipe( + ofType(ServingActions.getNextServingEndpoints), + concatLatestFrom(() => [ + this.store.select(servingFeature.selectSortedFilteredEndpoints), + this.store.select(servingFeature.selectTableMode) + ]), + filter(([, , tableMode]) => tableMode === 'info'), + tap(([, endpoints]) => this.navigateAfterEndpointSelectionChanged(endpoints[0] as EndpointStats, true)), + mergeMap(([, endpoints]) => [ServingActions.setTableViewMode({mode: endpoints.length > 0 ? 'info' : 'table'})]) + )); + + private previousSelectedId: string; + private previousSelectedLastUpdate: Date; + + getGetAllQuery({searchQuery, orderFields, filters, selectedIds = [], cols = [], metaCols = []}: { + searchQuery: SearchState['searchQuery']; + orderFields: SortMeta[]; + filters: Record; + selectedIds: string[]; + cols?: ISmCol[]; + metaCols?: ISmCol[]; + }): any { + const tableFilters = createFiltersFromStore(filters, true); + delete tableFilters['tags']; + return { + id: selectedIds, + ...tableFilters, + ...(searchQuery?.query && { + _any_: { + pattern: searchQuery.regExp ? searchQuery.query : escapeRegex(searchQuery.query), + fields: ['id', 'name', 'comment', 'system_tags'] + } + }), + order_by: encodeOrder(orderFields) + }; + } + + + fetchEndpoint$(): Observable { + return of(null) + .pipe( + switchMap(() => this.servingApi.servingGetEndpoints({}).pipe( + map((res: ServingGetEndpointsResponse) => ({ + endpoints: res.endpoints.map(endpoint => ({ + ...endpoint, + id: uuidv5(endpoint.url, uuidv5.URL) + })) + })) + ) + ) + ); + } + + fetchLoadingEndpoint$(): Observable { + return of(null) + .pipe( + switchMap(() => this.servingApi.servingGetLoadingInstances({}).pipe( + map((res: ServingGetLoadingInstancesResponse) => ({endpoints: res.instances as EndpointStats[]})) + ) + ) + ); + } + + setEndpointUrlParams(filters, sortFields, columns) { + this.store.dispatch(setURLParams({filters, orders: sortFields, columns})); + } + + navigateAfterEndpointSelectionChanged(selectedEndpoint: EndpointStats, replaceUrl = false) { + let activeChild = this.route.snapshot; + while (activeChild && !['general', 'monitor'].includes(activeChild?.firstChild?.url[0]?.path)) { + activeChild = activeChild.firstChild; + } + activeChild = activeChild?.firstChild; + const activeChildUrl = activeChild?.url?.[0]?.path ?? 'general'; + let baseUrl = this.route; + while (!['active', 'loading'].includes(baseUrl.snapshot.routeConfig?.path)) { + baseUrl = baseUrl.firstChild; + } + // baseUrl = baseUrl.firstChild.firstChild; + + if (selectedEndpoint) { + this.router.navigate(baseUrl.snapshot.url[0].path === 'loading' ? [] : [selectedEndpoint.id, activeChildUrl], { + queryParamsHandling: 'preserve', + relativeTo: baseUrl + }); + } else { + this.router.navigate(['endpoints', 'active'], {queryParamsHandling: 'preserve', replaceUrl}); + } + } + + getEndpointInfo$ = createEffect(() => this.actions$.pipe( + ofType(ServingActions.getEndpointInfo, ServingActions.refreshEndpointInfo), + concatLatestFrom(() => [ + this.store.select(servingFeature.selectSelectedEndpoint), + this.store.select(servingFeature.selectSelectedEndpoint), + this.store.select(servingFeature.selectEndpoints), + this.store.select(selectActiveWorkspace), + this.store.select(selectAppVisible) + ]), + filter(([, , , , , visible]) => visible), + switchMap(([action, tableSelected, selected, endpoints, , visible]) => { + const currentSelected = tableSelected || selected; + if (this.previousSelectedId && currentSelected?.id != this.previousSelectedId) { + this.previousSelectedLastUpdate = null; + } + this.previousSelectedId = currentSelected?.id ?? action.id; + if (!currentSelected || !visible) { + return of({action, updateTime: null, tableSelected, selected}); + } + + const listed = endpoints?.find(e => e.id === currentSelected?.id); + return of({action, updateTime: null, tableSelected: listed, selected}); + } + ), + filter(({action, tableSelected, selected}) => + (action.type !== ServingActions.refreshEndpointInfo.type || (!tableSelected) || (tableSelected?.url === selected?.url))), + switchMap(({action, updateTime}) => { + // else will deactivate loader + if ( + !updateTime || + (new Date(this.previousSelectedLastUpdate) < new Date(updateTime))) { + const autoRefresh = action.type === ServingActions.refreshEndpointInfo.type; + return [ + deactivateLoader(action.type), + ServingActions.getEndpoint({id: action.id, autoRefresh}) + ]; + } else { + return [deactivateLoader(action.type)]; + } + }) + )); + + getEndpoint = createEffect(() => this.actions$.pipe( + ofType(ServingActions.getEndpoint), + concatLatestFrom(() => [ + this.store.select(servingFeature.selectEndpoints), + this.store.select(selectAppVisible) + ]), + filter(([, , visible]) => visible), + switchMap(([action, endpoints]) => { + const selectedEndpoint = endpoints.find(endpoint => endpoint.id === action.id); + if (!selectedEndpoint) { + // this.router.navigateByUrl(['.'], {queryParamsHandling: 'preserve', relativeTo: this.route}); + this.navigateAfterEndpointSelectionChanged(null); + return [emptyAction()]; + } + return this.servingApi.servingGetEndpointDetails({endpoint_url: selectedEndpoint.url}) + .pipe( + mergeMap((endpointDetails: ServingGetEndpointDetailsResponse) => { + const endpoint = endpointDetails; + this.previousSelectedLastUpdate = endpoint.last_update; + const actions = [deactivateLoader(action.type)] as Action[]; + if (endpoint) { + actions.push(ServingActions.setServingEndpointDetails({endpoint})); + actions.push(ServingActions.getModelsSourceLinks({ + instances: endpoint.instances, + insideModel: endpoint.model_source === 'ClearML'})); + } + return actions; + }), + catchError(error => [ + ServingActions.setServingEndpointDetails({endpoint: null}), + requestFailed(error), + deactivateLoader(action.type), + addMessage(MESSAGES_SEVERITY.ERROR, 'Fetch Endpoint for selection failed', [{ + name: 'More info', + actions: [setServerError(error, null, 'Fetch Endpoint for selection failed')] + }]) + ]) + ); + } + ) + )); + + fetchGraphData$ = createEffect(() => { + return this.actions$.pipe( + ofType(ServingActions.getStats), + concatLatestFrom((action) => [ + this.store.select(servingFeature.selectStatsFormMetric(action.metricType)), + this.store.select(servingFeature.selectStatsTimeFrame), + this.store.select(servingFeature.selectSelectedEndpoint), + this.store.select(selectScaleFactor).pipe(map(factor => 100 / factor)) + ]), + mergeMap(([action, currentStats, rangeInput, endpoint, scale]) => { + const now = Math.floor((new Date()).getTime() / 1000); + const range = parseInt(rangeInput, 10); + const maxPoints = window.innerWidth * scale; + const granularity = Math.max(Math.floor(range / maxPoints * 2), 10); + const refresh = action.refresh && currentStats; + let fromDate: number; + + if (refresh) { + fromDate = currentStats.find(topic => topic.dates.length > 0).dates.at(-1).originalDate / 1000 + granularity; + } else { + 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 = []; + const averageOrTotal = [MetricTypeEnum.CpuUtil, MetricTypeEnum.GpuUtil, MetricTypeEnum.LatencyMs].includes(action.metricType) ? 'Mean' : 'Total'; + // For count charts show only total. + if (['cpu_count', 'gpu_count'].includes(action.metricType)) { + result.push(activitySeriesToTopic(res.total, 0, averageOrTotal)); + } else { + result = result.concat(Object.keys(res.instances || {}).length > 1 ? [activitySeriesToTopic(res.total, 0, averageOrTotal)] : []); + result = result.concat(...Object.keys(res.instances).map((series, index) => activitySeriesToTopic(res.instances[series], index + 1))); + } + + + const newTopics = result.map(topic => topic.topicID); + const oldTopics = currentStats?.filter(topic => !newTopics.includes(topic.topicID)) ?? []; + + if (refresh) { + const rangeStartFrom = (now - range) * 1000; + result = result.map(topic => ({ + ...topic, + dates: [ + ...(currentStats?.find(t => t.topicName === topic.topicName)?.dates.filter(date => date.originalDate > rangeStartFrom) ?? []), + ...topic.dates + ].sort((a, b) => a.originalDate - b.originalDate) + })).concat(oldTopics); + } + return ServingActions.setStats({data: {[action.metricType]: result} as Record}); + }), + catchError(error => action.refresh ? + of(requestFailed(error)) : + of(addMessage(MESSAGES_SEVERITY.WARN, 'Failed to fetch history \n' + JSON.stringify(error))) + ) + ); + }) + ); + }); + + buildModelReference = createEffect(() => this.actions$.pipe( + ofType(ServingActions.getModelsSourceLinks), + switchMap(action => { + return forkJoin([...action.instances.map(instance => { + const instanceId = instance.reference.find(ref => ref.type === ContainerInstanceStatsReference.TypeEnum.AppInstance); + const modelId = instance.reference.find(ref => ref.type === ContainerInstanceStatsReference.TypeEnum.Model); + const taskId = instance.reference.find(ref => ref.type === ContainerInstanceStatsReference.TypeEnum.Task); + const url = instance.reference.find(ref => ref.type === ContainerInstanceStatsReference.TypeEnum.Url); + if (instanceId) { + return this.tasksApi.tasksGetAllEx({id: [instanceId.value], only_fields: ['application.app_id', 'name']}) + .pipe( + map(res => ({appId: res.tasks[0].application?.app_id?.id, name: res.tasks[0].name})), + map(({name, appId}) => ({name, link: `/applications/${appId}/info;experimentId=${instanceId.value}?instancesFilter=All`})) + ); + } else if (modelId && action.insideModel) { + return this.modelsApi.modelsGetAllEx({id: [modelId.value], only_fields: ['project', 'name']}) + .pipe( + map(res => ({name: res.models[0].name, projectId: res.models[0].project.id})), + map(({name, projectId}) => ({name, link: `/projects/${projectId}/models/${modelId.value}/output/general`})) + ); + } else if (taskId) { + return this.tasksApi.tasksGetAllEx({id: [taskId.value], only_fields: ['project', 'name']}) + .pipe( + map(res => ({name: res.tasks[0].name, projectId: res.tasks[0].project.id})), + map(({name, projectId}) => ({name, link: `/projects/${projectId}/experiments/${taskId.value}/output/execution`})) + ); + } else { + return of({name: url?.value, link: url?.value}); + } + })]); + }), + map((links) => ServingActions.setModelsSourceLinks({modelsLinks: links})) + )); + +} diff --git a/src/app/webapp-common/serving/serving.module.ts b/src/app/webapp-common/serving/serving.module.ts new file mode 100644 index 00000000..01884d54 --- /dev/null +++ b/src/app/webapp-common/serving/serving.module.ts @@ -0,0 +1,137 @@ +import {InjectionToken, NgModule} from '@angular/core'; +import {CommonModule, DatePipe} from '@angular/common'; +import {ServingRouterModule} from './serving-routing.module'; +import {EffectsModule} from '@ngrx/effects'; +import {ActionReducer, StoreConfig, StoreModule} from '@ngrx/store'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import {ExperimentSharedModule} from '~/features/experiments/shared/experiment-shared.module'; +import {AngularSplitModule} from 'angular-split'; +import {SmFormBuilderService} from '../core/services/sm-form-builder.service'; +import {merge, pick} from 'lodash-es'; +import {ExperimentGraphsModule} from '@common/shared/experiment-graphs/experiment-graphs.module'; +import {createUserPrefFeatureReducer} from '@common/core/meta-reducers/user-pref-reducer'; +import {UserPreferences} from '@common/user-preferences'; +import {RouterTabNavBarComponent} from '@common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component'; +import {PushPipe} from '@ngrx/component'; +import {servingFeature, servingFeatureKey, State} from '@common/serving/serving.reducer'; +import {ServingEffects} from '@common/serving/serving.effects'; +import {ServingComponent} from '@common/serving/serving.component'; +import {ServingHeaderComponent} from '@common/serving/serving-header/serving-header.component'; +import {ServingGeneralInfoComponent} from '@common/serving/serving-general-info/serving-general-info.component'; +import {ServingInfoComponent} from '@common/serving/serving-info/serving-info.component'; +import {ServingTableComponent} from '@common/serving/serving-table/serving-table.component'; +import {TableCardComponent} from '@common/shared/ui-components/data/table-card/table-card.component'; +import {HyperParamMetricColumnComponent} from '@common/experiments/shared/components/hyper-param-metric-column/hyper-param-metric-column.component'; +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 {ColGetterPipe} from '@common/shared/pipes/col-getter.pipe'; +import {TagListComponent} from '@common/shared/ui-components/tags/tag-list/tag-list.component'; +import {TableFilterSortTemplateComponent} from '@common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component'; +import {TableCardFilterTemplateComponent} from '@common/shared/ui-components/data/table/table-card-filter-template/table-card-filter-template.component'; +import {TableComponent} from '@common/shared/ui-components/data/table/table.component'; +import {TimeAgoPipe} from '@common/shared/pipes/timeAgo'; +import {FilterPipe} from '@common/shared/pipes/filter.pipe'; +import {PrimeTemplate} from 'primeng/api'; +import {IdBadgeComponent} from '@common/shared/components/id-badge/id-badge.component'; +import {DurationPipe} from '@common/shared/pipes/duration.pipe'; +import {ButtonToggleComponent} from '@common/shared/ui-components/inputs/button-toggle/button-toggle.component'; +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 {RefreshButtonComponent} from '@common/shared/components/refresh-button/refresh-button.component'; +import {ClearFiltersButtonComponent} from '@common/shared/components/clear-filters-button/clear-filters-button.component'; +import {LabeledRowComponent} from '@common/shared/ui-components/data/labeled-row/labeled-row.component'; +import {CopyClipboardComponent} from '@common/shared/ui-components/indicators/copy-clipboard/copy-clipboard.component'; +import {ServingLoadingComponent} from '@common/serving/serving-loading.component'; +import {ServingEmptyStateComponent} from '~/features/serving/empty-state/serving-empty-state.component'; +import {FileSizePipe} from '@common/shared/pipes/filesize.pipe'; + + +export const servingSyncedKeys = [ + 'columnsSortOrder', + 'columnFilters', + 'columnsWidth', + 'hiddenProjectTableCols', + 'colsOrder', + 'hiddenCharts' +]; + +export const SERVING_CONFIG_TOKEN = + new InjectionToken>('EndpointsConfigToken'); + +const localStorageKey = '_saved_endpoints_state_'; + +const getInitState = (userPreferences: UserPreferences) => ({ + metaReducers: [ + reducer => { + let onInit = true; + return (state, action) => { + const nextState = reducer(state, action); + if (onInit) { + onInit = false; + const savedState = JSON.parse(localStorage.getItem(localStorageKey)); + return merge({}, nextState, savedState); + } + if (action.type.startsWith(servingFeatureKey)) { + localStorage.setItem(localStorageKey, JSON.stringify(pick(nextState,['tableMode', 'hiddenCharts']))); + } + return nextState; + }; + }, + (reducer: ActionReducer) => + createUserPrefFeatureReducer( + servingFeatureKey, servingSyncedKeys, ['[serving]'], + userPreferences, reducer + ), + ] +}); + + +@NgModule({ + imports: [ + ExperimentSharedModule, + FormsModule, + ReactiveFormsModule, + CommonModule, + ServingRouterModule, + ExperimentSharedModule, + AngularSplitModule, + StoreModule.forFeature(servingFeature.name, servingFeature.reducer, SERVING_CONFIG_TOKEN), + EffectsModule.forFeature(ServingEffects), + ExperimentGraphsModule, + RouterTabNavBarComponent, + PushPipe, + TableCardComponent, + HyperParamMetricColumnComponent, + ShowTooltipIfEllipsisDirective, + TooltipDirective, + ColGetterPipe, + TagListComponent, + TableFilterSortTemplateComponent, + TableCardFilterTemplateComponent, + TableComponent, + TimeAgoPipe, + FilterPipe, + PrimeTemplate, + IdBadgeComponent, + DurationPipe, + ButtonToggleComponent, + MenuComponent, + MenuItemComponent, + RefreshButtonComponent, + ClearFiltersButtonComponent, + LabeledRowComponent, + CopyClipboardComponent, + ServingEmptyStateComponent, + FileSizePipe + ], + providers: [ + SmFormBuilderService, DatePipe, + {provide: SERVING_CONFIG_TOKEN, useFactory: getInitState, deps: [UserPreferences]}, + ], + declarations: [ServingInfoComponent, ServingComponent, ServingLoadingComponent, + ServingGeneralInfoComponent, ServingHeaderComponent, + ServingTableComponent + ] +}) +export class ServingModule { +} diff --git a/src/app/webapp-common/serving/serving.reducer.ts b/src/app/webapp-common/serving/serving.reducer.ts new file mode 100644 index 00000000..cc654a58 --- /dev/null +++ b/src/app/webapp-common/serving/serving.reducer.ts @@ -0,0 +1,297 @@ +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 {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 {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'; +import {ServingGetEndpointMetricsHistoryRequest} from '~/business-logic/model/serving/servingGetEndpointMetricsHistoryRequest'; +import MetricTypeEnum = ServingGetEndpointMetricsHistoryRequest.MetricTypeEnum; +import {EndpointStats} from '~/business-logic/model/serving/endpointStats'; +import {ContainerInfo} from '~/business-logic/model/serving/containerInfo'; + +export const servingFeatureKey = 'serving'; + +export interface State { + splitSize: number; + endpoints: EndpointStats[]; + loadingEndpoints: ContainerInfo[]; + // tableFilters: Record; + tempFilters: Record; + columnFilters: Record; + colsOrder: string[]; + tableSortFields: SortMeta[]; + columnsWidth: Record; + loadingColumnFilters: Record; + loadingColsOrder: string[]; + loadingTableSortFields: SortMeta[]; + loadingColumnsWidth: Record; + hiddenTableCols: Record; + selectedEndpoints: EndpointStats[]; + selectedEndpoint: EndpointStats; + endpointDetails: ServingGetEndpointDetailsResponse; + // noMoreEndpoint: boolean; + // scrollId: string; + globalFilter: SearchState['searchQuery']; + showAllSelectedIsActive: boolean; + tags: string[]; + metricsCols: ISmCol[]; + metricVariants: MetricVariantResult[]; + tableMode: 'info' | 'table'; + statsTimeFrame: string; + statsParam: string; + stats: Record; + showNoStatsNotice: boolean; + hiddenCharts: string[]; + instancesLinks: Record[]; +} + +export const initialState: State = { + endpoints: null, + loadingEndpoints: null, + splitSize: 65, + hiddenTableCols: {comment: true, id: true}, + // tableFilters: {}, + tempFilters: {}, + tableSortFields: [], + loadingTableSortFields: [], + metricsCols: [], + metricVariants: null, + columnFilters: {}, + loadingColumnFilters: {}, + columnsWidth: {}, + loadingColumnsWidth: {}, + selectedEndpoints: [], + colsOrder: [], + loadingColsOrder: [], + selectedEndpoint: null, + endpointDetails: null, + globalFilter: null, + showAllSelectedIsActive: false, + tags: [], + tableMode: 'table', + statsParam: 'cpu_usage;gpu_usage', + statsTimeFrame: (3 * TIME_INTERVALS.HOUR).toString(), + stats: null, + showNoStatsNotice: false, + hiddenCharts: [], + instancesLinks: null +}; + +export const reducer = createReducer( + initialState, + on(ServingActions.resetState, (state): State => ({ + ...state, + endpoints: initialState.endpoints, + loadingEndpoints: initialState.loadingEndpoints, + selectedEndpoint: initialState.selectedEndpoint, + endpointDetails: initialState.endpointDetails + })), + on(setSelectedProject, (state): State => ({...state, selectedEndpoints: initialState.selectedEndpoints})), + on(ServingActions.addServingEndpoints, (state, action): State => + ({...state, endpoints: state.endpoints?.concat(action.servingEndpoints) || null})), + on(ServingActions.showSelectedOnly, (state, action): State => + ({ + ...state, + showAllSelectedIsActive: action.active, + globalFilter: initialState.globalFilter, + tempFilters: state.columnFilters || {}, + ...(state.showAllSelectedIsActive && {columnFilters: action.active ? initialState.columnFilters : state.tempFilters}) + })), + on(ServingActions.setServingEndpoints, (state, action): State => + ({...state, endpoints: action.servingEndpoints})), + on(ServingActions.setLoadingServingEndpoints, (state, action): State => + ({...state, loadingEndpoints: action.servingEndpoints})), + on(ServingActions.setServingEndpointsInPlace, (state, action): State => + ({ + ...state, endpoints: state.endpoints?.map(currModel => action.servingEndpoints?.find(newModel => newModel.id === currModel.id)) || null + })), + on(ServingActions.setSelectedServingEndpoints, (state, action): State => + ({...state, selectedEndpoints: action.servingEndpoints as unknown as EndpointStats[]})), + on(ServingActions.setSelectedServingEndpoint, (state, action): State => + ({...state, selectedEndpoint: action.endpoint})), + on(ServingActions.setServingEndpointDetails, (state, action): State => + ({...state, endpointDetails: action.endpoint})), + on(ServingActions.globalFilterChanged, (state, action): State => + ({...state, globalFilter: action as ReturnType})), + on(ServingActions.resetGlobalFilter, (state): State => + ({...state, globalFilter: initialState.globalFilter})), + on(ServingActions.toggleColHidden, (state, action): State => + ({ + ...state, + hiddenTableCols: { + ...(state.hiddenTableCols || initialState.hiddenTableCols), + [action.columnId]: state.hiddenTableCols?.[action.columnId] ? undefined : true + } + })), + on(ServingActions.setHiddenCols, (state, action): State => + ({...state, hiddenTableCols: action.hiddenCols})), + on(ServingActions.addColumn, (state, action): State => + ({...state, metricsCols: [...state.metricsCols, action.col]})), + on(ServingActions.removeColumn, (state, action): State => ({ + ...state, + metricsCols: [...state.metricsCols.filter(tableCol => !(tableCol.key === action.id))], + colsOrder: state.colsOrder ? state.colsOrder.filter(colId => colId !== action.id) : null + })), + on(ServingActions.setExtraColumns, (state, action): State => + ({ + ...state, + metricsCols: [...state.metricsCols, ...action.columns] + })), + on(ServingActions.setTags, (state, action): State => ({...state, tags: action.tags})), + on(ServingActions.addTag, (state, action): State => ({...state, tags: Array.from(new Set(state.tags.concat(action.tag))).sort()})), + on(ServingActions.setTableSort, (state, action): State => { + const colIds = (Object.values(servingTableColFields) as string[]).concat(state.metricsCols.map(col => col.id)); + let orders = action.orders.filter(order => colIds.includes(order.field)); + orders = orders.length > 0 ? orders : null; + return { + ...state, + tableSortFields: orders + }; + }), + on(ServingActions.setColumnWidth, (state, action): State => ({ + ...state, + columnsWidth: { + ...state.columnsWidth, + [action.columnId]: action.widthPx + } + })), + on(ServingActions.setColsOrder, (state, action): State => + ({...state, colsOrder: action.cols})), + on(ServingActions.setTableFilters, (state, action): State => ({ + ...state, + columnFilters: { + ...action.filters.reduce((obj, filter: TableFilter) => { + obj[filter.col] = {value: filter.value, matchMode: filter.filterMatchMode}; + return obj; + }, {} as Record) + } + })), + on(ServingActions.setLoadingTableSort, (state, action): State => { + const colIds = (Object.values(servingLoadingTableColFields) as string[]); + let orders = action.orders.filter(order => colIds.includes(order.field)); + orders = orders.length > 0 ? orders : null; + return { + ...state, + loadingTableSortFields: orders + }; + }), + on(ServingActions.setLoadingColumnWidth, (state, action): State => ({ + ...state, + loadingColumnsWidth: { + ...state.columnsWidth, + [action.columnId]: action.widthPx + } + })), + on(ServingActions.setLoadingColsOrder, (state, action): State => + ({...state, loadingColsOrder: action.cols})), + on(ServingActions.setLoadingTableFilters, (state, action): State => ({ + ...state, + loadingColumnFilters: { + ...action.filters.reduce((obj, filter: TableFilter) => { + obj[filter.col] = {value: filter.value, matchMode: filter.filterMatchMode}; + return obj; + }, {} as Record) + } + })), + on(ServingActions.removeMetricColumn, (state, action): State => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const {[action.id]: removedCol, ...remainingColsWidth} = state.columnsWidth || {}; + return { + ...state, + metricsCols: [...state.metricsCols.filter(tableCol => tableCol.id !== action.id)], + tableSortFields: state.tableSortFields?.filter(order => order.field !== action.id) || null, + columnsWidth: remainingColsWidth, + colsOrder: state.colsOrder ? state.colsOrder.filter(colId => colId !== action.id) : null + }; + }), + on(ServingActions.setSplitSize, (state, action): State => + ({...state, splitSize: action.splitSize})), + on(ServingActions.setTableViewMode, (state, action): State => ({...state, tableMode: action.mode})), + on(ServingActions.setCustomMetrics, (state, action): State => ({...state, metricVariants: action.metrics})), + on(ServingActions.setStats, (state, action): State => ({ + ...state, + stats: { + ...state.stats, + ...action.data + } + })), + on(ServingActions.showStatsErrorNotice, (state, action): State => ({...state, showNoStatsNotice: action.show})), + on(ServingActions.setStatsTimeframe, (state, action): State => ({...state, statsTimeFrame: action.timeFrame})), + on(ServingActions.setChartHidden, (state, action): State => ({...state, hiddenCharts: action.hiddenList})), + on(ServingActions.setModelsSourceLinks, (state, action): State => ({...state, instancesLinks: action.modelsLinks})) +); + +export const servingFeature = createFeature({ + name: servingFeatureKey, + reducer, + extraSelectors: ({ + selectHiddenTableCols, selectColumnsWidth, selectLoadingColumnsWidth, + selectMetricsCols, selectLoadingTableSortFields, selectTableSortFields, + selectStats, selectLoadingColumnFilters, selectColumnFilters, selectEndpoints, selectLoadingEndpoints + }) => { + const selectServingTableColumns = createSelector(selectHiddenTableCols, selectColumnsWidth, (hiddenTableCols, columnsWidth) => servingTableCols.map(col => ({ + ...col, + // hidden: !!hiddenTableCols[col.id], + style: {...col.style, ...(columnsWidth[col.id] && {width: `${columnsWidth[col.id]}px`})} + } as ISmCol))); + + const selectLoadingServingTableColumns = createSelector(selectLoadingColumnsWidth, (columnsWidth) => servingLoadingTableCols.map(col => ({ + ...col, + style: {...col.style, ...(columnsWidth[col.id] && {width: `${columnsWidth[col.id]}px`})} + } as ISmCol))); + + const selectFilteredTableCols = createSelector(selectServingTableColumns, selectMetricsCols, (tableCols, metaCols) => + tableCols.concat(metaCols.map(col => ({...col, meta: true}))) + ); + + const selectTableSortFields1 = createSelector(selectTableSortFields, (sortFields) => + sortFields?.length > 0 ? sortFields : [{ + field: servingTableColFields.uptime, + order: TABLE_SORT_ORDER.DESC + }] + ); + const selectLoadingTableSortFields1 = createSelector(selectLoadingTableSortFields, (sortFields) => + sortFields?.length > 0 ? sortFields : [{ + field: servingTableColFields.uptime, + order: TABLE_SORT_ORDER.DESC + }] + ); + 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) ?? []))) + const inputTypesOptions = createSelector(selectLoadingEndpoints, (endpoints) => + 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); + }) + const selectStatsFormMetric = (metricType: MetricTypeEnum) => createSelector(selectStats, (stats) => stats?.[metricType]); + return { + selectServingTableColumns, + selectLoadingServingTableColumns, + selectFilteredTableCols, + selectTableSortFields: selectTableSortFields1, + selectLoadingTableSortFields: selectLoadingTableSortFields1, + selectStatsFormMetric, + modelNamesOptions, + modelLoadingNamesOptions, + inputTypesOptions, + preprocessArtifactOptions, + selectSortedFilteredEndpoints, + selectLoadingSortedFilteredEndpoints + }; + } +}); + diff --git a/src/app/webapp-common/serving/serving.selectors.ts b/src/app/webapp-common/serving/serving.selectors.ts new file mode 100644 index 00000000..e4b8dfda --- /dev/null +++ b/src/app/webapp-common/serving/serving.selectors.ts @@ -0,0 +1,7 @@ +import { createFeatureSelector, createSelector } from '@ngrx/store'; +import * as fromServing from './serving.reducer'; + +export const selectServingState = createFeatureSelector( + fromServing.servingFeatureKey, + +); 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 95a00ca4..f93861b8 100755 --- 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 @@ -16,8 +16,8 @@ {{credential?.last_used_from ? credential?.last_used_from : 'Not available'}}
- - + +
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 f2c62400..cb2bea03 100755 --- 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 @@ -40,7 +40,6 @@ thead { &:nth-child(1) { width: 300px; - padding-left: 24px; } &:nth-child(2) { @@ -80,10 +79,6 @@ tbody { padding: 0 8px; white-space: nowrap; - &:first-child { - padding-left: 24px; - } - &:last-of-type { text-align: center; } diff --git a/src/app/webapp-common/settings/admin/admin-dialog-template/admin-dialog-template.component.scss b/src/app/webapp-common/settings/admin/admin-dialog-template/admin-dialog-template.component.scss index 1546aa36..d6698fa9 100755 --- a/src/app/webapp-common/settings/admin/admin-dialog-template/admin-dialog-template.component.scss +++ b/src/app/webapp-common/settings/admin/admin-dialog-template/admin-dialog-template.component.scss @@ -34,6 +34,8 @@ $credentialBaseHeight: 252px; .code-container{ height: $credentialBaseHeight; transition: height 1s ease; + margin-bottom: 16px; + &.jupyter{ height: $credentialBaseHeight - 50; } diff --git a/src/app/webapp-common/settings/admin/admin-footer/admin-footer.component.html b/src/app/webapp-common/settings/admin/admin-footer/admin-footer.component.html index 4b72c6b9..b6e755b6 100644 --- a/src/app/webapp-common/settings/admin/admin-footer/admin-footer.component.html +++ b/src/app/webapp-common/settings/admin/admin-footer/admin-footer.component.html @@ -3,7 +3,7 @@
WebApp: {{version["docker-image"] || version.version}} - + • Server: {{serverVersions?.server}} • API: {{serverVersions?.api}} diff --git a/src/app/webapp-common/settings/admin/admin.component.scss b/src/app/webapp-common/settings/admin/admin.component.scss index 9359817d..1fd271a8 100644 --- a/src/app/webapp-common/settings/admin/admin.component.scss +++ b/src/app/webapp-common/settings/admin/admin.component.scss @@ -13,11 +13,11 @@ $tab-width: 15vw; header { - padding: 20px 24px; + padding: 20px 0; } .main { - padding: 0 24px; + padding: 0; } @@ -56,6 +56,7 @@ $tab-width: 15vw; border-radius: 4px; border: solid 1px $blue-500; background-color: $blue-650; + margin-bottom: 24px; padding: 16px; .read-only-title { diff --git a/src/app/webapp-common/settings/admin/base-admin.service.ts b/src/app/webapp-common/settings/admin/base-admin.service.ts index 5b90b632..071b46cb 100755 --- a/src/app/webapp-common/settings/admin/base-admin.service.ts +++ b/src/app/webapp-common/settings/admin/base-admin.service.ts @@ -1,20 +1,18 @@ -import {inject, Injectable} from '@angular/core'; +import {effect, inject, Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; import {from, fromEvent, Observable, of, Subject} from 'rxjs'; import {fromFetch} from 'rxjs/fetch'; -import {catchError, debounceTime, filter, map, skip} from 'rxjs/operators'; +import {catchError, debounceTime, filter, map} from 'rxjs/operators'; import {DeleteObjectsCommand, GetObjectCommand, ObjectIdentifier, S3Client, S3ClientConfig} from '@aws-sdk/client-s3'; import {getSignedUrl} from '@aws-sdk/s3-request-presigner'; import {convertToReverseProxy, isFileserverUrl} from '~/shared/utils/url'; import { Credentials, selectRevokeSucceed, - selectS3BucketCredentials, selectS3BucketCredentialsBucketCredentials } from '../../core/reducers/common-auth-reducer'; import {getAllCredentials, refreshS3Credential, showLocalFilePopUp} from '../../core/actions/common-auth.actions'; import {ConfigurationService} from '../../shared/services/configuration.service'; -import {Environment} from '../../../../environments/base'; import {DEFAULT_REGION} from '../../shared/utils/amazon-s3-uri'; import {getBucketAndKeyFromSrc, isGoogleCloudUrl, SignResponse} from '@common/settings/admin/base-admin-utils'; @@ -25,28 +23,23 @@ const HTTP_REGEX = /^https?:\/\//; @Injectable() export class BaseAdminService { - // bucketCredentials: Observable; - public s3Services: {[bucket: string]: S3Client} = {}; - revokeSucceed: Observable; - private readonly s3BucketCredentials: Observable<{ bucketCredentials: Credentials[] }>; - private localServerWorking = false; - private environment: Environment; + protected store = inject(Store); + protected confService = inject(ConfigurationService); + + public s3Services: Record = {}; + private revokeSucceed = this.store.selectSignal(selectRevokeSucceed); + private environment = this.confService.configuration; + private credentials = this.getCredentialsObservable() private deleteS3FilesSubject: Subject<{ success: boolean; files: string[] }>; - private credentials: Credentials[]; - protected store: Store; - protected confService: ConfigurationService; + private localServerWorking = false; constructor() { - this.store = inject(Store); - this.confService = inject(ConfigurationService); - this.revokeSucceed = this.store.select(selectRevokeSucceed); - this.revokeSucceed.subscribe(this.onRevokeSucceed); - this.s3BucketCredentials = this.store.select(selectS3BucketCredentials); - this.s3BucketCredentials.pipe(skip(1)).subscribe(() => { + effect(() => { + if (this.revokeSucceed()) { + this.getAllCredentials(); + } }); - this.store.select(selectS3BucketCredentialsBucketCredentials) - .subscribe(cred => this.credentials = cred); - this.confService.getEnvironment().subscribe(conf => this.environment = conf); + this.deleteS3FilesSubject = new Subject(); fromEvent(window, 'storage') @@ -59,22 +52,29 @@ export class BaseAdminService { }); } + protected getCredentialsObservable() { + return this.store.selectSignal(selectS3BucketCredentialsBucketCredentials); + } + showLocalFilePopUp(url) { this.store.dispatch(showLocalFilePopUp({url})); } - signUrlIfNeeded(url: string, config?: { skipLocalFile?: boolean; skipFileServer?: boolean; disableCache?: number }, previousSignedUrl?: { signed: string; expires: number }): - Observable { + signUrlIfNeeded( + url: string, + config?: { skipLocalFile?: boolean; skipFileServer?: boolean; disableCache?: number }, + previousSignedUrl?: { signed: string; expires: number } + ): Observable { config = {...{skipLocalFile: true, skipFileServer: this.confService.getStaticEnvironment().production, disableCache: null}, ...config}; if (isFileserverUrl(url)) { - if (this.environment.communityServer) { + if (this.environment().communityServer) { url = this.addTenant(url); } if (config.disableCache) { url = this.addS3TimeStamp(url, config.disableCache); } - if (!config.skipFileServer && this.environment.useFilesProxy) { + if (!config.skipFileServer && this.environment().useFilesProxy) { return of({type: 'sign', signed: convertToReverseProxy(url), expires: Number.MAX_VALUE}); } return of({type: 'sign', signed: url, expires: Number.MAX_VALUE}); @@ -86,7 +86,7 @@ export class BaseAdminService { } if (this.isAzureUrl(url)) { - const azureBucket = this.credentials.find((b) => b.Bucket && b.Bucket.toLowerCase() == 'azure'); + const azureBucket = this.credentials().find((b) => b.Bucket && b.Bucket.toLowerCase() == 'azure'); if (azureBucket) { return of({type: 'sign', signed: this.signAzureUrl(url, azureBucket), expires: Number.MAX_VALUE}); } @@ -98,7 +98,6 @@ export class BaseAdminService { } const s3 = this.findOrInitBucketS3(bucketKeyEndpoint); if (s3) { - // eslint-disable-next-line @typescript-eslint/naming-convention const command = new GetObjectCommand({ Key: bucketKeyEndpoint.Key, Bucket: bucketKeyEndpoint.Bucket/*, ResponseContentType: 'image/jpeg'*/ @@ -121,9 +120,9 @@ export class BaseAdminService { } findS3CredentialsInStore(bucketKeyEndpoint: Credentials) { - const endpoint = bucketKeyEndpoint.Endpoint?.replace(HTTP_REGEX,''); - return this.credentials - .find(bucket => bucket?.Bucket === bucketKeyEndpoint.Bucket && bucket?.Endpoint?.replace(HTTP_REGEX,'') === endpoint); + const endpoint = bucketKeyEndpoint.Endpoint?.replace(HTTP_REGEX,'') ?? ''; + return this.credentials() + .find(bucket => bucket?.Bucket === bucketKeyEndpoint.Bucket && (bucket?.Endpoint?.replace(HTTP_REGEX,'') ?? '') === endpoint); } findOrInitBucketS3(bucketKeyEndpoint: Credentials) { @@ -171,8 +170,6 @@ export class BaseAdminService { this.store.dispatch(getAllCredentials({})); } - private onRevokeSucceed = (bool) => bool ? this.getAllCredentials() : false; - // Uses Allegro Chrome extension injecting patch_local_link function to window - hack to get local files. redirectToLocalServer(url: string): string { return `http://localhost:${LOCAL_SERVER_PORT}${url.replace('file://', '/')}`; @@ -206,7 +203,8 @@ export class BaseAdminService { } signAzureUrl(url: string, azureBucket) { - const sas = azureBucket ? azureBucket.Secret : ''; + let sas = azureBucket ? azureBucket.Secret : ''; + sas = sas.startsWith('?') ? sas : `?${sas}`; const sasQueryString = url.includes('?') ? sas.replace('?', '&') : sas; return url.replace('azure://', 'https://').concat(sasQueryString); } @@ -225,7 +223,7 @@ export class BaseAdminService { const bucketKeyEndpoint = url && getBucketAndKeyFromSrc(url); const s3 = this.findOrInitBucketS3(bucketKeyEndpoint) as S3Client; - /* eslint-disable @typescript-eslint/naming-convention */ + const command = new DeleteObjectsCommand({ Bucket: bucketKeyEndpoint.Bucket, Delete: { @@ -233,7 +231,7 @@ export class BaseAdminService { Objects: files.map(file => ({Key: file} as ObjectIdentifier)) } }); - /* eslint-enable @typescript-eslint/naming-convention */ + if (s3) { s3.send(command).then(response => { if (response.Errors?.length > 0) { diff --git a/src/app/webapp-common/settings/admin/profile-key-storage/profile-key-storage.component.html b/src/app/webapp-common/settings/admin/profile-key-storage/profile-key-storage.component.html index 5d9b44c0..63ea8e51 100644 --- a/src/app/webapp-common/settings/admin/profile-key-storage/profile-key-storage.component.html +++ b/src/app/webapp-common/settings/admin/profile-key-storage/profile-key-storage.component.html @@ -1,13 +1,11 @@
WEB APP CLOUD ACCESS -
-
- - + smTooltip="Local, browser cached, access tokens that facilitate retrieving your cloud stored resources">
+ + 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 6b0b5390..d7cedb01 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 @@ -1,17 +1,26 @@ -import {Component} from '@angular/core'; +import {Component, input} from '@angular/core'; import {Store} from '@ngrx/store'; import {Credentials, selectS3BucketCredentials} from '@common/core/reducers/common-auth-reducer'; import {updateS3Credential} from '@common/core/actions/common-auth.actions'; import {AdminService} from '~/shared/services/admin.service'; +import {S3AccessComponent} from '@common/settings/admin/s3-access/s3-access.component'; +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'] + styleUrls: ['./profile-key-storage.component.scss'], + standalone: true, + imports: [ + S3AccessComponent, + FormsModule, + TooltipDirective + ] }) export class ProfileKeyStorageComponent { - - public s3BucketCredentials$ = this.store.select(selectS3BucketCredentials); + externalCredentials = input([]); + protected s3BucketCredentials = this.store.selectSignal(selectS3BucketCredentials); constructor(private store: Store, private adminService: AdminService) { } 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 78347781..0ad434ff 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 @@ -1,16 +1,36 @@ -
-
- -
{{currentUser.name}}
- -
Email address:
-
{{currentUser.email}}
-
+@if (currentUser()) { +
+
+
+ +
{{ currentUser().name }}
+ + +
+ @if (currentUser().email) { +
+
EMAIL ADDRESS
+
+ {{ currentUser().email }} +
+
+ @if (currentUser().company?.id){ +
+
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 4fb54a63..c252769f 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 @@ -2,6 +2,7 @@ :host { .header { + gap: 24px; font-size: 16px; .user-icon { width: 88px; @@ -10,16 +11,17 @@ overflow: hidden; background-image: url(../../../../webapp-common/assets/icons/icon-profile-user.svg); } - - .profile-email { - margin-top: 12px; - color: $blue-400; + + .profile-label { + font-size: 12px; + color: $blue-300; + font-weight: 500;; } .profile-name { display: flex; align-items: center; - padding-left: 32px; + padding-left: 64px; min-height: 32px; &.edit { transform: translateX(18px); 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 7eed3388..bcf90b90 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,10 +1,10 @@ -import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core'; +import {ChangeDetectionStrategy, Component, effect, signal} from '@angular/core'; import {Store} from '@ngrx/store'; -import {filter, take} from 'rxjs/operators'; 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'; @Component({ selector: 'sm-profile-name', @@ -12,23 +12,24 @@ import {GetCurrentUserResponseUserObject} from '~/business-logic/model/users/get styleUrls: ['./profile-name.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class ProfileNameComponent implements OnInit { +export class ProfileNameComponent { - currentUser$ = this.store.select(selectCurrentUser); - active = false; + currentUser = this.store.selectSignal(selectCurrentUser); + active = signal(false); - constructor(private store: Store) { } - - ngOnInit(): void { - this.currentUser$ - .pipe(filter(user => !!user), take(1)) - .subscribe(() => { + constructor(private store: Store) { + effect(() => { + if (this.currentUser()) { this.store.dispatch(getAllCredentials({})); - }); + } + }, {allowSignalWrites: true}); } nameChange(updatedUserName: string, currentUser: GetCurrentUserResponseUserObject) { const user = {name: updatedUserName, user: currentUser.id}; this.store.dispatch(updateCurrentUser({user})); } + copyToClipboard() { + this.store.dispatch(addMessage('success', 'Copied to clipboard')); + } } 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 a46e0344..8b9d39ef 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 @@ -5,14 +5,14 @@ (change)="statsChange($event)" [checked]="show()" color="accent" - >Show Hidden Projects + >Show Hidden Projects } Don’t show ClearML examples + >Don't show ClearML examples @if (supportReScaling) { - Reload to apply + } @if (tipsService.hasTips()) { @@ -32,17 +32,20 @@ (change)="setNeverShowTipsAgain($event)" [checked]="neverShowTipsAgain()?.includes(popupId)" color="accent" - >Don’t show pro tips periodically + >Don't show pro tips periodically } Block running user's scripts in the browser
@@ -55,7 +58,7 @@ data-id="hideSpecificargInfoIcon" smTooltip="Redact the values for the specified container environment variables in the experiment execution page" > - Edit + 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 701a76c4..cac17dfc 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 @@ -2,17 +2,10 @@ :host { .reload { - color: transparent; - text-decoration: underline; - position: absolute; - right: 50px; - transition: color 0.5s ease-in-out, right 0.5s ease-in-out; - - &.highlight { + color: $neon-yellow; + &:hover { color: $neon-yellow; - right: -80px; } - } .al-icon { @@ -23,12 +16,11 @@ } .toggles { - display: inline-flex; + display: flex; position: relative; flex-direction: column; margin-top: 0; - mat-slide-toggle, - sm-usage-stats { + mat-slide-toggle { margin-bottom: 12px; } } 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 af5de2e3..07070486 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 @@ -1,6 +1,7 @@ import {ChangeDetectionStrategy, Component, computed, inject} from '@angular/core'; import {MatSlideToggle, MatSlideToggleChange} from '@angular/material/slide-toggle'; import {neverShowPopupAgain, setHideRedactedArguments} from '@common/core/actions/layout.actions'; +import {ConfigurationService} from '@common/shared/services/configuration.service'; import {Store} from '@ngrx/store'; import {popupId, TipsService} from '@common/shared/services/tips.service'; import {selectHideRedactedArguments, selectNeverShowPopups} from '@common/core/reducers/view.reducer'; @@ -31,7 +32,8 @@ export class ProfilePreferencesComponent { private store = inject(Store); private dialog = inject(MatDialog); - public tipsService = inject(TipsService); + protected config = inject(ConfigurationService); + protected tipsService = inject(TipsService); public featuresEnum = FeaturesEnum; public supportReScaling = window['chrome'] || window['safari']; public disableHidpiChanged: boolean = false; 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 723e1080..f95ab93e 100755 --- 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 @@ -1,34 +1,49 @@ - -
-
Bucket
-
Key
-
Secret / SAS
-
Token
-
AWS Region
-
Host (Endpoint)
-
-
- - - - - - - -
- - - - - - +@if (S3Form) { + + @if (bucketCredentials.controls.length > 0) { +
+
Bucket
+
Key
+
Secret / SAS
+
Token
+
AWS Region
+
Host (Endpoint)
- -
- - + } + @for (bucket of bucketCredentials.controls; track bucket) { +
+ + + + + + + +
+ @if (endpoint.value.startsWith('http://') && secured) { + + + + } + +
+ +
+ } + @for (bucket of externalCredentials(); track $index) { +
+
{{bucket.Bucket}}
+
{{bucket.Key}}
+
{{bucket.Secret}}
+
{{bucket.Token}}
+
{{bucket.Region}}
+
{{bucket.Endpoint}}
+
+ } + + +} 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 2c61b688..d40be9ee 100755 --- 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 @@ -10,19 +10,20 @@ grid-gap: 6px; grid-template-columns: minmax(60px, 20%) minmax(40px, 15%) minmax(60px, 20%) minmax(40px, 10%) minmax(40px, 10%) minmax(60px, 20%) 50px; padding: 6px 0; - border-bottom: $blue-500 solid 1px; - - input { - color: $blue-100; - } &:last-child { padding-bottom: 8px; } + + .value { + line-height: 30px; + padding: 0 10px; + border: 1px solid; + border-radius: 4px; + } } .header { - color: $blue-400; border-bottom: solid 1px; padding-bottom: 6px; margin-bottom: 10px; @@ -38,12 +39,6 @@ .delete-button { display: flex; align-items: center; - .al-icon { - color: $blue-300; - &:hover { - color: $blue-200; - } - } } .alert-icon { @@ -60,13 +55,44 @@ .add-button { display: inline-block; margin: 12px 0 24px; - color: $blue-280; - - &:hover { - color: $white; - } .al-icon { vertical-align: middle; } } + +:host.dark-theme { + .s3-row { + border-bottom: $blue-500 solid 1px; + + input { + color: $blue-100; + } + + .value { + background-color: $black; + border-color: $blue-500; + } + } + + .header { + color: $blue-400; + } + + .delete-button { + .al-icon { + color: $blue-300; + &:hover { + color: $blue-200; + } + } + } + + .add-button { + color: $blue-280; + + &:hover { + color: $white; + } + } +} 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 0c34ebf3..41f3eaad 100755 --- 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 @@ -1,46 +1,64 @@ -import {Component, EventEmitter, Input, OnDestroy, OnInit, Output} from '@angular/core'; -import {Store} from '@ngrx/store'; -import {UntypedFormArray, UntypedFormBuilder, UntypedFormGroup} from '@angular/forms'; +import {ChangeDetectionStrategy, Component, forwardRef, inject, input} from '@angular/core'; +import {ControlValueAccessor, FormArray, FormBuilder, NG_VALUE_ACCESSOR, ReactiveFormsModule} from '@angular/forms'; import {ALLEGRO_TUTORIAL_BUCKET} from '~/app.constants'; import {debounceTime} from 'rxjs/operators'; -import {Subscription} from 'rxjs'; import {ICONS} from '@common/constants'; +import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; +import {Credentials} from '@common/core/reducers/common-auth-reducer'; +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {MatInput} from '@angular/material/input'; @Component({ - selector : 'sm-s3-access', + selector: 'sm-s3-access', templateUrl: './s3-access.component.html', - styleUrls : ['./s3-access.component.scss'] + styleUrls: ['./s3-access.component.scss'], + standalone: true, + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ + ReactiveFormsModule, + TooltipDirective, + MatInput + ], + providers: [ + { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => S3AccessComponent), + multi: true + }] }) -export class S3AccessComponent implements OnDestroy, OnInit { +export class S3AccessComponent implements ControlValueAccessor { + private formBuilder = inject(FormBuilder); + + onChange: (any) => void; + onTouched: () => void; public secured = window.location.protocol === 'https:'; readonly ALLEGRO_TUTORIAL_BUCKET = ALLEGRO_TUTORIAL_BUCKET; readonly BUCKET_CREDENTIALS = 'bucketCredentials'; - public S3Form: UntypedFormGroup; - public ICONS = ICONS; - private formChangeSubscription: Subscription; + protected S3Form = this.formBuilder.group({ + bucketCredentials: this.formBuilder.array([]), + }); - @Input() set s3bucketCredentials(s3bucketCredentials) { - this.formChangeSubscription && this.formChangeSubscription.unsubscribe(); - if (!this.S3Form) { - this.buildS3Form(s3bucketCredentials); - } - this.formChangeSubscription = this.S3Form.valueChanges - .pipe(debounceTime(300)).subscribe(() => { - this.saveCredentials(this.S3Form.getRawValue()); + protected ICONS = ICONS; + externalCredentials = input(); + + constructor() { + this.S3Form.valueChanges + .pipe( + takeUntilDestroyed(), + debounceTime(300) + ) + .subscribe(() => { + this.onChange?.(this.S3Form.value); + this.onTouched?.(); this.disableTutorialBucket(); }); - }; - - @Output() s3bucketCredentialsChanged = new EventEmitter(); - - constructor(private store: Store, private formBuilder: UntypedFormBuilder) { } - get bucketCredentials(): UntypedFormArray { - return this.S3Form.get(this.BUCKET_CREDENTIALS) as UntypedFormArray; + get bucketCredentials() { + return this.S3Form.controls.bucketCredentials as FormArray; } - addBucket({Key = '', Secret = '', Token='', Region = '', Bucket = '', Endpoint = null} = {}) { + addBucket({Key = '', Secret = '', Token='', Region = '', Bucket = '', Endpoint = null} = {}, notify = true) { this.bucketCredentials.push(this.formBuilder.group({ Key, Secret, @@ -48,32 +66,24 @@ export class S3AccessComponent implements OnDestroy, OnInit { Region, Bucket, Endpoint: (Endpoint?.startsWith('http') || Endpoint === null)? Endpoint : `http${Endpoint?.endsWith('443') ? 's' : ''}://${Endpoint}` - - })); + }), {emitEvent: notify}); } - removeBucket(index) { + removeBucket(index: number) { this.bucketCredentials.removeAt(index); } private buildS3Form(s3Credentials) { - this.S3Form = this.formBuilder.group({ - bucketCredentials: this.formBuilder.array([]), - }); - if (s3Credentials?.bucketCredentials?.length) { + this.bucketCredentials.clear({emitEvent: false}); s3Credentials.bucketCredentials.forEach(bucket => { - this.addBucket(bucket || {}); + this.addBucket(bucket || {}, false); }); } this.disableTutorialBucket(); } - public saveCredentials(formData) { - this.s3bucketCredentialsChanged.emit(formData); - } - public disableTutorialBucket() { const tutorialBucketIndex = this.S3Form.get(this.BUCKET_CREDENTIALS).value.findIndex(cre => cre.Bucket === this.ALLEGRO_TUTORIAL_BUCKET); @@ -82,10 +92,15 @@ export class S3AccessComponent implements OnDestroy, OnInit { } } - ngOnDestroy(): void { - this.formChangeSubscription.unsubscribe(); + registerOnChange(fn: () => void) { + this.onChange = fn + } + + registerOnTouched(fn: () => void) { + this.onTouched = fn; } - ngOnInit(): void { + writeValue(s3bucketCredentials: {bucketCredentials: Credentials[]}): void { + this.buildS3Form(s3bucketCredentials); } } diff --git a/src/app/webapp-common/settings/settings.component.scss b/src/app/webapp-common/settings/settings.component.scss index 813038f1..8ace244c 100644 --- a/src/app/webapp-common/settings/settings.component.scss +++ b/src/app/webapp-common/settings/settings.component.scss @@ -44,13 +44,13 @@ mat-drawer { border-right: 1px solid $blue-500; - width: 220px; + width: 265px; } .mat-mdc-list-item { width: auto; margin: 0 12px 2px; - padding-left: 12px; + padding: 0 10px; border-radius: 4px; --mdc-list-list-item-label-text-color: #{$blue-200}; --mdc-theme-text-primary-on-background: #{$blue-200}; @@ -111,3 +111,21 @@ margin-top: 24px; } } + + +.list-item { + display: flex; + align-items: center; + gap: 6px; + &__label { + flex-grow: 1; + } + &__badge { + background-color: $purple; + color: white; + padding: 3px 6px; + border-radius: 3px; + font-size: 11px; + line-height: normal; + } +} diff --git a/src/app/webapp-common/settings/webapp-configuration/webapp-configuration.component.ts b/src/app/webapp-common/settings/webapp-configuration/webapp-configuration.component.ts deleted file mode 100644 index ed622102..00000000 --- a/src/app/webapp-common/settings/webapp-configuration/webapp-configuration.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'sm-webapp-configuration', - templateUrl: './webapp-configuration.component.html', - styleUrls: ['./webapp-configuration.component.scss'] -}) -export class WebappConfigurationComponent { -} diff --git a/src/app/webapp-common/settings/workspace-configuration/workspace-configuration.component.html b/src/app/webapp-common/settings/workspace-configuration/workspace-configuration.component.html index 2c066764..511e6b36 100644 --- a/src/app/webapp-common/settings/workspace-configuration/workspace-configuration.component.html +++ b/src/app/webapp-common/settings/workspace-configuration/workspace-configuration.component.html @@ -1,4 +1,4 @@ -
- +
+
diff --git a/src/app/webapp-common/settings/workspace-configuration/workspace-configuration.component.scss b/src/app/webapp-common/settings/workspace-configuration/workspace-configuration.component.scss index e69de29b..29da8401 100644 --- a/src/app/webapp-common/settings/workspace-configuration/workspace-configuration.component.scss +++ b/src/app/webapp-common/settings/workspace-configuration/workspace-configuration.component.scss @@ -0,0 +1,6 @@ +.workspace { + display: flex; + flex-direction: column; + width: 100%; + padding: 0 24px; +} \ No newline at end of file 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 2f12d245..c9762f3e 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 @@ -1,4 +1,6 @@ -import {Component} from '@angular/core'; +import {Component, inject} from '@angular/core'; +import {selectCurrentUser} from '@common/core/reducers/users-reducer'; +import {Store} from '@ngrx/store'; @Component({ selector: 'sm-workspace-configuration', @@ -6,4 +8,8 @@ import {Component} from '@angular/core'; styleUrls: ['./workspace-configuration.component.scss'] }) export class WorkspaceConfigurationComponent { + + private store = inject(Store); + protected currentUser = this.store.selectSignal(selectCurrentUser); + } diff --git a/src/app/webapp-common/shared/components/base-context-menu/base-context-menu.component.ts b/src/app/webapp-common/shared/components/base-context-menu/base-context-menu.component.ts index de8bcd93..56c2a805 100644 --- a/src/app/webapp-common/shared/components/base-context-menu/base-context-menu.component.ts +++ b/src/app/webapp-common/shared/components/base-context-menu/base-context-menu.component.ts @@ -1,12 +1,8 @@ import { Component, computed, ElementRef, - EventEmitter, HostListener, - inject, - Input, - Output, viewChild, -} from '@angular/core'; + inject, viewChild, input, output } from '@angular/core'; import {MatMenuTrigger} from '@angular/material/menu'; import {TagsMenuComponent} from '../../ui-components/tags/tags-menu/tags-menu.component'; import {Store} from '@ngrx/store'; @@ -32,12 +28,12 @@ export class BaseContextMenuComponent { protected tagMenu = viewChild(TagsMenuComponent); protected trigger = viewChild(MatMenuTrigger); - @Input() selectedDisableAvailable: Record = {}; - @Input() selectedDisableAvailableIsMultiple = true; - @Input() tableMode: boolean; - @Input() backdrop: boolean; - @Output() menuOpened = new EventEmitter(); - @Output() menuClosed = new EventEmitter(); + selectedDisableAvailable = input>({}); + selectedDisableAvailableIsMultiple = input(true); + tableMode = input(); + backdrop = input(); + menuOpened = output(); + menuClosed = output(); @HostListener('document:click', ['$event']) clickOut(event) { @@ -64,7 +60,11 @@ export class BaseContextMenuComponent { this.store.dispatch(activateEdit('tags')); this.store.dispatch(activateModelEdit('tags')); }, 200); - tagMenuRef ? tagMenuRef.focus() : this.tagMenu()?.focus(); + if (tagMenuRef) { + tagMenuRef.focus(); + } else { + this.tagMenu()?.focus(); + } } tagMenuClosed(tagMenuRef?: TagsMenuComponent) { @@ -72,6 +72,10 @@ export class BaseContextMenuComponent { this.store.dispatch(deactivateEdit()); this.store.dispatch(cancelModelEdit()); }, 200); - tagMenuRef ? tagMenuRef.clear() : this.tagMenu()?.clear(); + if (tagMenuRef) { + tagMenuRef.clear(); + } else { + this.tagMenu()?.clear(); + } } } diff --git a/src/app/webapp-common/shared/components/charts/donut/donut.component.html b/src/app/webapp-common/shared/components/charts/donut/donut.component.html index 9629b2f2..af24a330 100644 --- a/src/app/webapp-common/shared/components/charts/donut/donut.component.html +++ b/src/app/webapp-common/shared/components/charts/donut/donut.component.html @@ -1,8 +1,8 @@
-
{{percent()}}%
+
+ @if (highlightedData(); as highlighted) { +
{{highlighted.caption}} ({{highlighted.value}})
+
{{highlighted.percent}}%
+ } +
- @for (slice of donutData().datasets[0].data; track slice; let index = $index) { + @for (slice of donutData().datasets[0].data; track index; let index = $index) {
; data = input.required(); @@ -48,22 +49,28 @@ export class DonutComponent { datasets: [{ data: this.data().map(slice => slice.quantity), backgroundColor: this.colors(), + hoverOffset: 10, }] }) ); protected total = computed(() => this.data().reduce((acc, slice) => acc + slice.quantity, 0) ); - protected percent = computed(() => { + protected highlightedData = computed(() => { if (this.highlight() !== null) { - return Math.round(this.donutData().datasets[0].data[this.highlight()] / this.total() * 100); + const value = this.donutData().datasets[0].data[this.highlight()]; + return { + caption: this.donutData().labels[this.highlight()], + value, + percent: Math.round(value / this.total() * 100), + }; } else { return null; } }); constructor() { - let setTimer: number = 0; + let setTimer = 0; effect(() => { this.windowResize(); this.resize(); @@ -87,9 +94,15 @@ export class DonutComponent { hoverLegend(slice: number) { this.highlight.set(slice); + + const element: ActiveDataPoint = {datasetIndex: 0, index: slice}; + this.chart()?.chart.setActiveElements([element]); + this.chart()?.chart.update('none'); } leaveLegend() { this.highlight.set(null); + this.chart()?.chart.setActiveElements([]); + this.chart()?.chart.update('none'); } } 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 b8a933c6..702e2a20 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 @@ -2,7 +2,7 @@ import { Component, ChangeDetectionStrategy, viewChild, - input, computed, signal, effect, + input, computed, signal, effect } from '@angular/core'; import {BaseChartDirective} from 'ng2-charts'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; @@ -25,7 +25,7 @@ declare module 'chart.js' { dash?: [number, number]; width?: number; drawY?: boolean; - } + }; } } @@ -41,9 +41,9 @@ export interface concatLatestFrom { } @Component({ - selector : 'sm-line-chart', - templateUrl : './line-chart.component.html', - styleUrls : ['./line-chart.component.scss'], + selector: 'sm-line-chart', + templateUrl: './line-chart.component.html', + styleUrls: ['./line-chart.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ @@ -52,13 +52,13 @@ export interface concatLatestFrom { ] }) export class LineChartComponent { - lineChartPlugins: Plugin<'line'>[] = [{ + lineChartPlugins: Plugin<'line'>[] = [{ id: 'hoverLine', afterDatasetsDraw: (chart, _, opts) => { const { ctx, tooltip, - chartArea: { top, bottom} + chartArea: {top, bottom} } = chart; if (tooltip.opacity) { @@ -74,6 +74,15 @@ export class LineChartComponent { ctx.closePath(); ctx.setLineDash([]); } + + // Hack to fix tooltip position on cursor + if (tooltip.y < 0.1) { + if (tooltip.caretX > chart.width / 2) { + tooltip.x = tooltip.caretX - tooltip.width - 10; + } else { + tooltip.x = tooltip.caretX + 10; + } + } } }]; public lineChartType: ChartType = 'line'; @@ -81,7 +90,7 @@ export class LineChartComponent { private chart = viewChild(BaseChartDirective); animationDuration = signal(500); - colorScheme= input(['#a4a1fb', '#ff8a15']); + colorScheme = input(['#a4a1fb', '#ff8a15']); yTickFormatter = input<(value: number) => string>(val => filesize(val, fileSizeConfigCount)); yLabel = input(); showLoadingOverlay = input(false); @@ -94,7 +103,7 @@ export class LineChartComponent { } return { - datasets: topics?.map((topic, index) => this.createDataset(topic, index)) ?? [], + datasets: topics?.map((topic, index) => this.createDataset(topic, index)) ?? [] }; }); @@ -108,12 +117,13 @@ export class LineChartComponent { }, elements: { line: { - tension: 0.5, - }, + tension: 0.5 + } }, interaction: { intersect: false, - mode: 'index', + mode: 'nearest', + axis: 'x' }, scales: { x: { @@ -122,7 +132,7 @@ export class LineChartComponent { autoSkip: true, autoSkipPadding: 50, maxRotation: 0, - color: '#c1cdf3', + color: '#c1cdf3' }, time: { tooltipFormat: 'P pp', @@ -133,7 +143,7 @@ export class LineChartComponent { minute: 'p', second: 'pp' } - }, + } }, y: { title: {display: !!this.yLabel(), text: this.yLabel(), color: '#c1cdf3'}, @@ -149,9 +159,9 @@ export class LineChartComponent { }, grid: { display: true, - color: '#39405f', + color: '#39405f' } - }, + } }, plugins: { @@ -162,7 +172,7 @@ export class LineChartComponent { color: '#dce0ee', font: {weight: 'normal', size: 12}, padding: 20, - usePointStyle: true, + usePointStyle: true } }, @@ -181,26 +191,31 @@ export class LineChartComponent { hoverLine: { dash: [6, 6], color: '#8492c2', - width: 1, - }, + width: 1 + } }, parsing: { xAxisKey: 'date', yAxisKey: 'value' } - } as ChartOptions<'line'>)) + } as ChartOptions<'line'>)); + private reservedColors: Record = {}; private createDataset(topic: Topic, index: number) { + const currentChart = this.chart().chart; + const newIndex = currentChart?.data.datasets.findIndex(dataset => dataset.label === topic.topicName); + this.reservedColors[topic.topicName] = this.reservedColors[topic.topicName] ?? this.colorScheme()[index % this.colorScheme().length]; return { data: topic.dates, label: topic.topicName, pointRadius: 0, pointBorderColor: '#1a1e2c', - borderWidth: 2, + borderWidth: 1.4, lineTension: 0.1, - pointBackgroundColor: this.colorScheme()[index % this.colorScheme.length], - borderColor: this.colorScheme()[index % this.colorScheme().length], - backgroundColor: this.colorScheme()[index % this.colorScheme().length] + pointBackgroundColor: this.reservedColors[topic.topicName], + borderColor: this.reservedColors[topic.topicName], + backgroundColor: this.reservedColors[topic.topicName], + ...(newIndex > -1 && currentChart?.data.datasets.length > newIndex && {hidden: !currentChart.isDatasetVisible(newIndex)}) }; } diff --git a/src/app/webapp-common/shared/components/experiment-settings/experiment-settings.html b/src/app/webapp-common/shared/components/experiment-settings/experiment-settings.html index cf1316e6..9ac036b6 100644 --- a/src/app/webapp-common/shared/components/experiment-settings/experiment-settings.html +++ b/src/app/webapp-common/shared/components/experiment-settings/experiment-settings.html @@ -1,3 +1,6 @@ -
- -
+@if (showSettings) { +
+ +
+} + diff --git a/src/app/webapp-common/shared/components/experiment-settings/experiment-settings.scss b/src/app/webapp-common/shared/components/experiment-settings/experiment-settings.scss index 4f64a4a5..d22d9df3 100644 --- a/src/app/webapp-common/shared/components/experiment-settings/experiment-settings.scss +++ b/src/app/webapp-common/shared/components/experiment-settings/experiment-settings.scss @@ -1,9 +1,11 @@ @import "variables"; :host { - & { + display: flex; + &.settings { display: inline-block; } + } .btn { 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 85a518c8..1e441265 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 @@ -9,6 +9,11 @@ export class ExperimentSettingsComponent { @Input() disabled = false; @Input() showSettings = false; + @Input() tableView = false; @Output() toggleSettings = new EventEmitter(); + + + + } diff --git a/src/app/webapp-common/shared/components/id-badge/id-badge.component.html b/src/app/webapp-common/shared/components/id-badge/id-badge.component.html index a721f742..d6711657 100644 --- a/src/app/webapp-common/shared/components/id-badge/id-badge.component.html +++ b/src/app/webapp-common/shared/components/id-badge/id-badge.component.html @@ -1,10 +1,10 @@
- @if(!short && id){{{id?.slice(0, 8)}}...} + @if(!short() && id()){{{id()?.slice(0, 8)}}...}
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 cf184687..86eef464 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 @@ -1,4 +1,4 @@ -import {Component, EventEmitter, Input, Output, ViewChild} from '@angular/core'; +import {Component, input, output, viewChild } from '@angular/core'; import {MatMenuTrigger} from '@angular/material/menu'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import {ClipboardModule} from 'ngx-clipboard'; @@ -16,12 +16,13 @@ import {ClickStopPropagationDirective} from '@common/shared/ui-components/direct ] }) export class IdBadgeComponent { - @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger; - @Input() id: string; - @Input() short = false; - @Output() copied = new EventEmitter(); + trigger = viewChild.required(MatMenuTrigger); + id = input(); + short = input(false); + caption = input('Copy full ID') + copied = output(); openMenu() { - this.trigger.openMenu(); + this.trigger().openMenu(); } } diff --git a/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.html b/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.html index 6fa3cef2..23816fe2 100644 --- a/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.html +++ b/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.html @@ -4,7 +4,7 @@ [matTreeNodePadding]="segment.level + 1" [matTreeNodePaddingIndent]="12" > -
+
-
+
@@ -29,7 +29,7 @@
@@ -38,7 +38,7 @@
@@ -59,7 +59,7 @@ type="button" class="btn btn-default btn-img-menu" smTooltip="Image resources" - > + >
diff --git a/src/app/webapp-common/shared/components/markdown-editor/markdown-editor.component.scss b/src/app/webapp-common/shared/components/markdown-editor/markdown-editor.component.scss index 128dad13..d71f801c 100644 --- a/src/app/webapp-common/shared/components/markdown-editor/markdown-editor.component.scss +++ b/src/app/webapp-common/shared/components/markdown-editor/markdown-editor.component.scss @@ -196,6 +196,10 @@ } .btn-group { + display: inline-flex; + vertical-align: middle; + gap: 3px; + button { display: flex; align-items: center; @@ -203,7 +207,6 @@ font-size: 16px; width: 24px; height: 24px; - margin: 0 3px; border-radius: 2px !important; color: $blue-300; background-color: $blue-600; diff --git a/src/app/webapp-common/shared/components/markdown-editor/markdown-editor.component.ts b/src/app/webapp-common/shared/components/markdown-editor/markdown-editor.component.ts index 93c3c1c3..55c015aa 100644 --- a/src/app/webapp-common/shared/components/markdown-editor/markdown-editor.component.ts +++ b/src/app/webapp-common/shared/components/markdown-editor/markdown-editor.component.ts @@ -20,7 +20,7 @@ import { MarkdownCheatSheetDialogComponent } from '@common/shared/components/markdown-editor/markdown-cheat-sheet-dialog/markdown-cheat-sheet-dialog.component'; import {getBaseName} from '@common/shared/utils/shared-utils'; -import * as marked from 'marked'; +import {marked} from 'marked'; import DOMPurify from 'dompurify'; import {NgClass, NgForOf, NgIf} from '@angular/common'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; @@ -56,7 +56,7 @@ export class MarkdownEditorComponent { protected cdr = inject( ChangeDetectorRef); protected dialog = inject( MatDialog); private originalInfo: string; - private ready: boolean = false; + private ready = false; private preview: Element; private editor: Element; public isDirty: boolean; @@ -77,7 +77,7 @@ export class MarkdownEditorComponent { hideIcons: ['TogglePreview', 'FullScreen'] } as MdEditorOption; public ace: Ace.Editor; - public isExpand: boolean = false; + public isExpand = false; public duplicateNames: boolean; public postRender = (dirty: string): string => { if (this.blockUserScripts) { @@ -135,7 +135,7 @@ export class MarkdownEditorComponent { } constructor() { - window['marked'] = marked.marked; + window['marked'] = marked; this.editMode = false; const widgetOrigin = this.reportService.getUrl().toString() @@ -247,7 +247,7 @@ export class MarkdownEditorComponent { } insertImage(resource: string) { - this.ace.insert(`![${getBaseName(resource)}](${resource})\n`); + this.ace.insert(`![${decodeURIComponent(getBaseName(resource))}](${resource})\n`); } } diff --git a/src/app/webapp-common/shared/components/multi-line-tooltip/multi-line-tooltip.component.html b/src/app/webapp-common/shared/components/multi-line-tooltip/multi-line-tooltip.component.html index 93f9017e..f0b237d7 100644 --- a/src/app/webapp-common/shared/components/multi-line-tooltip/multi-line-tooltip.component.html +++ b/src/app/webapp-common/shared/components/multi-line-tooltip/multi-line-tooltip.component.html @@ -25,11 +25,7 @@ (smHesitate)="tooltipMenu.closed.emit()" #hesitateMenu="hesitate" > - @if (infoData) { -
- } @else { - - } +
diff --git a/src/app/webapp-common/shared/components/multi-line-tooltip/multi-line-tooltip.component.ts b/src/app/webapp-common/shared/components/multi-line-tooltip/multi-line-tooltip.component.ts index 275397de..3492dc79 100644 --- a/src/app/webapp-common/shared/components/multi-line-tooltip/multi-line-tooltip.component.ts +++ b/src/app/webapp-common/shared/components/multi-line-tooltip/multi-line-tooltip.component.ts @@ -1,5 +1,6 @@ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {MatMenuModule, MenuPositionY} from '@angular/material/menu'; +import {SaferPipe} from '@common/shared/pipes/safe.pipe'; import {HesitateDirective} from '@common/shared/ui-components/directives/hesitate.directive'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; @@ -12,11 +13,11 @@ import {ClickStopPropagationDirective} from '@common/shared/ui-components/direct imports: [ MatMenuModule, HesitateDirective, - ClickStopPropagationDirective + ClickStopPropagationDirective, + SaferPipe ], }) export class MultiLineTooltipComponent { - @Input() infoData: any; @Input() iconClass: string; @Input() position: MenuPositionY = 'below'; } 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 e950ed84..a3e567c4 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 @@ -9,21 +9,21 @@ [disabled]="disabled" (input)="getEntitiesFn(control.value)" (keydown.enter)="control.markAsTouched()" - (focusout)="onTouched()" + (focusout)="onTouched && onTouched()" > @if (createNewSuffix()) { (Create New) } @if (createNewSuffix()) { 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 88305721..2be130bc 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 @@ -1,18 +1,51 @@ -
- + +
+ + AUTO REFRESH + +
•
+ +
+
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 9641c749..c518e03b 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 @@ -3,49 +3,125 @@ :host { display: inline-block; - .no-wrap { - white-space: nowrap; + .refresh-wrapper { + &.show-menu { + .tooltip-container, .tip { + opacity: 1; + pointer-events: auto; + } + } + .btn.btn-icon:hover { + background-color: transparent; + .path_arrows { + fill: $blue-200; + } + } } - .refresh-wrapper { + .refresh { + position: relative; width: 24px; - padding-left: 5px; - overflow: hidden; - transition: all 0.5s 0.5s, background 0.5s 0s; - - &.allow-autorefresh:hover { - background: $blue-600; - border-radius: 4px; - width: 164px; - padding-right: 12px; + height: 24px; + display: flex; + align-items: center; + justify-content: center; + + span { + height: inherit; + width: inherit; + position: absolute; } } - .refresh-icon { - margin: 10px; - font-size: 20px; - color: $blue-300; + .tooltip-container { + opacity: 0; + pointer-events: none; + position: absolute; + right: 64px; + display: flex; + align-items: center; + padding: 8px 12px; + border-radius: 4px; + background-color: $blue-600; + color: $blue-250; + line-height: normal; + font-size: 12px; + font-weight: 600; + z-index: 10; + transition: opacity 0.3s 0.3s; + + .toggle-label { + color: $blue-300; + font-size: 12px; + font-weight: 500; + white-space: nowrap; + + &.enabled { + color: $neon-yellow + } + } } - .autorefresh-checkbox { - margin-left: 6px; + .tip { + opacity: 0; + pointer-events: none; + content: ''; + width: 16px; + height: 16px; + position: absolute; + right: 60px; + transform: rotate(45deg); + background-color: $blue-600; + transition: opacity 0.3s 0.3s; } &.light-theme { border-radius: 4px; - .refresh-wrapper.allow-autorefresh:hover { - background: $blue-25; + .refresh-wrapper { + .btn.btn-icon { + background-color: transparent; + &:hover { + .path_arrows { + fill: $blue-500; + } + } + } + .path_arrows { + fill: $blue-400; + } + } + + .path_play, .path_pause { + fill: $purple; } - .al-icon { - .path1:before { - color: $blue-500 + .tooltip-container, .tip { + background-color: $blue-50; + color: $blue-600; + + .toggle-label.enabled { + color: $purple; } - .path2:before { - color: $purple + + .btn { + background-color: transparent; } } } +} + +.rotate { + display: inline-block; + animation: rotation 1 0.5s linear; +} + +@keyframes rotation { + from{ + transform: rotate(0deg); + } + to{ + transform: rotate(180deg); + } } 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 269e32db..22dc2b1a 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,12 @@ -import {Component, EventEmitter, Input, Output} from '@angular/core'; +import {Component, input, output, inject, signal, effect} 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 {Observable} from 'rxjs'; -import {AsyncPipe, NgIf} from '@angular/common'; -import {MatCheckboxModule} from '@angular/material/checkbox'; +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'; @Component({ selector: 'sm-refresh-button', @@ -14,20 +15,28 @@ import {FormsModule} from '@angular/forms'; standalone: true, imports: [ AsyncPipe, - MatCheckboxModule, FormsModule, - NgIf + HesitateDirective, + ClickStopPropagationDirective, + MatSlideToggle ] }) export class RefreshButtonComponent { - @Input() allowAutoRefresh: boolean = true; - @Input() disabled: boolean = true; - @Output() setAutoRefresh = new EventEmitter(); + protected refreshService = inject(RefreshService); + private store = inject(Store); - autoRefreshState$: Observable; + allowAutoRefresh = input(true); + disabled = input(true); + setAutoRefresh = output(); - constructor(public refresh: RefreshService, private store: Store) { - this.autoRefreshState$ = store.select(selectAutoRefresh); + protected autoRefreshState = this.store.selectSignal(selectAutoRefresh); + protected showMenu = signal(false); + protected rotate = signal(false); + + refresh() { + this.refreshService.trigger(); + this.rotate.set(true); + window.setTimeout(() => {this.rotate.set(false)}, 1000); } } diff --git a/src/app/webapp-common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component.html b/src/app/webapp-common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component.html index f6838413..d9a87bbf 100644 --- a/src/app/webapp-common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component.html +++ b/src/app/webapp-common/shared/components/router-tab-nav-bar/router-tab-nav-bar.component.html @@ -5,7 +5,7 @@ queryParamsHandling="merge" routerLinkActive="active" #rla="routerLinkActive" - [active]="rla.isActive || link.activeBy && (routerConfig$| async)?.includes(link.activeBy)" + [active]="rla.isActive || link.activeBy && (routerConfig$| ngrxPush)?.includes(link.activeBy)" [attr.data-id]="link.name" >{{link.name | uppercase}} 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 67516727..69511aea 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 @@ -4,8 +4,13 @@ nav { --mat-tab-header-label-text-size: 12px; --mat-tab-header-label-text-letter-spacing: 0.03em; --mat-tab-header-inactive-hover-label-text-color: #{$purple}; + &.mat-mdc-tab-header-pagination-controls-enabled { - padding: 0 24px; + padding: 0 8px; + } + + &.mat-mdc-tab-nav-bar { + --mat-tab-header-pagination-icon-color: $blue-500; } a { 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 a887251f..888c7b8e 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 @@ -6,6 +6,7 @@ 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'; export interface Link { name: string; @@ -24,6 +25,7 @@ export interface Link { UpperCasePipe, RouterLinkActive, NgForOf, + PushPipe, ], standalone: true }) diff --git a/src/app/webapp-common/shared/components/show-only-user-work/show-only-user-work.component.html b/src/app/webapp-common/shared/components/show-only-user-work/show-only-user-work.component.html index 78689d2e..54d985ae 100644 --- a/src/app/webapp-common/shared/components/show-only-user-work/show-only-user-work.component.html +++ b/src/app/webapp-common/shared/components/show-only-user-work/show-only-user-work.component.html @@ -1,7 +1,7 @@ @for (item of row; track trackFn(item) + cardHeight) { @@ -14,7 +14,7 @@
}
- @if (showLoadMoreButton && (itemRows$ | async)?.length) { + @if (showLoadMoreButton && (itemRows$ | ngrxPush)?.length) {
- -
- - - - - - -
Deleting {{progressPercent}}%
- - - - -
- Deleting artifacts. This may take some time. Please do not close the window. + @if (devWarning) { +
+ Note: resetting a DEV experiment Any subsequent runs of the experiment will overwrite any changes made to it in the Web-App. +
+ To avoid this, clone the experiment and work with the cloned experiment.
- -
- The artifacts were deleted -
- - - -
-
- The following {{entityType}}s were not deleted: + } + } @else { +
+ Are you sure you want to delete @if (numSelected === 1) {"} + {{entityName}} + @if (numSelected === 1) {"} ? +
+
+ {{bodyMessage}}
-
-
    -
  • -
    {{entity.name}}
    -
    {{entity.message}}
    -
    • -
+ } + +
+ Remove all related artifacts and debug samples from ClearML file server +
-
- -
-
- The following artifacts were not deleted: +
+ +
-
- - -
-
{{file}}
+ } @else { +
Deleting @if (progressPercent > 0) { + {{progressPercent}}% + }
+ + + @if (totalFilesNumber > 0) { + @if (!showFinishMessage) { +
+ Deleting artifacts. This may take some time. Please do not close the window. +
+ } @else { +
+ The artifacts were deleted +
+ } + } +
+
+ The following {{entityType}}s were not deleted:
-
** Additional artifacts may be left **
+
+
    + @for (entity of (failedEntities$ | ngrxPush); track entity) { +
  • +
    {{entity.name}}
    +
    {{entity.message}}
    +
    • + } +
+
+
+
+
+ The following artifacts were not deleted: +
+
+ + + @for (file of failedFiles | slice:0:1000; track file) { +
+
{{file}}
+
+ } + @if (failedFiles.length > 1000) { +
** Additional artifacts may be left **
+ } +
+
+

+
+
-
-

-
- -
- - - + } + diff --git a/src/app/webapp-common/shared/entity-page/entity-delete/common-delete-dialog.component.scss b/src/app/webapp-common/shared/entity-page/entity-delete/common-delete-dialog.component.scss index 1507bdce..074fd184 100755 --- a/src/app/webapp-common/shared/entity-page/entity-delete/common-delete-dialog.component.scss +++ b/src/app/webapp-common/shared/entity-page/entity-delete/common-delete-dialog.component.scss @@ -115,4 +115,9 @@ display: flex; justify-content: center; } + + .entity-name { + max-width: 200px; + font-weight: bold; + } } diff --git a/src/app/webapp-common/shared/entity-page/entity-delete/common-delete-dialog.component.ts b/src/app/webapp-common/shared/entity-page/entity-delete/common-delete-dialog.component.ts index 43deb0bf..e49aecbd 100755 --- a/src/app/webapp-common/shared/entity-page/entity-delete/common-delete-dialog.component.ts +++ b/src/app/webapp-common/shared/entity-page/entity-delete/common-delete-dialog.component.ts @@ -1,7 +1,6 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {Component, Inject, OnDestroy, OnInit} from '@angular/core'; import {Store} from '@ngrx/store'; -import {htmlTextShort} from '../../utils/shared-utils'; import {Task} from '~/business-logic/model/tasks/task'; import { selectEntitiesFailedToDelete, @@ -34,13 +33,13 @@ export interface DeleteData { }) export class CommonDeleteDialogComponent implements OnInit, OnDestroy { - private unsubscribe$: Subject = new Subject(); + private unsubscribe$ = new Subject(); public header: string; public filesNumber$: Observable; public entityName: string; public failedFiles$: Observable; public failedEntities$: Observable<{ id: string; name: string; message: string }[]>; - public inProgress: boolean = false; + public inProgress = false; public totalFilesNumber: number; public progressPercent: number; public noFilesToDelete: boolean; @@ -49,12 +48,12 @@ export class CommonDeleteDialogComponent implements OnInit, OnDestroy { public entityType: EntityTypeEnum; public numSelected: number; public bodyMessage: string; - public showFinishMessage: boolean = false; + public showFinishMessage = false; private readonly useCurrentEntity: boolean; private readonly entity: Task; public failedFiles: string[]; private readonly includeChildren: boolean; - public deleteArtifacts: boolean = true; + public deleteArtifacts = true; public resetMode: boolean; public devWarning: boolean; public hideDeleteArtifacts: boolean; @@ -75,8 +74,7 @@ export class CommonDeleteDialogComponent implements OnInit, OnDestroy { this.numSelected = data.numSelected; const name = DOMPurify.sanitize(data.entity?.name); this.entityName = data.numSelected === 1 ? - data.entityType === EntityTypeEnum.project ? - htmlTextShort(name.split('/').pop()) : htmlTextShort(name) : + data.entityType === EntityTypeEnum.project ? name.split('/').pop() : name : `${data.numSelected} ${data.entityType}s`; this.header = `${data.resetMode ? 'Reset' : 'Delete'} ${data.entityType}${data.numSelected > 1 ? 's' : ''}`; this.bodyMessage = this.getMessageByEntity(data.entityType, data.projectStats); diff --git a/src/app/webapp-common/shared/entity-page/entity-delete/common-delete-dialog.module.ts b/src/app/webapp-common/shared/entity-page/entity-delete/common-delete-dialog.module.ts index a4bf9d05..6217f555 100755 --- a/src/app/webapp-common/shared/entity-page/entity-delete/common-delete-dialog.module.ts +++ b/src/app/webapp-common/shared/entity-page/entity-delete/common-delete-dialog.module.ts @@ -1,5 +1,6 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; +import {SaferPipe} from '@common/shared/pipes/safe.pipe'; import {StoreModule} from '@ngrx/store'; import {EffectsModule} from '@ngrx/effects'; import {commonDeleteDialogReducer} from './common-delete-dialog.reducer'; @@ -11,6 +12,12 @@ import {LabeledFormFieldDirective} from '@common/shared/directive/labeled-form-f import {CopyClipboardComponent} from '@common/shared/ui-components/indicators/copy-clipboard/copy-clipboard.component'; import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dialog-template/dialog-template.component'; import {MatCheckboxModule} from '@angular/material/checkbox'; +import {PushPipe} from '@ngrx/component'; +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({ imports: [ @@ -23,6 +30,10 @@ import {MatCheckboxModule} from '@angular/material/checkbox'; CopyClipboardComponent, DialogTemplateComponent, MatCheckboxModule, + PushPipe, + SaferPipe, + TooltipDirective, + ShowTooltipIfEllipsisDirective, ], declarations: [CommonDeleteDialogComponent] }) diff --git a/src/app/webapp-common/shared/entity-page/entity-footer/entity-footer.component.html b/src/app/webapp-common/shared/entity-page/entity-footer/entity-footer.component.html index 1cb288e6..66449295 100755 --- a/src/app/webapp-common/shared/entity-page/entity-footer/entity-footer.component.html +++ b/src/app/webapp-common/shared/entity-page/entity-footer/entity-footer.component.html @@ -9,7 +9,7 @@ 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 new file mode 100644 index 00000000..2f119882 --- /dev/null +++ b/src/app/webapp-common/shared/entity-page/footer-items/retry-footer-item.ts @@ -0,0 +1,25 @@ +import {ItemFooterModel, IFooterState} from './footer-items.models'; +import {IconNames, ICONS} from '../../../constants'; +import {MenuItems} from '../items.utils'; + +export class RetryFooterItem extends ItemFooterModel { + + constructor() { + super(); + this.id = MenuItems.retry; + this.emit = true; + 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 } { + const retry = state.data[this.id]; + + return { + disable: retry?.disable, + preventCurrentItem: state.selectionAllIsArchive, + description: this.menuItemText.transform(retry?.available, 'Retry'), + disableDescription: state.selectionIsOnlyExamples ? 'Retry' : `You can only retry experiments with ‘Failed' status` + + }; + } +} 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 07c3fa3d..e42153bf 100644 --- a/src/app/webapp-common/shared/entity-page/items.utils.ts +++ b/src/app/webapp-common/shared/entity-page/items.utils.ts @@ -28,9 +28,12 @@ export const selectionAllHasExample = (selectedElements: any[]) => selectedEleme 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 => +export const canEnqueue = (task: Task): boolean => !!(task && (TASKS_STATUS.CREATED === task.status || TASKS_STATUS.STOPPED === task.status) && task.type !== TASK_TYPES.MANUAL_ANNOTATION); +export const canRetry = (task: Task): boolean => + !!(task && TASKS_STATUS.FAILED === task.status && task.type !== TASK_TYPES.MANUAL_ANNOTATION); + export const canDequeue = (task: Task): boolean => !!(task && TASKS_STATUS.QUEUED === task.status); @@ -67,11 +70,17 @@ export const selectionDisabledMoveTo = (selectedElements: any[]) => { const selectedFiltered = selectedElements.filter(_selected => !isReadOnly(_selected)); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; -export const selectionDisabledQueue = (selectedElements: any[]) => { +export const selectionDisabledQueue = (selectedElements: {id?: string; status?: string}[]) => { + if (selectedElements.length > 1) { + return {selectedFiltered: [], disable: true, available: 0}; + } const selectedFiltered = selectedElements.filter(_selected => _selected?.status === TaskStatusEnum.Queued && !isReadOnly(_selected)); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; export const selectionDisabledViewWorker = (selectedElements: any[]) => { + if (selectedElements.length > 1) { + return {selectedFiltered: [], disable: true, available: 0}; + } const selectedFiltered = selectedElements.filter(_selected => _selected?.status === TaskStatusEnum.InProgress && !isReadOnly(_selected)); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; @@ -83,6 +92,10 @@ export const selectionDisabledEnqueue = (selectedElements: any[]) => { const selectedFiltered = selectedElements.filter(_selected => canEnqueue(_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)}; +}; export const selectionDisabledDequeue = (selectedElements: any[]) => { const selectedFiltered = selectedElements.filter(_selected => canDequeue(_selected) && !isReadOnly(_selected)); return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; @@ -96,7 +109,7 @@ export const selectionDisabledTags = (selectedElements: any[]) => { return {selectedFiltered, ...countAvailableAndIsDisable(selectedFiltered)}; }; -export const selectionTags = (selectedElements: Array): string[] => { +export const selectionTags = (selectedElements: T[]): string[] => { const _selectedTags = {}; selectedElements.forEach( _selected => { _selected?.tags?.forEach( tag => { @@ -128,7 +141,8 @@ export enum MenuItems { viewWorker = 'viewWorker', tags = 'tags', showAllItems = 'showAllItems', - continue = 'continue' + 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 e6cff1c5..26646eb9 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,29 +1,35 @@ -
- -

NO CHART DATA

-
+@if (hiddenList?.length === 0 || noGraphs && !(multipleSingleValueData?.data.length > 0) && !(singleValueData?.length > 0)) { +
+ + @if (graphList.length > 0) { +

ALL CHARTS ARE HIDDEN

+ } @else { +

NO CHART DATA

+ } +
+}
-
- - - - -
-
+ @if (singleValueData?.length > 0 && hiddenList.includes(singleValueChartTitle)) { +
+ @if (exportForReport) { + + } @else { + + } +
+ } + @if (multipleSingleValueData?.data.length > 0) { +
NO CHART DATA (createEmbedCode)="creatingEmbedCode(null, $event)" (hoverModeChanged)="hoverModeChanged.emit($event)" > -
+
+ }
-
-
-
-
{{metric}}
-
- - -
- -
-
-
-
-
-
-
-
-
-
+ @for (metric of (graphList); track metric) { +
+
+
+ @if (isGroupGraphs) { +
{{ metric }}
+ } +
+ + + @for (chartItem of graphsData[metric]; track trackByIdFn(chartItem)) { +
+ @if (chartItem.visible) { + + } + @if (!disableResize) { +
+
+
+
+ } + @if (!disableResize) { +
+
+
+
+ } +
+
+
+ }
-
+ }
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 6fadf582..d372b415 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 @@ -13,7 +13,7 @@ import { ViewChild, ViewChildren } from '@angular/core'; -import {sortMetricsList} from '../../tasks/tasks.utils'; +import {allowedMergedTypes, sortMetricsList} from '../../tasks/tasks.utils'; import {SingleGraphComponent} from '../single-graph/single-graph.component'; import { ChartHoverModeEnum, @@ -51,10 +51,11 @@ import {maxInArray} from '@common/shared/utils/helpers.util'; export class ExperimentGraphsComponent implements OnDestroy { readonly experimentGraphidPrefix = EXPERIMENT_GRAPH_ID_PREFIX; readonly singleGraphidPrefix = SINGLE_GRAPH_ID_PREFIX; - public graphList: Array = []; - public noGraphs: boolean = false; - public graphsData: { [group: string]: VisibleExtFrame[] }; - public visibleGraphsData: { [graphId: string]: boolean } = {}; + public graphList: string[] = []; + public noGraphs = false; + public graphsData: Record; + protected numIterations = 0; + public visibleGraphsData: Record = {}; private observer: IntersectionObserver; private _xAxisType: ScalarKeyEnum; @ViewChild('allMetrics', {static: true}) allMetrics: ElementRef; @@ -63,10 +64,10 @@ export class ExperimentGraphsComponent implements OnDestroy { public plotlyReady$ = this.store.select(selectPlotlyReady); public plotlyReady: boolean; private subs = new Subscription(); - public height: number = 450; + public height = 450; public width: number; private graphsPerRow: number; - private minWidth: number = 350; + private minWidth = 350; private resizeTextElement: HTMLDivElement; private graphsNumberLimit: number; public activeResizeElement: HTMLDivElement; @@ -98,11 +99,11 @@ export class ExperimentGraphsComponent implements OnDestroy { @Input() isDarkTheme: boolean; @Input() showLoaderOnDraw = true; @Input() legendConfiguration: Partial = {}; - @Input() breakPoint: number = 700; - @Input() isCompare: boolean = false; + @Input() breakPoint = 700; + @Input() isCompare = false; @Input() hoverMode: ChartHoverModeEnum; - @Input() disableResize: boolean = false; - @Input() singleValueData: Array; + @Input() disableResize = false; + @Input() singleValueData: EventsGetTaskSingleValueMetricsResponseValues[]; @Input() multipleSingleValueData: ExtFrame; @Input() experimentName: string; @@ -138,12 +139,13 @@ export class ExperimentGraphsComponent implements OnDestroy { ) { this.subs.add(this.store.select(selectRouterParams).pipe( - map(params => params?.experimentId), + 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.numIterations = 0; this.graphList = []; this.visibleGraphsData = {}; })); @@ -173,13 +175,14 @@ export class ExperimentGraphsComponent implements OnDestroy { } - @Input() set metrics(graphGroups: { [label: string]: ExtFrame[] }) { + @Input() set metrics(graphGroups: Record) { this.noGraphs = (graphGroups !== undefined) && (graphGroups !== null) && Object.keys(graphGroups).length === 0; if (!graphGroups) { this.graphList = []; return; } this.graphsData = this.addId(this.sortGraphsData(graphGroups)); + this.numIterations = Array.from(new Set(Object.values(this.graphsData).reduce((acc, frames) => [...acc, ...frames.map(frame => frame.iter)], []).flat())).filter(a => Number.isInteger(a)).length; this.graphsPerRow = (this.disableResize || this.allGroupsSingleGraphs()) ? 1 : this.graphsPerRow; this.maxUserHeight = maxInArray(Object.values(this.graphsData).flat().map((chart: ExtFrame) => chart.layout?.height || 0)); @@ -275,7 +278,7 @@ export class ExperimentGraphsComponent implements OnDestroy { }); } - sortGraphsData = (data: { [label: string]: ExtFrame[] }) => + sortGraphsData = (data: Record) => Object.entries(data).reduce((acc, [label, graphs]) => ({ ...acc, @@ -289,11 +292,10 @@ export class ExperimentGraphsComponent implements OnDestroy { sensitivity: 'base' }); }) - }), {} as { [label: string]: ExtFrame[] }); + }), {} as Record); - trackByFn = (index: number, item) => item; - trackByIdFn = (index: number, item: ExtFrame) => + trackByIdFn = (item: ExtFrame) => `${item.layout.title} ${item.data?.length} ${(this.isDarkTheme ? '' : item.iter ?? '')}`; isWidthBigEnough() { @@ -404,7 +406,7 @@ export class ExperimentGraphsComponent implements OnDestroy { } - private addId(sortGraphsData1: { [p: string]: ExtFrame[] }): { [p: string]: VisibleExtFrame[] } { + private addId(sortGraphsData1: Record): Record { return Object.entries(sortGraphsData1).reduce((acc, [label, graphs]) => ({ ...acc, @@ -413,7 +415,7 @@ export class ExperimentGraphsComponent implements OnDestroy { id: v4(), visible: this.visibleGraphsData[this.generateIdentifier(graph)] })) - }), {} as { [label: string]: VisibleExtFrame[] }); + }), {} as Record); } public generateIdentifier = (chartItem: any) => `${this.singleGraphidPrefix} ${this.experimentGraphidPrefix} ${chartItem.metric} ${chartItem.layout.title} ${chartItem.iter} ${chartItem.variant} ${(chartItem.layout.images && chartItem.layout.images[0]?.source)}`; @@ -446,7 +448,7 @@ 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) && ['scatter', 'scattergl', 'bar', 'scatter3d'].includes(chartItem?.data[0]?.type); + return this.isGroupGraphs && chartItem.data?.length === 1 && (!chartItem.data[0].name || chartItem.data[0].name === chartItem.layout?.title) && allowedMergedTypes.includes(chartItem?.data[0]?.type); } inHiddenList = (metric: string) => this.isCompare ? !this.hiddenList?.some(m => m.startsWith(metric)) : !this.hiddenList?.includes(metric); 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 59d0d44a..c12c3549 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 @@ -1,8 +1,8 @@ import {NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; +import {CommonModule} from '@angular/common'; import {MatSliderModule} from '@angular/material/slider'; import {MatSelectModule} from '@angular/material/select'; -import {FormsModule} from '@angular/forms'; +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'; @@ -12,8 +12,27 @@ import {SingleValueSummaryTableComponent} from '../single-value-summary-table/si import {SingleGraphModule} from '@common/shared/single-graph/single-graph.module'; import {MatInputModule} from '@angular/material/input'; import {SingleGraphStateModule} from '@common/shared/single-graph/single-graph-state.module'; +import { + ExperimentMetricDataTableComponent +} from '@common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component'; +import {TableModule} from 'primeng/table'; +import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; +import {LabeledFormFieldDirective} from '@common/shared/directive/labeled-form-field.directive'; +import {MatDrawer, MatDrawerContainer, MatDrawerContent} from '@angular/material/sidenav'; +import {PushPipe} from '@ngrx/component'; +import { + SelectableGroupedFilterListComponent +} from '@common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component'; +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'; + + + const declarations= [ + ExperimentMetricDataTableComponent, ExperimentGraphsComponent, GraphSettingsBarComponent, GraphScalarDataToMetric, @@ -31,7 +50,18 @@ const declarations= [ SingleGraphModule, SingleGraphStateModule, MatInputModule, - SingleValueSummaryTableComponent + SingleValueSummaryTableComponent, + TableModule, + ClickStopPropagationDirective, + LabeledFormFieldDirective, + MatDrawer, + MatDrawerContainer, + MatDrawerContent, + PushPipe, + SelectableGroupedFilterListComponent, + ShowTooltipIfEllipsisDirective, + TooltipDirective, + ReactiveFormsModule, ] }) 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 new file mode 100644 index 00000000..4a09dabb --- /dev/null +++ b/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.html @@ -0,0 +1,97 @@ + + +
+ +
+
+ + +
+ + + +
+ +

NO METRICS

+
+ +
+ All metrics hidden. Clear filters +
+ + + + + +
+ + + + + +
+ + + {{ col | uppercase }} + + + + + + + + {{ metricVariant.firstMetricRow ? metricVariant.metric : '' }} + + +
+ {{ metricVariant.variant }} + +
+ + @for (col of colKeys; track $index) { + +
+ {{ metricVariant[col] }} +
+ + + } + + + + + + 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 new file mode 100644 index 00000000..9fc26c6a --- /dev/null +++ b/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.scss @@ -0,0 +1,14 @@ +@import "variables"; + + +:host { + display: block; + height: 100%; + flex-grow: 1; + --cell-width: 120px; + + .experiment-header { + font-size: 12px; + color: $blue-400; + } +} 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 new file mode 100644 index 00000000..6d6045f8 --- /dev/null +++ b/src/app/webapp-common/shared/experiment-graphs/experiment-metric-data-table/experiment-metric-data-table.component.ts @@ -0,0 +1,145 @@ +import {Component, computed, input, OnInit, output, signal} 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'; + +interface tableRow { + metricId: string; + variantId: string; + metric: string; + variant: string; + firstMetricRow: 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' +}) + + +export class ExperimentMetricDataTableComponent implements OnInit { + public settings: ExperimentCompareSettings = {selectedMetricsScalar: []} as ExperimentCompareSettings; + selectedExperiment = input(); + selectedMetricsScalar = input(); + lastMetrics = input(); + selectedMetricsChanged = output(); + filterOpen: boolean; + filterValue = signal(''); + listSearchTerm = signal(''); + + public initialSelectedMetricsScalar: string[] = []; + + + + 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; + + trackByFunction(index: number, item) { + return item?.id || item?.name || index; + } + + clear() { + this.variantFilter.reset(''); + this.selectedMetricsChanged.emit(null); + } + clearSearch() { + this.variantFilter.reset(''); } + + computedSelectedMetricsScalar = computed(() => { + if (this.selectedMetricsScalar() === null) { + if (!this.lastMetrics()) { + return []; + } + this.initialSelectedMetricsScalar = []; + sortMetricsList(Object.keys(this.lastMetrics())).map((metricId) => Object.keys(this.lastMetrics()[metricId]) + .map(variantId => { + this.initialSelectedMetricsScalar.push(`${this.lastMetrics()[metricId][variantId].metric}${this.lastMetrics()[metricId][variantId].variant}`); + })); + return this.initialSelectedMetricsScalar; + } else { + return this.selectedMetricsScalar(); + } + }); + + + dataTable = computed(() => { + this.filterOpen = false; + if (!this.lastMetrics()) { + return []; + } + return sortMetricsList(Object.keys(this.lastMetrics())).map((metricId) => Object.keys(this.lastMetrics()[metricId]).map(variantId => { + return { + metricId, + variantId, + metric: this.lastMetrics()[metricId][variantId].metric, + variant: this.lastMetrics()[metricId][variantId].variant, + firstMetricRow: false, + last: this.lastMetrics()[metricId][variantId].value, + min: this.lastMetrics()[metricId][variantId].min_value, + max: this.lastMetrics()[metricId][variantId].max_value, + mean: this.lastMetrics()[metricId][variantId].mean_value, + first: this.lastMetrics()[metricId][variantId].first_value + }; + })).flat(1); + }); + + metricVariantList$ = computed(() => { + if (!this.lastMetrics()) { + return null; + } + const metricVariantList = {}; + sortMetricsList(Object.keys(this.lastMetrics() ?? {})).map((metricId) => Object.keys(this.lastMetrics()[metricId]).map(variantId => { + const metric = this.lastMetrics()[metricId][variantId].metric; + const variant = this.lastMetrics()[metricId][variantId].variant; + if (metricVariantList[metric]) { + metricVariantList[metric][variant] = {}; + } else { + metricVariantList[metric] = {[variant]: {}}; + } + })); + return metricVariantList; + }); + + dataTableFiltered = computed(() => { + 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 row; + }); + }); + + colKeys = ['first', 'last', 'min', 'max', 'mean']; + protected readonly trackById = trackById; + protected readonly trackByValue = trackByValue; + protected readonly trackByIndex = trackByIndex; + + +} 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 10a2d0e8..11e68f5d 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 @@ -3,7 +3,9 @@ Group by - {{type.name}} + @for (type of groupByOptions; track type) { + {{type.name}} + }
@@ -11,49 +13,53 @@ Horizontal Axis - {{type.name}} + name="scriptType"> + @for (type of xAxisTypeOption; track type) { + {{type.name}} + }
- Smoothing + Smoothing + > + [ngModel]="smoothWeight" + (ngModelChange)="changeWeight.emit($any($event))" + [disabled]="smoothType === smoothTypeEnum.any" + #ngSliderThumb="matSliderThumb"/>
- - + - - - - + + + + @for (smoothTypeOption of smoothTypeEnum | keyvalue; track smoothTypeOption) { + {{smoothTypeOption.value}} - - - + } + + +
diff --git a/src/app/webapp-common/shared/guards/global-selector.guard.ts b/src/app/webapp-common/shared/guards/global-selector.guard.ts new file mode 100644 index 00000000..4e609f6a --- /dev/null +++ b/src/app/webapp-common/shared/guards/global-selector.guard.ts @@ -0,0 +1,12 @@ +import {inject} from '@angular/core'; +import {CanActivateFn} from '@angular/router'; +import {map} from 'rxjs/operators'; +import {Store} from '@ngrx/store'; + +export const globalSelectorGuard: CanActivateFn = (route) => { + const store = inject(Store); + + return store.select(route.data.selector).pipe( + map( (isSelector) => isSelector) + ); +}; diff --git a/src/app/webapp-common/shared/pipes/all-hidden.pipe.ts b/src/app/webapp-common/shared/pipes/all-hidden.pipe.ts new file mode 100644 index 00000000..b8c489d4 --- /dev/null +++ b/src/app/webapp-common/shared/pipes/all-hidden.pipe.ts @@ -0,0 +1,18 @@ +import {Pipe, PipeTransform} from '@angular/core'; + +@Pipe({ + name: 'allHidden', + standalone: true +}) +export class AllHiddenPipe implements PipeTransform { + + transform(arr: any[]): boolean { + if (!arr || arr?.length === 0) { + return false; + } + return arr.every( + annotation=> annotation.hidden + ); + } + +} diff --git a/src/app/webapp-common/shared/pipes/breadcrumbs-ellipsis.pipe.ts b/src/app/webapp-common/shared/pipes/breadcrumbs-ellipsis.pipe.ts index 0b235102..f7473ee9 100644 --- a/src/app/webapp-common/shared/pipes/breadcrumbs-ellipsis.pipe.ts +++ b/src/app/webapp-common/shared/pipes/breadcrumbs-ellipsis.pipe.ts @@ -1,4 +1,5 @@ import {Pipe, PipeTransform} from '@angular/core'; +import {escape} from 'lodash-es'; @Pipe({ name: 'breadcrumbsEllipsis', @@ -11,9 +12,9 @@ export class BreadcrumbsEllipsisPipe implements PipeTransform { const count = (value?.match(/\//g) || []).length; if (count > 1) { - return `
${value.substring(0, value.indexOf('/'))}
/
${value.substring(value.lastIndexOf('/'))}
`; + return `
${escape(value.substring(0, value.indexOf('/')))}
/
${escape(value.substring(value.lastIndexOf('/')))}
`; } - return `
${value}
`; + return `
${escape(value)}
`; } } diff --git a/src/app/webapp-common/shared/pipes/col-getter.pipe.ts b/src/app/webapp-common/shared/pipes/col-getter.pipe.ts index 292eac99..80cf9958 100644 --- a/src/app/webapp-common/shared/pipes/col-getter.pipe.ts +++ b/src/app/webapp-common/shared/pipes/col-getter.pipe.ts @@ -9,7 +9,8 @@ import {ISmCol} from '../ui-components/data/table/table.consts'; export class ColGetterPipe implements PipeTransform { transform(entity: any, col: ISmCol): string { - return get(entity, col.getter, ''); + const result = get(entity, col.getter, ''); + return typeof get(entity, col.getter, '') === 'object' ? JSON.stringify(result) : result; } } diff --git a/src/app/webapp-common/shared/pipes/filterOut.pipe.ts b/src/app/webapp-common/shared/pipes/filterOut.pipe.ts index 3188d8dc..56fe2c59 100755 --- a/src/app/webapp-common/shared/pipes/filterOut.pipe.ts +++ b/src/app/webapp-common/shared/pipes/filterOut.pipe.ts @@ -6,8 +6,8 @@ import {Pipe, PipeTransform} from '@angular/core'; }) export class FilterOutPipe implements PipeTransform { - transform(arr: any[], field: string, value: string): any[] { - if (!arr || !field || !value) { + transform(arr: unknown[], field: string, value: string | boolean): unknown[] { + if (!arr || !field || value === undefined) { return arr; } return arr.filter(item => item[field] !== value); diff --git a/src/app/webapp-common/shared/pipes/na.pipe.ts b/src/app/webapp-common/shared/pipes/na.pipe.ts index d2da9f72..afcd2d4e 100644 --- a/src/app/webapp-common/shared/pipes/na.pipe.ts +++ b/src/app/webapp-common/shared/pipes/na.pipe.ts @@ -3,7 +3,7 @@ import {NA} from '../../../app.constants'; @Pipe({ name: 'NA', - standalone: true + standalone: true, }) export class NAPipe implements PipeTransform { diff --git a/src/app/webapp-common/shared/pipes/safe.pipe.ts b/src/app/webapp-common/shared/pipes/safe.pipe.ts index d05ee282..b77a94f0 100644 --- a/src/app/webapp-common/shared/pipes/safe.pipe.ts +++ b/src/app/webapp-common/shared/pipes/safe.pipe.ts @@ -1,5 +1,5 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { DomSanitizer, SafeHtml, SafeStyle, SafeScript, SafeUrl, SafeResourceUrl } from '@angular/platform-browser'; +import {Pipe, PipeTransform} from '@angular/core'; +import {DomSanitizer, SafeHtml, SafeResourceUrl, SafeScript, SafeStyle, SafeUrl} from '@angular/platform-browser'; import DOMPurify from 'dompurify'; @Pipe({ @@ -8,16 +8,23 @@ import DOMPurify from 'dompurify'; }) export class SafePipe implements PipeTransform { - constructor(protected sanitizer: DomSanitizer) {} + constructor(protected sanitizer: DomSanitizer) { + } public transform(value: any, type: 'html' | 'style' | 'script' | 'url' | 'resourceUrl'): SafeHtml | SafeStyle | SafeScript | SafeUrl | SafeResourceUrl { switch (type) { - case 'html': return this.sanitizer.bypassSecurityTrustHtml(value); - case 'style': return this.sanitizer.bypassSecurityTrustStyle(value); - case 'script': return this.sanitizer.bypassSecurityTrustScript(value); - case 'url': return this.sanitizer.bypassSecurityTrustResourceUrl(value); - case 'resourceUrl': return this.sanitizer.bypassSecurityTrustResourceUrl(value); - default: throw new Error(`Invalid safe type specified: ${type}`); + case 'html': + return this.sanitizer.bypassSecurityTrustHtml(value); + case 'style': + return this.sanitizer.bypassSecurityTrustStyle(value); + case 'script': + return this.sanitizer.bypassSecurityTrustScript(value); + case 'url': + return this.sanitizer.bypassSecurityTrustResourceUrl(value); + case 'resourceUrl': + return this.sanitizer.bypassSecurityTrustResourceUrl(value); + default: + throw new Error(`Invalid safe type specified: ${type}`); } } } @@ -28,9 +35,13 @@ export class SafePipe implements PipeTransform { }) export class SaferPipe implements PipeTransform { - constructor(protected sanitizer: DomSanitizer) {} + constructor(protected sanitizer: DomSanitizer) { + } - public transform(value: string) { - return this.sanitizer.bypassSecurityTrustHtml(DOMPurify.sanitize(value)); + public transform(value: string, allowIFrames = false) { + return this.sanitizer.bypassSecurityTrustHtml(allowIFrames ? DOMPurify.sanitize(value, { + ALLOWED_TAGS: ['iframe'], + ADD_ATTR: ['allow', 'allowfullscreen', 'frameborder', 'scrolling'] + }) : DOMPurify.sanitize(value)); } } diff --git a/src/app/webapp-common/shared/pipes/selectOptionValueToLabel.pipe.ts b/src/app/webapp-common/shared/pipes/selectOptionValueToLabel.pipe.ts index 4893e259..14ec5eac 100755 --- a/src/app/webapp-common/shared/pipes/selectOptionValueToLabel.pipe.ts +++ b/src/app/webapp-common/shared/pipes/selectOptionValueToLabel.pipe.ts @@ -14,6 +14,6 @@ export class SelectOptionValueToLabelPipe implements PipeTransform { return value; } const option = options.find(option => option.value === value); - return option ? option.label : value; + return option?.label ?? value; } } 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 c9ffd377..5ab58165 100755 --- 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 @@ -33,27 +33,28 @@ - @if (projectForm.controls.parent.touched && 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.invalid && projectForm.controls.parent.errors; as errors) { + + @if (errors?.required) { + Please add name. + } + @if (errors?.minlength) { + Project name should contain more than 3 characters. + } + + } +
Description @@ -70,10 +71,9 @@ matInput name="default_output_destination" formControlName="default_output_destination" - [pattern]="outputDestPattern" placeholder="e.g. s3://bucket. gs://bucket" > - @if (projectForm.controls.parent.invalid && projectForm.controls.parent.errors; as errors) { + @if (projectForm.controls.default_output_destination.invalid && projectForm.controls.default_output_destination.errors; as errors) { @if (errors?.required) { Please add default destination. 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 06944c9a..e7f46bb4 100755 --- 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 @@ -15,4 +15,8 @@ font-size: 14px; transform: translateY(-4px); } + + .errors { + min-height: 20px; + } } 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 f3b22198..3fc836e6 100755 --- 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 @@ -5,7 +5,6 @@ import { input, Output, } from '@angular/core'; -import {URI_REGEX} from '~/app.constants'; import {Project} from '~/business-logic/model/projects/project'; import {FormBuilder, ReactiveFormsModule, Validators} from '@angular/forms'; import {rootProjectsPageSize} from '@common/constants'; @@ -24,6 +23,7 @@ import { PaginatedEntitySelectorComponent } from '@common/shared/components/paginated-entity-selector/paginated-entity-selector.component'; import {toSignal} from '@angular/core/rxjs-interop'; +import {OutputDestPattern} from '@common/shared/project-dialog/project-dialog.component'; @Component({ @@ -51,16 +51,14 @@ import {toSignal} from '@angular/core/rxjs-interop'; export class CreateNewProjectFormComponent { private readonly formBuilder = inject(FormBuilder); - public rootFiltered: boolean; public readonly projectsRoot = 'Projects root'; - public outputDestPattern = `${URI_REGEX.S3_WITH_BUCKET}$|${URI_REGEX.S3_WITH_BUCKET_AND_HOST}$|${URI_REGEX.FILE}$|${URI_REGEX.NON_AWS_S3}$|${URI_REGEX.GS_WITH_BUCKET}$|${URI_REGEX.GS_WITH_BUCKET_AND_HOST}|${URI_REGEX.AZURE_WITH_BUCKET}`; projectForm = this.formBuilder.group({ name: ['', [Validators.required, Validators.minLength(3)]], description: [''], - // eslint-disable-next-line @typescript-eslint/naming-convention - default_output_destination: [null], - // eslint-disable-next-line @typescript-eslint/naming-convention + + default_output_destination: [null, [Validators.pattern(OutputDestPattern)]], + system_tags: [[]], parent: [null as string, [Validators.required, Validators.minLength(3)]] }); @@ -74,8 +72,9 @@ export class CreateNewProjectFormComponent { baseProject = input(); private projectValue = toSignal(this.projectForm.controls.parent.valueChanges); projects = input(); + protected rootFiltered = computed(() => !this.projectsRoot.includes(this.projectValue()) && this.projectsRoot === this.baseProject()?.name); protected allProjects = computed(() => ([ - ...(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() ?? [] ])); @@ -97,11 +96,6 @@ export class CreateNewProjectFormComponent { this.initiated = true; } }); - - effect(() => { - this.rootFiltered = !this.projectsRoot.includes(this.projectValue()) && this.projectsRoot === this.baseProject()?.name; - this.filterSearchChanged.emit({value: this.projectValue() ?? ''}); - }); } send() { @@ -111,9 +105,10 @@ export class CreateNewProjectFormComponent { }); } - loadMore(searchString, loadMore) { + loadMore(searchString: string, loadMore: boolean) { this.loading = true; - this.filterSearchChanged.emit({value: searchString || '', loadMore}); + const value = (searchString !== this.projectsRoot ? searchString : '') ?? ''; + this.filterSearchChanged.emit({value, loadMore}); } } 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 new file mode 100644 index 00000000..08bf4906 --- /dev/null +++ b/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.html @@ -0,0 +1,64 @@ +
+ + Project name + + @if (projectForm.controls.name.invalid && projectForm.controls.name.errors; as errors) { + + @if (errors?.required) { + Please add name. + } + @if (errors?.uniqueProject) { + Project name in this path already exists. + } + @if (errors?.minlength) { + Project name should contain more than 3 characters. + } + @if (errors?.emptyName && !errors?.minlength) { + Project name can't contain only spaces. + } + @if (errors?.pattern && !errors?.minlength) { + Project name can't contain slash (/) + } + + } + + + Project path + + + + + Default output destination + + @if (projectForm.controls.default_output_destination.invalid && projectForm.controls.default_output_destination.errors; as errors) { + + @if (errors?.pattern) { + Illegal output destination (e.g. s3://bucket. gs://bucket) + } + + } + +
+ + +
+
diff --git a/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.scss b/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.scss new file mode 100644 index 00000000..30ab41a4 --- /dev/null +++ b/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.scss @@ -0,0 +1,32 @@ +:host { + .create-project-button { + padding: 32px 12px 0; + } + mat-form-field { + width: 100%; + + .project-description { + min-height: 68px; + } + } + .creat-new-suffix { + display: inline-block; + margin-right: 18px; + font-size: 14px; + transform: translateY(-4px); + } + + .errors { + min-height: 20px; + } + .actions { + display: flex; + align-items: center; + justify-content: center; + gap: 12px; + margin-top: 32px; + button { + min-width: 112px; + } + } +} 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 new file mode 100644 index 00000000..7d790f0e --- /dev/null +++ b/src/app/webapp-common/shared/project-dialog/edit-project-form/edit-project-form.component.ts @@ -0,0 +1,99 @@ +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'; +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 {LabeledFormFieldDirective} from '@common/shared/directive/labeled-form-field.directive'; +import { + PaginatedEntitySelectorComponent +} from '@common/shared/components/paginated-entity-selector/paginated-entity-selector.component'; +import {OutputDestPattern} from '@common/shared/project-dialog/project-dialog.component'; +import {ProjectLocationPipe} from '@common/shared/pipes/project-location.pipe'; + + +@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, + StringIncludedInArrayPipe, + ClickStopPropagationDirective, + TooltipDirective, + SearchTextDirective, + MatProgressSpinnerModule, + ScrollEndDirective, + UniqueNameValidatorDirective, + UniqueProjectValidator, + ShowTooltipIfEllipsisDirective, + LabeledFormFieldDirective, + PaginatedEntitySelectorComponent, + ReactiveFormsModule, + ] +}) +export class EditProjectFormComponent { + private readonly formBuilder = inject(FormBuilder); + + 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)]], + system_tags: [[]] + }); + + public loading: boolean; + public noMoreOptions: boolean; + + + + project = input(); + parentProjectPath = computed(() => { + return new ProjectLocationPipe().transform(this.project()?.name) + }); + + @Output() projectUpdated = new EventEmitter(); + @Output() cancelClicked = new EventEmitter(); + + + constructor() { + effect(() => { + this.projectForm.controls.name.setValue(this.project()?.basename ?? ''); + this.projectForm.controls.parent.setValue(this.parentProjectPath()); + this.projectForm.controls.default_output_destination.setValue(this.project()?.default_output_destination); + this.projectForm.controls.parent.disable(); + }); + } + + send() { + this.projectUpdated.emit({ + ...this.projectForm.getRawValue(), + ...(this.projectForm.controls.default_output_destination.value === '' && {default_output_destination: null}) + }); + } +} + diff --git a/src/app/webapp-common/shared/project-dialog/project-dialog.actions.ts b/src/app/webapp-common/shared/project-dialog/project-dialog.actions.ts index 463d71b5..b429ebfc 100755 --- a/src/app/webapp-common/shared/project-dialog/project-dialog.actions.ts +++ b/src/app/webapp-common/shared/project-dialog/project-dialog.actions.ts @@ -1,9 +1,11 @@ import {CreationStatusEnum} from './project-dialog.reducer'; import {ProjectsCreateRequest} from '~/business-logic/model/projects/projectsCreateRequest'; import {createAction, props} from '@ngrx/store'; +import {ProjectsUpdateRequest} from '~/business-logic/model/projects/projectsUpdateRequest'; export const resetState = createAction('[CREATE_PROJECT_DIALOG] RESET_STATE'); export const createNewProject = createAction('[CREATE_PROJECT_DIALOG] CREATE_NEW_PROJECT', props<{req: ProjectsCreateRequest; dialogId: string}>()); +export const updateProject = createAction('[CREATE_PROJECT_DIALOG] UPDATE_PROJECT', props<{req: ProjectsUpdateRequest; dialogId: string}>()); export const navigateToNewProject = createAction('[CREATE_PROJECT_DIALOG] NAVIGATE_TO_NEW_PROJECT', props<{id: string}>()); export const setCreationStatus = createAction('[CREATE_PROJECT_DIALOG] SET_CREATION_STATUS', props<{status: CreationStatusEnum}>()); export const moveProject = createAction( 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 2f705f97..03873650 100755 --- a/src/app/webapp-common/shared/project-dialog/project-dialog.component.html +++ b/src/app/webapp-common/shared/project-dialog/project-dialog.component.html @@ -1,15 +1,22 @@ @if ( mode === 'create') { } + @if ( mode === 'edit') { + + + } @if ( mode === 'move') { , @Inject(MAT_DIALOG_DATA) data: ProjectDialogConfig ) { + this.baseProject = data.project; this.mode = data.mode; this.projects$ = this.store.select(selectTablesFilterProjectsOptions); @@ -58,6 +66,10 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { const project = this.convertFormToProject(projectForm); this.store.dispatch(createNewProjectActions.createNewProject({req: project, dialogId: this.matDialogRef.id})); } + public updateProject(projectForm) { + const project = {project: this.baseProject.id, ...this.convertFormToProject(projectForm)}; + this.store.dispatch(createNewProjectActions.updateProject({req: project, dialogId: this.matDialogRef.id})); + } moveProject(event: {location: string; name: string; fromName: string; toName: string; projectName: string}) { this.store.dispatch(createNewProjectActions.moveProject({ @@ -72,9 +84,9 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { private convertFormToProject(projectForm: any): ProjectsCreateRequest { return { name: `${projectForm.parent === 'Projects root' ? '' : projectForm.parent + '/'}${projectForm.name}`, - description: projectForm.description, + ...(projectForm.description && {description: projectForm.description}), // eslint-disable-next-line @typescript-eslint/naming-convention - system_tags: projectForm.system_tags, + ...(projectForm.system_tags && {system_tags: projectForm.system_tags}), // eslint-disable-next-line @typescript-eslint/naming-convention default_output_destination: projectForm.default_output_destination }; diff --git a/src/app/webapp-common/shared/project-dialog/project-dialog.effects.ts b/src/app/webapp-common/shared/project-dialog/project-dialog.effects.ts index d42d7941..c747babf 100755 --- a/src/app/webapp-common/shared/project-dialog/project-dialog.effects.ts +++ b/src/app/webapp-common/shared/project-dialog/project-dialog.effects.ts @@ -28,7 +28,7 @@ export class ProjectDialogEffects { } activeLoader = createEffect(() => this.actions.pipe( - ofType(newProjectActions.createNewProject), + ofType(newProjectActions.createNewProject, newProjectActions.updateProject), map(action => activeLoader(action.type)) )); @@ -56,6 +56,24 @@ export class ProjectDialogEffects { ) )); + updateProject = createEffect(() => this.actions.pipe( + ofType(newProjectActions.updateProject), + concatLatestFrom(() => this.store.select(selectActiveWorkspace)), + switchMap(([action]) => this.projectsApiService.projectsUpdate({...action.req}) + .pipe( + tap(() => this.dialog.getDialogById(action.dialogId).close(true)), + mergeMap(() => [ + deactivateLoader(action.type), + newProjectActions.setCreationStatus({status: CREATION_STATUS.SUCCESS}), + getAllSystemProjects(), + addMessage(MESSAGES_SEVERITY.SUCCESS, `${(new ShortProjectNamePipe()).transform(action.req.name)} has been updated successfully in ${(new ProjectLocationPipe()).transform(action.req.name)}`), + ] + ), + catchError(error => [deactivateLoader(action.type), requestFailed(error), addMessage(MESSAGES_SEVERITY.ERROR, 'Project Created Failed'), newProjectActions.setCreationStatus({status: CREATION_STATUS.FAILED})]) + ) + ) + )); + moveProject = createEffect(() => this.actions.pipe( ofType(newProjectActions.moveProject), concatLatestFrom(() => this.store.select(selectActiveWorkspace)), diff --git a/src/app/webapp-common/shared/project-dialog/project-dialog.module.ts b/src/app/webapp-common/shared/project-dialog/project-dialog.module.ts index e52bc1fa..ed9b3198 100755 --- a/src/app/webapp-common/shared/project-dialog/project-dialog.module.ts +++ b/src/app/webapp-common/shared/project-dialog/project-dialog.module.ts @@ -33,6 +33,8 @@ import { ShowTooltipIfEllipsisDirective } from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; import {CreateNewProjectFormComponent} from '@common/shared/project-dialog/create-new-project-form/create-new-project-form.component'; +import {PushPipe} from '@ngrx/component'; +import {EditProjectFormComponent} from '@common/shared/project-dialog/edit-project-form/edit-project-form.component'; @NgModule({ imports: [ @@ -59,7 +61,9 @@ import {CreateNewProjectFormComponent} from '@common/shared/project-dialog/creat ClickStopPropagationDirective, ShowTooltipIfEllipsisDirective, CreateNewProjectFormComponent, - ProjectMoveToFormComponent + ProjectMoveToFormComponent, + PushPipe, + EditProjectFormComponent ], declarations: [ProjectDialogComponent] }) 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 6dce7ed3..46295efa 100755 --- 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 @@ -35,7 +35,7 @@ Please provide a Project } @if (errors?.minlength) { - Please provide a project name longer than 3 characters + Project name should be at least 3 characters long } @if (errors?.uniqueName && !projectInput?.errors?.required) { Can't move a project to its current location diff --git a/src/app/webapp-common/shared/project-dialog/unique-project.validator.ts b/src/app/webapp-common/shared/project-dialog/unique-project.validator.ts index f736ff8f..90e50f1b 100644 --- a/src/app/webapp-common/shared/project-dialog/unique-project.validator.ts +++ b/src/app/webapp-common/shared/project-dialog/unique-project.validator.ts @@ -12,13 +12,15 @@ import {ProjectsGetAllExResponse} from '~/business-logic/model/projects/projects }) export class UniqueProjectValidator implements AsyncValidator { @Input() parent: string; + @Input() allowedPath: string; constructor(private projectsApi: ApiProjectsService) { } - validate(control: AbstractControl): Promise | Observable { - if (!(control.value?.length > 2)) { - return null; + validate(control: AbstractControl): Promise | Observable { + const projectPath = this.parent ? `${this.parent}/${control.value}` : control.value; + if (!(control.value?.length > 2) || projectPath === this.allowedPath) { + return of(null); } return of(control.value).pipe( diff --git a/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.component.html b/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.component.html index 23b6149c..cfea04b1 100755 --- a/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.component.html +++ b/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.component.html @@ -1,4 +1,4 @@ - + diff --git a/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.module.ts b/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.module.ts index 2f07a98e..0d511787 100755 --- a/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.module.ts +++ b/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.module.ts @@ -13,6 +13,8 @@ import { } from '@common/shared/ui-components/template-forms-ui/unique-name-validator.directive'; import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dialog-template/dialog-template.component'; import {MatInputModule} from '@angular/material/input'; +import {PushPipe} from '@ngrx/component'; + @NgModule({ imports: [ @@ -25,6 +27,7 @@ import {MatInputModule} from '@angular/material/input'; UniqueNameValidatorDirective, DialogTemplateComponent, MatInputModule, + PushPipe, ], declarations : [QueueCreateDialogComponent, CreateNewQueueFormComponent] }) diff --git a/src/app/webapp-common/shared/services/changes.service.ts b/src/app/webapp-common/shared/services/changes.service.ts new file mode 100644 index 00000000..6a4593cb --- /dev/null +++ b/src/app/webapp-common/shared/services/changes.service.ts @@ -0,0 +1,121 @@ +import {computed, inject, Injectable, signal} from '@angular/core'; +import {HttpClient} from '@angular/common/http'; +import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; +import {Store} from '@ngrx/store'; +import {MatDialog} from '@angular/material/dialog'; +import {selectRouterConfig} from '../../core/reducers/router-reducer'; +import {combineLatest, of} from 'rxjs'; +import {catchError, debounceTime, distinctUntilChanged, filter, map, withLatestFrom} from 'rxjs/operators'; +import {selectFirstLogin, selectNeverShowAppChanges} from '../../core/reducers/view.reducer'; +import {selectCurrentUser, selectIsAdmin} from '../../core/reducers/users-reducer'; +import {neverShowChangesAgain} from '../../core/actions/layout.actions'; +import {selectFeatures, selectTermsOfUse} from '~/core/reducers/users.reducer'; +import {DeviceDetectorService} from 'ngx-device-detector'; +import {default as semverGte} from 'semver/functions/gte'; +import {default as semverGt} from 'semver/functions/gt'; +import {FeaturesEnum} from '~/business-logic/model/users/featuresEnum'; +import {ChangesModalData, VersionChangesModalComponent} from '@common/layout/version-chnages-modal/version-changes-modal.component'; + +export interface Change { + version: string; + content: string; + context?: string; + image: string; + title: string; + feature?: FeaturesEnum; +} + +const changesCooldownTime = 1000 * 60 * 60 * 2; +export const localStorageKey = 'nextTimeToShowChanges'; + +@Injectable({ + providedIn: 'root' +}) +export class ChangesService { + private httpClient = inject(HttpClient); + private store = inject(Store); + private matDialog = inject(MatDialog); + private deviceService = inject(DeviceDetectorService); + + private currentUser = this.store.selectSignal(selectCurrentUser); + + private changesConfig = signal([]); + private nextTimeToShowChanges: Date; + private neverShowAgainForVersion: boolean; + private firstTime = true; + private mobile = this.deviceService.isMobile(); + public hasChanges = computed(() => this.changesConfig()?.length > 0); + + constructor() { + combineLatest([ + this.store.select(selectRouterConfig), + this.store.select(selectCurrentUser), + this.store.select(selectFirstLogin), + this.store.select(selectTermsOfUse), + this.store.select(selectIsAdmin) + ]) + .pipe( + takeUntilDestroyed(), + debounceTime(1000), + filter(([, user, firstLogin, tos, isAdmin]) => + isAdmin && !this.mobile && !firstLogin && !!user && !tos.accept_required && !this.neverShowAgainForVersion && this.matDialog.openDialogs.length === 0), + distinctUntilChanged(([prev], [curr]) => prev?.[prev.length - 1] === curr[curr.length - 1])) + .subscribe(() => { + if (this.shouldDisplayChanges() && this.changesConfig()?.length > 0) { + this.showChangesModal(); + } + }); + } + + initChangesService() { + this.nextTimeToShowChanges = new Date(window.localStorage.getItem(localStorageKey) || new Date().getTime()); + + this.httpClient.get('server_changes.json') + .pipe( + withLatestFrom(this.store.select(selectFeatures)), + map(([changesConfig, features]: [{ changes: Change[] }, FeaturesEnum[]]) => ({ + changes: changesConfig.changes.filter(change => !change.feature || !features || features.includes(change.feature) && + semverGt(change.version ?? '0.0.0', this.currentUser().created_in_version || '0.0.0')) + })), + filter((changesConfig: { changes: Change[] }) => changesConfig?.changes?.length > 0), + catchError(() => of({changes: []})), + withLatestFrom(this.store.select(selectNeverShowAppChanges)) + ) + .subscribe(([changes, lastApprovedVersion]: [{ changes: Change[] }, string]) => { + this.changesConfig.set(changes.changes); + this.neverShowAgainForVersion = semverGte(lastApprovedVersion || '0.0.0', this.changesConfig()?.[0]?.version ?? '0.0.0') || + semverGte(this.currentUser().created_in_version || '0.0.0', this.changesConfig()?.[0]?.version ?? '0.0.0'); + + if (!this.firstTime) { + if (!this.neverShowAgainForVersion) { + this.nextTimeToShowChanges = new Date(); + window.localStorage.removeItem(localStorageKey); + } + } + this.firstTime = false; + }); + } + + public showChangesModal() { + this.matDialog.open(VersionChangesModalComponent, { + data: { + changes: this.changesConfig(), + visitedIndex: 0, + mainTitle: `IMPORTANT CHANGES IN v${this.changesConfig()[0].version}` + }, + maxWidth: '540px' + }).afterClosed() + .subscribe((neveShowAgain) => { + if (neveShowAgain) { + this.store.dispatch(neverShowChangesAgain({version: this.changesConfig()[0].version})); + } + this.nextTimeToShowChanges = new Date(new Date().getTime() + changesCooldownTime); + window.localStorage.setItem(localStorageKey, this.nextTimeToShowChanges.toISOString()); + + }); + } + + private shouldDisplayChanges() { + return this.nextTimeToShowChanges <= new Date(); + } +} diff --git a/src/app/webapp-common/shared/services/dag-manager-unsorted.service.ts b/src/app/webapp-common/shared/services/dag-manager-unsorted.service.ts index d44611ad..6451bfac 100644 --- a/src/app/webapp-common/shared/services/dag-manager-unsorted.service.ts +++ b/src/app/webapp-common/shared/services/dag-manager-unsorted.service.ts @@ -7,7 +7,7 @@ import { maxInArray } from '@common/shared/utils/helpers.util'; }) export class DagManagerUnsortedService extends DagManagerService { - override convertArrayToDagModel(itemsArray: Array): Array> { + override convertArrayToDagModel(itemsArray: T[]): T[][] { const result: Array> = []; const nodeLevels = new Map(); const nodeChildren = new Map(); diff --git a/src/app/webapp-common/shared/services/error.service.ts b/src/app/webapp-common/shared/services/error.service.ts index 63af8571..9d9af051 100644 --- a/src/app/webapp-common/shared/services/error.service.ts +++ b/src/app/webapp-common/shared/services/error.service.ts @@ -27,6 +27,7 @@ export class ErrorService { private codes = { 400: { + 50: this.template`Account reached the maximum number of credentials.`, 51: this.template`This operation could not be completed at this time. Please try again later. \n${'resultMsg'}`, 52: this.template`Could not complete identity verification. The provider may be down - Please try again later`, 53: this.template`Could not complete identity verification. The provider may be down - Please try again later`, diff --git a/src/app/webapp-common/shared/services/login.service.ts b/src/app/webapp-common/shared/services/login.service.ts index e441d16c..c165b702 100644 --- a/src/app/webapp-common/shared/services/login.service.ts +++ b/src/app/webapp-common/shared/services/login.service.ts @@ -249,7 +249,15 @@ After the issue is resolved and Trains Server is up and running, reload this pag if (this.locationStrategy.getBaseHref() && this.locationStrategy.getBaseHref() !== '/') { pathname = pathname.replace(this.locationStrategy.getBaseHref(), ''); } - const redirectUrl: string = pathname + window.location.search; + + let redirectUrl = ''; + let extraParam = ''; + if (pathname.match(/^\/_\w+$/gm)) { + extraParam = pathname; + } else { + redirectUrl = pathname + window.location.search; + } + if ( !['/login/signup', '/login', '/dashboard', '/'].includes(redirectUrl) && (this.guestUser?.enabled || ConfigurationService.globalEnvironment.autoLogin) @@ -278,8 +286,8 @@ After the issue is resolved and Trains Server is up and running, reload this pag } else { resolve(null); } - } else if (!['/login/signup', '/login'].some(url => redirectUrl.startsWith(url))) { - const targetUrl = (redirectUrl && redirectUrl != '/') ? `/login?redirect=${encodeURIComponent(redirectUrl)}` : '/login'; + } else if (!extraParam && !['/login/signup', '/login'].some(url => redirectUrl.startsWith(url))) { + const targetUrl = (redirectUrl && redirectUrl != '/') ? `/login?redirect=${encodeURIComponent(redirectUrl)}` : '/login' + '/' + extraParam; window.history.replaceState(window.history.state, '', targetUrl); } } diff --git a/src/app/webapp-common/shared/services/tips.service.ts b/src/app/webapp-common/shared/services/tips.service.ts index 4ca9178f..c170a88c 100644 --- a/src/app/webapp-common/shared/services/tips.service.ts +++ b/src/app/webapp-common/shared/services/tips.service.ts @@ -18,16 +18,14 @@ import {selectFeatures, selectTermsOfUse} from '~/core/reducers/users.reducer'; import {DeviceDetectorService} from 'ngx-device-detector'; import {ConfigurationService} from '@common/shared/services/configuration.service'; -interface Tips { - [url: string]: Tip[]; -} +type Tips = Record; export interface Tip { title: string; image: string; content: string; - context: string; - feature: FeaturesEnum; + context?: string; + feature?: FeaturesEnum; } const tipsCooldownTime = 1000 * 60 * 60 * 24 * 3; @@ -45,7 +43,7 @@ export class TipsService { private tipsConfig = signal({global: []}); private nextTimeToShowTips: Date; private neverShowAgain: boolean; - private firstTime: boolean = true; + private firstTime = true; private mobile = this.deviceService.isMobile(); public hasTips = computed(() => Object.keys(this.tipsConfig()).length > 0); @@ -120,13 +118,14 @@ export class TipsService { public showTipsModal(allTips?: Tip[], hideDontShow?: boolean) { const visitedIndex = parseInt(window.localStorage.getItem('tipVisitedIndex'), 10) || 0; - allTips = allTips ? allTips : (Object.values(this.tipsConfig()) as any).flat(); + allTips = allTips ? allTips : (Object.values(this.tipsConfig())).flat(); this.matDialog.open(TipOfTheDayModalComponent, { data: { tips: allTips, visitedIndex, - hideDontShow: this.neverShowAgain || hideDontShow - } + hideDontShow: this.neverShowAgain || hideDontShow, + }, + maxWidth: '712px' }).afterClosed() .subscribe((neveShowAgain) => { if (neveShowAgain) { 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 cf021c85..f6fe75ce 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,7 +1,7 @@
@if (singleGraph && data.moveLegendToTitle && chart) { @if (!darkTheme) {
- @if (minMaxIterations$ | async; as minMaxIterations) { + @if (minMaxIterations$ | ngrxPush; as minMaxIterations) {
@if (minMaxIterations.maxIteration !== minMaxIterations.minIteration || minMaxIterations.minIteration > 0) { @@ -45,8 +45,8 @@
}
-
- @if ((isFetchingData$ | async) === false && isFullDetailsMode) { +
+ @if ((isFetchingData$ | ngrxPush) === false && isFullDetailsMode) {
}
@@ -62,9 +62,9 @@ Horizontal Axis @for (type of xAxisTypeOption; track type.value) { {{type.name}} 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 e57a85e1..a592313d 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 @@ -101,7 +101,7 @@ } .axis-type-field { - width: 170px; + width: 180px; } .graph-container { 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 3c0a7b19..fb3995e7 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 @@ -49,6 +49,7 @@ export interface ExtData extends plotly.PlotData { colorKey?: string; isSmoothed: boolean; originalMetric?: string; + fakePlot?: boolean; } @Component({ @@ -106,7 +107,7 @@ export abstract class PlotlyGraphBaseComponent implements OnDestroy { const taskId = chart.task; const namesHash = {}; for (let i = 0; i < data.length; i++) { - if (!data[i].name || data[i].name === chart.variant || data[i].name.endsWith('')) { + if (!data[i].name || data[i].name === chart.variant || data[i].name.endsWith('') || data[i].name.endsWith(`.${(data[i].task || taskId).substring(0, 6)}`)) { continue; } const name = data[i].name; @@ -137,14 +138,6 @@ export abstract class PlotlyGraphBaseComponent implements OnDestroy { return data; } - public extractColorKey(html: string): string[] { - const div = document.createElement('div'); - div.innerHTML = html; - const el = div.querySelector('.color-key'); - const orgColor = el?.getAttribute('data-origin-color'); - return el ? [el.getAttribute('data-color-key'), orgColor === 'undefined' ? null : orgColor] : ['', '']; - } - ngOnDestroy(): void { this.sub.unsubscribe(); this.colorSub?.unsubscribe(); 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 03fe4d51..927cefe0 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 @@ -17,7 +17,7 @@ color: $blue-600; &.table-title { - top: 20px + top: 30px } .title-color { 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 1e825c17..82703a77 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 @@ -14,12 +14,11 @@ 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 {attachColorChooser} from '@common/shared/ui-components/directives/choose-color/choose-color.directive'; import {chooseTimeUnit} from '@common/shared/utils/choose-time-unit'; import {download} from '@common/shared/utils/download'; import {TinyColor} from '@ctrl/tinycolor'; -import {select, Selection} from 'd3-selection'; -import {cloneDeep, escape} from 'lodash-es'; +import {select} from 'd3-selection'; +import {cloneDeep} from 'lodash-es'; import plotly from 'plotly.js'; import {Subject} from 'rxjs'; import {debounceTime, filter} from 'rxjs/operators'; @@ -34,8 +33,10 @@ import { ExtLegend, PlotlyGraphBaseComponent } from './plotly-graph-base'; +import {showColorPicker} from '@common/shared/ui-components/directives/choose-color/choose-color.actions'; +import {normalizeColorToString} from '@common/shared/services/color-hash/color-hash.utils'; + -// eslint-disable-next-line @typescript-eslint/naming-convention declare const Plotly; const RATIO_OFFSET_FIX = 37; @@ -51,7 +52,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { public alreadyDrawn = false; public shouldRefresh = false; public loading: boolean; - public type: Array; + public type: (plotly.PlotData['type'] | 'table')[]; public ratio: number; public title: string; private originalChart: ExtFrame; @@ -115,7 +116,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { private rebootGraph(chart: ExtFrame, clean?: boolean) { const hidden = this._chart?.data .filter(d => !d.isSmoothed) - .map((d, i) => d.visible === 'legendonly' ? i : null) + .map((d, i) => d.visible === 'legendonly' && (d.fakePlot === chart.data[i].fakePlot) ? i : null) .filter(index => index !== null); if (clean && this.alreadyDrawn && this.type[0] === 'scatter' && chart.data[0]?.x?.length === 1) { (Plotly.deleteTraces as typeof plotly.deleteTraces)(this.chartElm, Array.from({length: this.chartElm.data.length ?? 0}, (v, i) => i)); @@ -249,9 +250,11 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { })); } - if (!this.alreadyDrawn) { + // We don't color pie charts labels (just like in histograms) + if (!this.alreadyDrawn && this.chart.type !== 'pie') { setTimeout(() => { - this.subscribeColorButtons(container); + this.repositionModeBar(this.plotlyContainer.nativeElement); + this.subscribeColorButtons(); this.updateLegend(); }); } @@ -272,7 +275,6 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { this.title = this.hideTitle ? '' : this.getTitle(graph); let layout = { ...this.hideDownloadButtons ? {} : this.addParametersIfDarkTheme({ - // eslint-disable-next-line @typescript-eslint/naming-convention paper_bgcolor: PALLET.blue950 }), ...this.addParametersIfDarkTheme({ @@ -282,9 +284,8 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } }), ...graph.layout, - // eslint-disable-next-line @typescript-eslint/naming-convention ...this.addParametersIfDarkTheme({plot_bgcolor: 'transparent'}), - height: this.type[0] === 'table' ? this.height - 20 : this.height, + height: this.type[0] === 'table' ? this.height - 30 : this.height, width: this.ratio ? (this.height * this.ratio) + RATIO_OFFSET_FIX : undefined, modebar: { color: '#5a658e', @@ -404,14 +405,14 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { }; layout.margin = { l: 24, - t: 52, + t: 62, r: 24, b: 0 }; } }); const barLayoutConfig = { - hovermode: this.hoverMode ?? 'closest', + hovermode: this.hoverMode ?? 'closest' }; const scatterLayoutConfig: Partial = { @@ -470,30 +471,32 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { const modeBarButtonsToAdd = ['v1hovermode', 'togglespikelines'] as undefined as plotly.ModeBarButton[]; - modeBarButtonsToAdd.push({ - name: 'Hover mode', - title: this.getHoverModeTitle(this.hoverMode), - icon: { - width: 24, - height: 24, - // fill: 'rgb(77, 102, 255)', - path: this.getHoverModePath(this.hoverMode) - }, - click: (gd: plotly.PlotlyHTMLElement) => { - switch (this.hoverMode) { - case 'closest': - this.hoverMode = 'x'; - break; - case 'x': - this.hoverMode = 'x unified'; - break; - default: - this.hoverMode = 'closest'; + if (!['scatter3d', 'surface'].includes(graph.type)) { + modeBarButtonsToAdd.push({ + name: 'Hover mode', + title: this.getHoverModeTitle(this.hoverMode), + icon: { + width: 24, + height: 24, + // fill: 'rgb(77, 102, 255)', + path: this.getHoverModePath(this.hoverMode) + }, + click: (gd: plotly.PlotlyHTMLElement) => { + switch (this.hoverMode) { + case 'closest': + this.hoverMode = 'x'; + break; + case 'x': + this.hoverMode = 'x unified'; + break; + default: + this.hoverMode = 'closest'; + } + this.hoverModeChanged.emit(this.hoverMode); + this.updateHoverMode(gd); } - this.hoverModeChanged.emit(this.hoverMode); - this.updateHoverMode(gd); - } - }); + }); + } if (['multiScalar', 'scalar'].includes(graph.layout.type)) { modeBarButtonsToAdd.push({ @@ -529,9 +532,10 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { pathElement.style.fill = this.chartElm.layout?.showlegend ? 'rgb(77, 102, 255)' : 'rgb(143, 157, 201)'; svg.parentElement.attributes['data-title'].value = this.getHideButtonTitle(); this.chartElm.layout.showlegend = !this.chartElm.layout.showlegend; - if (this.chartElm.layout.showlegend) { + if (this.chartElm.layout.showlegend && this.chart.type !== 'pie') { setTimeout(() => { - this.subscribeColorButtons(this.plotlyContainer.nativeElement); + this.repositionModeBar(this.plotlyContainer.nativeElement); + this.subscribeColorButtons(); this.updateLegend(); }, 20); } @@ -594,9 +598,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { title: this.hideMaximize === 'disabled' ? `Can't maximize because an iframe with the same name exists` : 'Maximize Graph', attr: this.hideMaximize === 'disabled' ? 'plotly-disabled-maximize' : '', icon: this.getMaximizeIcon(), - click: () => { - this.hideMaximize !== 'disabled' && this.maximizeGraph(); - } + click: () => this.hideMaximize !== 'disabled' && this.maximizeGraph() }; modeBarButtonsToAdd.push(maximizeButton); } @@ -624,7 +626,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } private getTitle(graph: ExtFrame) { - if(this.hideTitle && this.graphTitle){ + if (this.hideTitle && this.graphTitle) { return this.graphTitle; } if (graph.layout.title) { @@ -678,8 +680,15 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { graph.data[i].name = this.getTitle(graph); } - if (!this.alreadyDrawn && !graph.data[i].name.includes('; } - const genColorKey = this.generateColorKey(graph, i); - this.singleColorKey = genColorKey; - const wrappedText = (this.scaleFactor === 100 || this.isSmooth) ? graph.data[i].name : `${graph.data[i].name} `; - const orgColor = this.isCompare ? undefined : this.getOriginalColor(i); - graph.data[i].name = wrappedText + ``; + this.singleColorKey = colorKey; + graph.data[i].name = (this.scaleFactor === 100 || this.isSmooth) ? graph.data[i].name : `${graph.data[i].name.trim()} `; } - const [colorKey, originalColor] = this.extractColorKey(graph.data[i].name); + if (!Array.isArray(originalColor)) { let color; if (originalColor && !this.colorHash.hasColor(colorKey)) { @@ -721,17 +727,25 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { return graph; } + private removeUserColorFromPlot(data) { + if (data?.marker) { + data.marker.color = undefined; + } + if (data?.line) { + data.line.color = undefined; + } + } + private getOriginalColor(i: number) { return (this.originalChart.data[i]?.marker?.color || this.originalChart.data[i]?.line?.color) as string; } - public generateColorKey(graph: ExtFrame, i: number) { - const variant = graph.data[i].colorKey || graph.data[i].name; + public generateColorKey(name: string, task: string, colorKey: string) { + const variant = colorKey || name; if (!this.isCompare) { return `${variant}?`; // "?" to adjust desired colors (legend title is removing this ?) } else { - const task = graph.data[i].task ?? graph.task; - return `${variant}-${task}`; + return variant?.endsWith(task) ? variant : `${variant}-${task}`; } } @@ -768,13 +782,13 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { let changed = false; graph?.data.forEach(trace => { const name = trace.name; - const [colorKey] = this.extractColorKey(name); + const colorKey = this.generateColorKey(trace.name, trace.task, trace.colorKey); if (!name || !this.colorHash.hasColor(colorKey)) { return; } const oldColor = this._getTraceColor(trace); const newColorArr = colorObj[colorKey]; - const newColor = newColorArr ? `rgb(${newColorArr[0]},${newColorArr[1]},${newColorArr[2]})` : false; + const newColor = newColorArr ? `rgb(${newColorArr[0]},${newColorArr[1]},${newColorArr[2]})` : null; if (oldColor !== newColor && newColor) { changed = true; this._reColorTrace(trace, newColorArr); @@ -788,28 +802,31 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { }); } - private subscribeColorButtons(container) { - this.repositionModeBar(this.plotlyContainer.nativeElement); - const traces = container.querySelectorAll('.traces'); - for (const trace of traces) { - let originalColor = null; - const textEl = trace.querySelector('.legendtext') as SVGTextElement; - const textElData = textEl.getAttribute('data-unformatted'); - const [text, orgColor] = textEl ? this.extractColorKey(textElData) : ['', '']; - if (orgColor) { - const {r, g, b, a} = new TinyColor(orgColor).toRgb(); - originalColor = orgColor ? [r, g, b, a] : null; - } - const title = document.createElementNS('http://www.w3.org/2000/svg', 'title'); - title.textContent = text.replace('?', ''); - textEl.parentElement.appendChild(title); - - const layers = trace.querySelector('.layers'); - const parentEl = layers.parentElement; - parentEl.removeChild(layers); // Needed because z-index in svg is by element order - parentEl.appendChild(layers); - attachColorChooser(text, layers, this.colorHash, this.store, null, originalColor); - } + private subscribeColorButtons = () => { + select(this.plotlyContainer.nativeElement) + .selectAll('.traces .layers') + .raise() + .on('click', (event, data) => { + const colorKey = data[0].trace._input.colorKey; + const name = data[0].trace._input.name; + const task = data[0].trace._input.task; + const originalColor = data[0].trace._input.originalColor; + const colorKey2 = this.generateColorKey(name, task, colorKey); + this.store.dispatch(showColorPicker({ + top: event.y, + left: event.x, + theme: 'light', + defaultColor: normalizeColorToString(this.colorHash.initColor(colorKey2, originalColor)), + cacheKey: colorKey2, + alpha: null + })); + event.stopPropagation(); + }); + + select(this.plotlyContainer.nativeElement) + .selectAll('.traces .legendtoggle') + .append('title') + .text((data, i) => (this.chart.data[i] as any).fullName ?? data[0].trace.name); } @@ -979,7 +996,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { height: '100%', maxHeight: 'auto', width: '100%', - maxWidth: 'auto' + maxWidth: this.maximizeClicked.observed ? '100%' : 'auto' }).beforeClosed().subscribe(() => this.maximizeClicked.emit()); }); } @@ -992,7 +1009,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { if (!name) { return name; } - return name + ((iter || (this.graphsNumber > 1 && iter === 0)) ? ` - Iteration ${iter}` : ''); + return name + ((iter || (this.graphsNumber > 1 && iter === 0)) && !name.includes('(iteration') ? ` - Iteration ${iter}` : ''); } public repositionModeBar(singleGraphEl) { diff --git a/src/app/webapp-common/shared/single-graph/single-graph.module.ts b/src/app/webapp-common/shared/single-graph/single-graph.module.ts index d42ca39a..a7476354 100644 --- a/src/app/webapp-common/shared/single-graph/single-graph.module.ts +++ b/src/app/webapp-common/shared/single-graph/single-graph.module.ts @@ -11,6 +11,8 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {TagListComponent} from '@common/shared/ui-components/tags/tag-list/tag-list.component'; import {ChooseColorModule} from '@common/shared/ui-components/directives/choose-color/choose-color.module'; import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; +import {PushPipe} from '@ngrx/component'; + @@ -27,7 +29,8 @@ import {ShowTooltipIfEllipsisDirective} from '@common/shared/ui-components/indic MatProgressSpinnerModule, TagListComponent, ChooseColorModule, - ShowTooltipIfEllipsisDirective + ShowTooltipIfEllipsisDirective, + PushPipe, ] }) export class SingleGraphModule { } diff --git a/src/app/webapp-common/shared/ui-components/buttons/chips-list/chips-list.component.html b/src/app/webapp-common/shared/ui-components/buttons/chips-list/chips-list.component.html index 2ff700f8..2c382bcc 100644 --- a/src/app/webapp-common/shared/ui-components/buttons/chips-list/chips-list.component.html +++ b/src/app/webapp-common/shared/ui-components/buttons/chips-list/chips-list.component.html @@ -1,6 +1,10 @@ - -
- +{{hiddenLabels.length}} -
+@for (label of items; track $index) { + +} +@if (hiddenLabels.length > 0) { +
+ +{{hiddenLabels.length}} +
+} diff --git a/src/app/webapp-common/shared/ui-components/buttons/chips-list/chips-list.component.ts b/src/app/webapp-common/shared/ui-components/buttons/chips-list/chips-list.component.ts index 2d4603b4..0bfbf52f 100644 --- a/src/app/webapp-common/shared/ui-components/buttons/chips-list/chips-list.component.ts +++ b/src/app/webapp-common/shared/ui-components/buttons/chips-list/chips-list.component.ts @@ -3,7 +3,7 @@ import {ChipsComponent} from '@common/shared/ui-components/buttons/chips/chips.c import {trackByIndex} from '@common/shared/utils/forms-track-by'; import {Subscription} from 'rxjs'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; -import {NgForOf, NgIf} from '@angular/common'; + @Component({ selector: 'sm-chips-list', @@ -13,10 +13,8 @@ import {NgForOf, NgIf} from '@angular/common'; standalone: true, imports: [ ChipsComponent, - TooltipDirective, - NgForOf, - NgIf - ] + TooltipDirective +] }) export class ChipsListComponent implements AfterViewInit, OnDestroy { diff --git a/src/app/webapp-common/shared/ui-components/buttons/chips/chips.component.html b/src/app/webapp-common/shared/ui-components/buttons/chips/chips.component.html index 32e425be..3ef39330 100755 --- a/src/app/webapp-common/shared/ui-components/buttons/chips/chips.component.html +++ b/src/app/webapp-common/shared/ui-components/buttons/chips/chips.component.html @@ -1,26 +1,31 @@ -
- - - + + @if (!colorIsForced) { + + - + + + } + {{label}} + @if (allowRemove) { + + + + } - {{label}} - - - - -
+
+} diff --git a/src/app/webapp-common/shared/ui-components/buttons/chips/chips.component.ts b/src/app/webapp-common/shared/ui-components/buttons/chips/chips.component.ts index 3f7ed56b..f675837a 100755 --- a/src/app/webapp-common/shared/ui-components/buttons/chips/chips.component.ts +++ b/src/app/webapp-common/shared/ui-components/buttons/chips/chips.component.ts @@ -6,8 +6,10 @@ import {Subscription} from 'rxjs'; import {getCssTheme} from '../../../utils/shared-utils'; import {invertRgb} from '../../../services/color-hash/color-hash.utils'; import { TinyColor, mostReadable } from '@ctrl/tinycolor'; -import {NgIf} from '@angular/common'; + import {ChooseColorModule} from '@common/shared/ui-components/directives/choose-color/choose-color.module'; +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'; @Component({ selector: 'sm-chips', @@ -16,9 +18,10 @@ import {ChooseColorModule} from '@common/shared/ui-components/directives/choose- changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - NgIf, - ChooseColorModule - ] + ChooseColorModule, + TooltipDirective, + ShowTooltipIfEllipsisDirective +] }) export class ChipsComponent implements OnInit, OnDestroy { diff --git a/src/app/webapp-common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component.html b/src/app/webapp-common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component.html index e8e2c2f8..845332e3 100644 --- a/src/app/webapp-common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component.html +++ b/src/app/webapp-common/shared/ui-components/data/grouped-checked-filter-list/grouped-checked-filter-list.component.html @@ -1,28 +1,45 @@ -
{{ titleText }}
- -@if (itemsList && Object.keys(itemsList)?.length === 0) { -
No data to show
-} +
{{ titleText() }}
+
- @if (selectedItemsList?.length > 0) { -
Clear Selection
+ @if (selectedItemsList()?.length > 0) { + Clear Selection }
+@if (itemsList() && Object.keys(itemsList())?.length === 0) { +
No data to show
+}
- - -
- {{ renameMap[category.key] || category.key }} -
- - -
- -
{{ item.value }}
- -
- - + @for (category of (itemsObjectListFiltered() | keyvalue: compareByKey); track category.key) { + + +
+ {{ renameMap[category.key] || category.key }} +
+ @if ((category.value | filterOut: 'checked': false).length > 0) { + + } + + + @for (item of category.value; track item.value) { +
+ +
{{ item.value }}
+ +
+ } + + + }
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 778cad9a..3fbbc506 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,4 +1,4 @@ -@import '../../styles/variables'; +@import 'variables'; :host { display: flex; @@ -33,11 +33,6 @@ color: $purple; } } - - .mat-content { - padding-left: 5px; - } - } .mat-expansion-panel { @@ -74,21 +69,29 @@ align-items: center; padding: 30px 24px 6px 0; font-size: 12px; - color: $blue-480; + height: 36px; } .list { flex: 1; overflow: scroll; - padding-right: 12px; + padding-right: 24px; mat-expansion-panel { box-shadow: none; border-radius: 0; mat-expansion-panel-header { - padding: 0 2px 0 0; - + padding: 0; + + .has-selected { + margin: 0 24px 0 auto; + background-color: $purple; + width: 6px; + height: 6px; + border-radius: 6px; + align-self: center; + } } } @@ -98,10 +101,7 @@ overflow: hidden; white-space: nowrap; display: inline-block; - - &:hover { - color: $purple; - } + max-width: calc(100% - 42px); } mat-expansion-panel-header { @@ -116,7 +116,7 @@ display: flex; align-items: center; height: 32px; - padding: 0 16px; + padding: 0 6px; margin-right: 4px; border-radius: 4px; font-family: $font-family-base, sans-serif; @@ -149,6 +149,6 @@ :host-context(.hyper-params-custom-col) { .actions, .list { - padding-left: 12px; + padding-left: 24px; } } 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 2c105862..4d21f3dd 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 @@ -1,8 +1,8 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, Output} from '@angular/core'; +import {ChangeDetectionStrategy, Component, computed, effect, input, output, signal} from '@angular/core'; 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, NgForOf, NgIf} from '@angular/common'; +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'; @@ -12,6 +12,8 @@ import {ClickStopPropagationDirective} from '@common/shared/ui-components/direct import { ShowTooltipIfEllipsisDirective } from '@common/shared/ui-components/indicators/tooltip/show-tooltip-if-ellipsis.directive'; +import {FilterOutPipe} from '@common/shared/pipes/filterOut.pipe'; +import {decodeURIComponentSafe} from '@common/shared/utils/tableParamEncode'; export type HyperParams = ReadonlyMap; @@ -24,107 +26,112 @@ export type HyperParams = ReadonlyMap; imports: [ SearchComponent, MatExpansionModule, - NgForOf, KeyValuePipe, AdvancedFilterPipe, TooltipDirective, FilterPipe, MatCheckboxModule, MatRadioModule, - NgIf, ClickStopPropagationDirective, ShowTooltipIfEllipsisDirective, + FilterOutPipe ] }) export class GroupedCheckedFilterListComponent { renameMap = {_legacy: 'General'}; - - public expanded = {}; - public searchText: string; - public itemsObjectList: HyperParams<{ checked: boolean; value: string }>; - public selectionLimitReached: boolean; - - @Input() limitSelection = 9999; - @Input() titleText: string; - @Input() placeholderText: string; - @Input() single = false; - - @Input() selectedItemsListMapper = (data) => decodeURIComponent(data.id); - @Input() selectedItemsListPrefix = 'hyperparams.'; - private _itemsList; - private _selectedItemsList: string[]; - - @Input() set selectedItemsList(selectedItemsList: any[]) { - this._selectedItemsList = selectedItemsList; - if (selectedItemsList && this.itemsList) { - this.itemsObjectList = this.getItemsObjectList(this.itemsList); + private debounceTimer: number; + + public expanded = signal<{ string: boolean }>({} as { string: boolean }); + public searchText = signal(''); + public itemsObjectListFiltered = signal>(null); + + limitSelection = input(9999); + titleText = input(); + placeholderText = input(); + single = input(false); + selectedItemsList = input(null); + itemsList = input>>(null); + selectedItemsListMapper = input((data) => decodeURIComponentSafe(data.id)); + selectedItemsListPrefix = input('hyperparams.'); + filterItemsLabel = input(); + selectFilteredItems = input(); + + selectedItems = output<{ + param: string; + value: unknown; + }>(); + clearSelection = output(); + hideFilteredItems = output(); + + itemsObjectList = computed(() => { + if (this.itemsList() && this.selectedItemsList()) { + return this.getItemsObjectList(this.itemsList()); } - this.selectionLimitReached = selectedItemsList && (Object.values(selectedItemsList) as any).flat().length >= this.limitSelection; - } - - get selectedItemsList() { - return this._selectedItemsList; - } + return {} as HyperParams<{ checked: boolean; value: string }>; + }); - @Input() filterItemsLabel: string; - @Input() selectFilteredItems: boolean; + selectionLimitReached = computed(() => + this.selectedItemsList() && (Object.values(this.selectedItemsList())).flat().length >= this.limitSelection()); - @Input() set itemsList(itemsList: { [section: string]: any }) { - this._itemsList = itemsList; - if (this.selectedItemsList && itemsList) { - this.itemsObjectList = this.getItemsObjectList(itemsList); + itemsObjectListFilteredEffect = effect(() => { + if (this.itemsObjectList()) { + this.searchQ(this.searchText(), 0); } - } - - get itemsList() { - return this._itemsList; - } + }, {allowSignalWrites: true}); - private getItemsObjectList = (itemsList: { [section: string]: any }) => + private getItemsObjectList = (itemsList: Record>) => Object.entries(itemsList).reduce((acc, [section, params]) => { - acc[section] = Object.entries(params).map(([paramKey,]) => { - const search = `${this.selectedItemsListPrefix}${section}.${paramKey}`; + acc[section] = Object.entries(params).map(([paramKey]) => { + const search = `${this.selectedItemsListPrefix()}${section}.${paramKey}`; return { value: paramKey, - checked: this.selectedItemsList.map(this.selectedItemsListMapper).includes(search) + checked: this.selectedItemsList().map(this.selectedItemsListMapper()).includes(search) }; }); return acc; }, {}) as HyperParams<{ checked: boolean; value: string }>; - @Output() selectedItems = new EventEmitter<{ param: string; value: any }>(); - @Output() clearSelection = new EventEmitter(); - @Output() hideFilteredItems = new EventEmitter(); - - constructor(private changeDetectorRef: ChangeDetectorRef) { - } - public toggleParamToDisplay(category: string, param: string, value: boolean) { - this.selectedItems.emit({value, + this.selectedItems.emit({ + value, param: `${category.replaceAll('.', '%2E')}.${param?.replaceAll('.', '%2E')}` }); } - public searchQ(value) { - this.searchText = value; - this.changeDetectorRef.detectChanges(); - + public searchQ(searchQuery: string, debounceTime = 275) { + window.clearTimeout(this.debounceTimer); + this.debounceTimer = window.setTimeout(() => { + this.itemsObjectListFiltered.set(Object.entries(this.itemsObjectList()).reduce((acc, [key, val]) => { + const query = searchQuery.toLowerCase(); + const groupFound = key.toLowerCase().includes(query); + const listFiltered = val.filter(item => item.value.toLowerCase().includes(query)); + if (groupFound && listFiltered.length === 0) { + acc[key] = val; + } else if (listFiltered.length > 0) { + acc[key] = listFiltered; + } + return acc; + }, {} as HyperParams<{ checked: boolean; value: string }>)); + if (searchQuery) { + this.expanded.set(Object.keys(this.itemsObjectListFiltered()).reduce((acc, group) => { + acc[group] = true; + return acc; + }, {} as { string: boolean })); + } + this.searchText.set(searchQuery); + }, debounceTime); } onClearSelection() { this.clearSelection.emit(); } - trackByKeyFn = (index, item) => item.key; - - trackByValFn = (index, item) => item.value; - compareByKey = compareByFieldFunc('key'); toggleExpand(name) { - this.expanded[name] = !this.expanded[name]; + this.expanded.update(exp => ({...exp, name: !this.expanded()[name]})); } protected readonly Object = Object; 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 1ea79805..8ff88fec 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 @@ -4,12 +4,13 @@ {{ node.name }} + class=" al-icon sm" + [class]="(node.parent ? (node.parent + node.name | stringIncludedInArray: checkedList()) : checkedList().includes(node.name)) ? checkIcon[0] : checkIcon[1]"> @@ -17,12 +18,13 @@ + [class.unchecked]="!(node.children | arrayIncludedInArray:checkedList())"> {{ node.name }} + class=" al-icon sm" + [class]="(node.children | arrayIncludedInArray:checkedList())? checkIcon[0] : checkIcon[1]"> 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 387ca8cf..655da48f 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 @@ -2,7 +2,7 @@ :host { display: block; - padding: 0 10px 0 24px; + padding: 0 24px; margin: 0; overflow: scroll; } @@ -67,7 +67,7 @@ mat-tree-node:hover .al-ico-hide { font-size: 12px; border-radius: 4px; line-height: 32px; - padding: 0 4px; + padding: 0 4px 0 12px; &:hover { background-color: $blue-50; 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 c61d25c2..39770dfd 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,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@angular/core'; +import {ChangeDetectionStrategy, Component, effect, EventEmitter, input, Output} from '@angular/core'; import {GroupedList} from '@common/tasks/tasks.model'; import {JsonPipe, KeyValuePipe, NgForOf} from '@angular/common'; @@ -15,20 +15,14 @@ import {StringStartsWithInArrayPipe} from '@common/shared/pipes/string-starts-wi interface GroupItem { data: GroupItem; name: string; - visible: boolean; hasChildren: boolean; children: string[]; parent: string; lastChild: boolean; } -export interface GroupedVisibleList { - [metric: string]: GroupItem; -} - interface ExampleFlatNode { expandable: boolean; - visible: boolean; name: string; parent: string; level: number; @@ -57,31 +51,12 @@ interface ExampleFlatNode { ] }) export class GroupedSelectableListComponent { - private _list: GroupedList; - public showList: GroupedVisibleList; checkIcon: string[] = ['al-ico-show', 'al-ico-hide']; - @Input() searchTerm: string; - - @Input() set list(list) { - this._list = list; - if (this.checkedList) { - this.dataSource.data = this.buildingNestedList(); - } else { - setTimeout(() => this.dataSource.data = this.buildingNestedList()) - } - if (this.searchTerm) { - this.treeControl.expandAll(); - } else { - this.treeControl.collapseAll(); - } - } + searchTerm = input(); + list = input(); + checkedList = input(); - get list() { - return this._list; - } - - @Input() checkedList: Array @Output() itemSelect = new EventEmitter(); @Output() itemCheck = new EventEmitter<{ pathString: string; parent: string }>(); @Output() groupChecked = new EventEmitter<{ key: string; hide: boolean }>(); @@ -113,14 +88,29 @@ export class GroupedSelectableListComponent { hasChild = (_: number, node: ExampleFlatNode) => node.expandable; + constructor() { + effect(() => { + if (this.list()) { + this.dataSource.data = this.buildingNestedList(); + } + }); + + effect(() => { + if (this.searchTerm()) { + this.treeControl.expandAll(); + } else { + this.treeControl.collapseAll(); + } + }); + } + private buildingNestedList() { - return Object.entries(this.list).map(([parent, children]) => ({ + return Object.entries(this.list()).map(([parent, children]) => ({ data: Object.keys(children).reduce((acc, child, i) => { acc[child] = { name: child, parent, data: children[child], - visible: this.checkedList.includes(parent + child), hasChildren: false, lastChild: Object.keys(children).length - 1 === i, children: [] @@ -129,7 +119,6 @@ export class GroupedSelectableListComponent { }, {} as GroupItem), name: parent, parent: '', - visible: this.checkedList.some(item => item.startsWith(parent)), hasChildren: Object.keys(children).length > 0, children: [parent, ...Object.keys(children).map(child => parent + child)] }) as GroupItem); @@ -137,7 +126,7 @@ export class GroupedSelectableListComponent { 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); + return parent.expandable ? children.some(child => this.checkedList().includes(parent.name + child.name)) : this.checkedList().includes(parent.name); } groupCheck(node: ExampleFlatNode) { diff --git a/src/app/webapp-common/shared/ui-components/data/labeled-row/labeled-row.component.scss b/src/app/webapp-common/shared/ui-components/data/labeled-row/labeled-row.component.scss index 6db89a44..a130489a 100755 --- a/src/app/webapp-common/shared/ui-components/data/labeled-row/labeled-row.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/labeled-row/labeled-row.component.scss @@ -27,6 +27,9 @@ .labeled-row { border-bottom: 1px solid $blue-500; } + .label-container { + color: $blue-300; + } } :host-context(.light-theme) { 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 index 6728953f..3a37b89d 100644 --- 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 @@ -15,6 +15,7 @@ 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 index 09cf09cf..33c19cb6 100644 --- 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 @@ -33,6 +33,7 @@ export class SelectableFilterListComponent { @Input() placeholder: string = 'Search'; @Input() titleLabel: string; @Input() checkAllIcon: string; + @Input() theme: 'light' | 'dark' = 'light'; @Output() itemSelect = new EventEmitter(); @Output() hiddenChanged = new EventEmitter>(); @Output() searchTermChanged = new EventEmitter(); 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 57b07b48..32d5072a 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 @@ -1,8 +1,8 @@
- {{titleLabel}} + {{titleLabel()}}
- {{checkedList?.length === 0 ? 'Show all' : 'Hide all'}} + {{checkedList()?.length === 0 ? 'Show all' : 'Hide all'}}
- +> diff --git a/src/app/webapp-common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component.ts b/src/app/webapp-common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component.ts index e4f63ac1..102dd397 100644 --- a/src/app/webapp-common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component.ts @@ -1,5 +1,4 @@ -import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@angular/core'; -import {isEqual} from 'lodash-es'; +import {ChangeDetectionStrategy, Component, computed, EventEmitter, input, Output} from '@angular/core'; import {GroupedList} from '@common/tasks/tasks.model'; import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; import {SearchComponent} from '@common/shared/ui-components/inputs/search/search.component'; @@ -33,41 +32,19 @@ export const buildMetricsList = (metrics: MetricVariantResult[]): GroupedList => ] }) export class SelectableGroupedFilterListComponent { - private _searchTerm: string; - private _list: GroupedList; - public filteredList: GroupedList; - public searchText: string; - @Input() set list(list: GroupedList) { - if (!isEqual(this._list, list)) { - this.hideChildrenForHiddenParent(list); - } - this._list = list; - this.filteredList = this.filterList(list, this.searchTerm); - } - - get list() { - return this._list; - } - - @Input() set searchTerm(searchTerm: string) { - this.filteredList = this.list ? this.filterList(this.list, searchTerm) : []; - this._searchTerm = searchTerm; - } - - get searchTerm() { - return this._searchTerm; - } + list = input(); + searchTerm = input(); + checkedList = input([]); + titleLabel = input(); - @Input() checkedList: Array = []; - @Input() titleLabel: string; - @Input() checkAllIcon: string; @Output() itemSelect = new EventEmitter(); @Output() hiddenChanged = new EventEmitter(); @Output() searchTermChanged = new EventEmitter(); + filteredList = computed(() => this.filterList(this.list(), this.searchTerm())) - filterList(list, searchTerm) { + filterList(list: GroupedList, searchTerm: string) { if (!searchTerm || searchTerm === '') { return list; } else { @@ -91,43 +68,49 @@ export class SelectableGroupedFilterListComponent { } } - private hideChildrenForHiddenParent(list: GroupedList) { - const newHiddenList = this.checkedList ? [...this.checkedList] : []; - let hiddenListChanged = false; - Object.entries(list).forEach(([parent, children]) => { - if (this.checkedList?.includes(parent) && Object.keys(children).length > 0) { - hiddenListChanged = true; - Array.prototype.push.apply(newHiddenList, (Object.keys(children).map(child => parent + child))); - } - }); - if (hiddenListChanged) { - this.hiddenChanged.emit(Array.from(new Set(newHiddenList))); - } - } + // private hideChildrenForHiddenParent(list: GroupedList) { + // let newCheckList = this.checkedList() ? [...this.checkedList()] : []; + // let hiddenListChanged = false; + // Object.entries(list).forEach(([parent, children]) => { + // if (!this.checkedList()?.includes(parent)) { + // hiddenListChanged = true; + // const remove = Object.keys(children).map(child => parent + child) + // newCheckList = newCheckList.filter(item => !remove.includes(item)) + // } + // }); + // if (hiddenListChanged) { + // this.hiddenChanged.emit(Array.from(new Set(newCheckList))); + // } + // } onSearchTermChanged(value: string) { - this.searchText = value; this.searchTermChanged.emit(value); } public toggleHide({pathString, parent}) { - let newHiddenList = this.checkedList.includes(pathString) ? this.checkedList.filter(i => i !== pathString) : [...this.checkedList, pathString]; - newHiddenList = this.AreAllChildrenHidden(parent, newHiddenList) ? [...newHiddenList, parent] : newHiddenList.filter(i => i !== parent); - this.hiddenChanged.emit(newHiddenList); + 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 { + if (!newCheckedList.includes(parent)) { + newCheckedList = [...newCheckedList, parent]; + } + } + this.hiddenChanged.emit(newCheckedList); } - private AreAllChildrenHidden(parent, newHiddenList: any[]) { - return Object.keys(this.list[parent]).every(item => newHiddenList.includes(parent + item)); + private shouldHidePrent(parent: string, checkedList: string[]) { + return !Object.keys(this.list()[parent]).some(item => checkedList.includes(parent + item)); } 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 => { + Object.keys(this.list()).forEach(key => { allValues.push(key); - Object.keys(this.list[key]).forEach(itemKey => { + Object.keys(this.list()[key]).forEach(itemKey => { allValues.push(key + itemKey); }); }); @@ -137,18 +120,19 @@ 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 => { + Object.keys(this.list()[key]).forEach(itemKey => { const keyItemKey = key + itemKey; if (!allValues.includes(keyItemKey)) { allValues.push(keyItemKey); } }); } else { - allValues = allValues.filter(i => !i.startsWith(key)); - Object.keys(this.list[key]).forEach(itemKey => { + const parentKey = `${key} / ` + allValues = allValues.filter(i => !i.startsWith(parentKey) && i !== key); + Object.keys(this.list()[key]).forEach(itemKey => { const keyItemKey = key + itemKey; if (allValues.includes(keyItemKey)) { allValues = allValues.filter(longKey => longKey !== (keyItemKey)); 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 index adba31e9..2119642d 100644 --- 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 @@ -1,11 +1,12 @@ -
    -
  • -
    {{item.value}}
    - -
    • +
      + @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 index 447863a8..ea98fdad 100644 --- 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 @@ -40,8 +40,14 @@ i.icon { } } + &.dark { + .item:hover { + background-color: $blue-600; + } + } } .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 index e9071ad0..3c002b7a 100644 --- 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 @@ -2,14 +2,10 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, - EventEmitter, - Input, - OnChanges, - Output, - SimpleChanges + inject, input, output, computed } from '@angular/core'; import {SelectableListItem} from './selectable-list.model'; -import {NgForOf} from '@angular/common'; + import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; @Component({ @@ -19,27 +15,18 @@ import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/ changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - NgForOf, TooltipDirective ] }) -export class SelectableListComponent implements OnChanges{ - public showList: SelectableListItem[] = []; - - @Input() list: SelectableListItem[] = []; - @Input() checkedList: string[]; - @Input() checkIcon: string[] = ['al-ico-show', 'al-ico-hide']; - @Output() onItemSelect = new EventEmitter(); - @Output() onItemCheck = new EventEmitter(); - - constructor(private cdr: ChangeDetectorRef) {} +export class SelectableListComponent { + private cdr = inject(ChangeDetectorRef); - ngOnChanges(changes: SimpleChanges): void { - if ((changes.list || changes.checkedList)) { - this.showList = this.list.map(item => ({...item, visible: this.checkedList?.includes(item.name) } as SelectableListItem)); - this.cdr.detectChanges(); - } - } + list = input([]); + checkedList = input(); + checkIcon = input(['al-ico-show', 'al-ico-hide']); + theme = input<'light' | 'dark'>('light'); + onItemSelect = output(); + onItemCheck = output(); - trackByValue = (index: number, item) => item.value; + 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/simple-table/simple-table.component.html b/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.html index 3499c9e1..44ce2044 100755 --- a/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.html +++ b/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.html @@ -1,23 +1,30 @@ -
    -
    {{col.header}}
    -
    -
    -
    +@if (!hideHeaders()) { +
    + @for (col of cols(); track col.header + $index) { +
    {{col.header}}
    + } +
    +} +
    + @for (row of rowsData(); track trackByFn(i, row); let i = $index) { +
    + [ngTemplateOutletContext]="{$implicit: cols()[i], row: row, rowIndex: i}"> -
    -
    - {{ noDataMessage || 'No data to show'}} -
    +
    + } + @if (!rowsData()?.length) { +
    + {{ noDataMessage() || 'No data to show'}} +
    + }
    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 906b7906..717bcf72 100755 --- 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 @@ -1,7 +1,7 @@ -import { Component, ContentChild, EventEmitter, Input, Output, TemplateRef } from '@angular/core'; +import {Component, ContentChild, TemplateRef, input, output} from '@angular/core'; import {CdkDrag, CdkDragDrop, CdkDropList} from '@angular/cdk/drag-drop'; -import {FormsTrackBy, trackById} from '../../../utils/forms-track-by'; -import {NgForOf, NgIf, NgTemplateOutlet} from '@angular/common'; +import {FormsTrackBy} from '../../../utils/forms-track-by'; +import { NgTemplateOutlet } from '@angular/common'; @Component({ selector: 'sm-simple-table-2', @@ -9,36 +9,37 @@ import {NgForOf, NgIf, NgTemplateOutlet} from '@angular/common'; styleUrls: ['./simple-table.component.scss'], standalone: true, imports: [ - NgIf, - NgForOf, CdkDropList, NgTemplateOutlet, CdkDrag - ] +] }) export class SimpleTableComponent extends FormsTrackBy { public open = []; - public trackById = trackById; get formData() { - return this.rowsData; + return this.rowsData(); } - @Input() rowsConfig: Array<{ collapsible: boolean }> = []; - @Input() rowsData: Array; - @Input() cols: { class: string; header: string; subHeader?: string }[]; - @Input() hideHeaders = false; - @Input() enableDragAndDrop = false; - @Input() noDataMessage: string; - @Output() entryDropped = new EventEmitter>(); + rowsConfig = input<{collapsible: boolean;}[]>([]); + rowsData = input(); + cols = input<{ + class: string; + header: string; + subHeader?: string; + }[]>(); + hideHeaders = input(false); + enableDragAndDrop = input(false); + noDataMessage = input(); + entryDropped = output>(); @ContentChild(TemplateRef) templateRef: TemplateRef; - isRowToggleable(rowIndex) { - return this.rowsConfig[rowIndex] && this.rowsConfig[rowIndex].collapsible; + isRowToggleable(rowIndex: number) { + return this.rowsConfig()[rowIndex] && this.rowsConfig()[rowIndex].collapsible; } - toggleRow(rowIndex) { + toggleRow(rowIndex: number) { if (this.isRowToggleable(rowIndex)) { this.open[rowIndex] = !this.open[rowIndex]; } diff --git a/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.html b/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.html index bf3cf068..696d7db3 100644 --- a/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.html +++ b/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.html @@ -1,10 +1,13 @@
    -
    - -
    + @if(!noSelection) { +
    + +
    + } @if(hasTypeIcon) {
    @@ -19,6 +22,7 @@
    +
    @if(tagsTemplate) { diff --git a/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.scss b/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.scss index d892bf0e..6ab7b4e0 100644 --- a/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.scss @@ -17,6 +17,13 @@ ". tags" ". data"; } + &.no-selection { + grid-template-columns: 1fr; + grid-template-areas: + "card-name" + "tags" + "data"; + } } .cbx { grid-area: cbx; margin-right: auto; } @@ -34,6 +41,10 @@ margin-top: 12px; } +.no-selection .data { + margin-top: 0; +} + .name-container { min-width: 0; 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 9055870a..3907159e 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 @@ -26,6 +26,7 @@ export class TableCardComponent { @Input() selected; @Input() checked: boolean; + @Input() noSelection = false; @Input() tagsTemplate: TemplateRef; @Input() compactColDataTemplate: TemplateRef; diff --git a/src/app/webapp-common/shared/ui-components/data/table-diff/table-diff.component.html b/src/app/webapp-common/shared/ui-components/data/table-diff/table-diff.component.html index f92895c0..7a30077c 100644 --- a/src/app/webapp-common/shared/ui-components/data/table-diff/table-diff.component.html +++ b/src/app/webapp-common/shared/ui-components/data/table-diff/table-diff.component.html @@ -2,14 +2,14 @@
    {{keyTitle}}
    {{valueTitle}} diff --git a/src/app/webapp-common/shared/ui-components/data/table-diff/table-diff.module.ts b/src/app/webapp-common/shared/ui-components/data/table-diff/table-diff.module.ts index d2f5ae0c..02512ee1 100644 --- a/src/app/webapp-common/shared/ui-components/data/table-diff/table-diff.module.ts +++ b/src/app/webapp-common/shared/ui-components/data/table-diff/table-diff.module.ts @@ -2,10 +2,11 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {TableDiffComponent} from './table-diff.component'; + @NgModule({ declarations: [TableDiffComponent], imports : [ - CommonModule + CommonModule, ], exports : [TableDiffComponent] }) diff --git a/src/app/webapp-common/shared/ui-components/data/table/base-table-view.ts b/src/app/webapp-common/shared/ui-components/data/table/base-table-view.ts index 14f994f1..08e2672a 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/base-table-view.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/base-table-view.ts @@ -20,14 +20,14 @@ export abstract class BaseTableView implements AfterViewInit, OnDestroy { public selectedEntitiesKey: string; public table: TableComponent<{id: string}>; public menuBackdrop: boolean; - public searchValues: { [colId: string]: string } = {}; - public filtersOptions: { [colId: string]: IOption[] } = {}; - public filtersValues: { [colId: string]: any } = {}; - public tableSortFieldsObject: { [fieldName: string]: { index: number; field: string; order: TableSortOrderEnum } } = {}; + public searchValues: Record = {}; + public filtersOptions: Record = {}; + public filtersValues: Record = {}; + public tableSortFieldsObject: Record = {}; protected prevSelected: string; protected prevDeselect: string; private _entityType: EntityTypeEnum; - public convertStatusMap: { [status: string]: string }; + public convertStatusMap: Record; protected waitForClick: number; @Input() contextMenuActive: boolean; @@ -76,6 +76,7 @@ export abstract class BaseTableView implements AfterViewInit, OnDestroy { @Output() filterChanged = new EventEmitter() as EventEmitter<{ col: ISmCol; value: any; andFilter?: boolean }>; @Output() columnsReordered = new EventEmitter(); @Output() cardsCollapsedChanged = new EventEmitter(); + @Output() closePanel = new EventEmitter(); @ViewChildren(TableComponent) tables: QueryList>; ngAfterViewInit(): void { @@ -191,8 +192,9 @@ export abstract class BaseTableView implements AfterViewInit, OnDestroy { afterTableInit() { const key = this.selectedEntitiesKey.slice(0, -1); - if (this[key]) { - window.setTimeout(() => this.table?.scrollToElement(this[key]), 200); + const selectedObject = this[key] || this[`${key}s`]?.[0]; + if (selectedObject) { + window.setTimeout(() => this.table?.scrollToElement(selectedObject), 200); } } @@ -201,4 +203,20 @@ export abstract class BaseTableView implements AfterViewInit, OnDestroy { ngOnDestroy(): void { this.table = null; } + + abstract openContextMenu(data: { e: Event; rowData; single?: boolean; backdrop?: boolean }); + + private clickDelayHandle: number; + cardClicked($event: MouseEvent, experiment) { + if (this.clickDelayHandle) { + window.clearTimeout(this.clickDelayHandle); + this.clickDelayHandle = null; + this.closePanel.emit() + } else { + this.clickDelayHandle = window.setTimeout(() => { + this.openContextMenu({e: $event, rowData: experiment, backdrop: true}); + this.clickDelayHandle = null; + }, 250) + } + } } diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter-template.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter-template.component.ts index 4a1beaf9..f672359e 100755 --- a/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter-template.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter-template.component.ts @@ -48,13 +48,13 @@ export class TableCardFilterTemplateComponent { protected loading = signal(false); - value = input<{[colId: string]: string[]}>({}); + value = input>({}); fixedOptionsSubheader = input(); subValue = input( []); subOptions = input([]); columns = input.required(); - options = input.required<{[col: string]: IOption[]}>(); - filterMatch = input<{ [colId: string]: string }>(); + options = input.required>(); + filterMatch = input>(); protected isFiltering = computed(() => (this.value() && Object.values(this.value()).some(options => options?.length > 0)) || this.subValue()?.length > 0 @@ -124,7 +124,7 @@ export class TableCardFilterTemplateComponent { } loadMore() { - window.setTimeout(() => this.pageNumber.set(this.pageNumber() + 1), 300); + window.setTimeout(() => this.pageNumber.update(num => num + 1), 300); this.loading.set(true); } } 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 eeb78adc..8a13e323 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 @@ -9,7 +9,7 @@ import { } from '../table-duration-sort-base.component'; import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms'; import {distinctUntilChanged, debounceTime, filter} from 'rxjs/operators'; -import {isNil} from 'lodash-es'; +import {isEqual, isNil} from 'lodash-es'; import { TableFilterDurationErrorComponent } from '@common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-error/table-filter-duration-error.component'; @@ -59,7 +59,7 @@ export class TableFilterDurationNumericComponent extends TableDurationSortBaseCo takeUntilDestroyed(), debounceTime(500), filter(() => this.iterationsForm.valid), - distinctUntilChanged() + distinctUntilChanged((a, b) => isEqual(a, b)) ) .subscribe( ({greaterThan, lessThan}) => { !!greaterThan != this.greaterThan.checked && this.setCheckBox(!this.greaterThan.checked, 'greaterThan', false); diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.ts index de13fd26..d449a0e2 100755 --- a/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.ts @@ -53,7 +53,7 @@ export class TableFilterSortTemplateComponent { public formControl = new UntypedFormControl(); isSorted: boolean; - searching: boolean = true; + searching = true; private _value: string[]; public loading: boolean; @@ -66,7 +66,7 @@ export class TableFilterSortTemplateComponent { @Input() fixedOptionsSubheader; - @Input() set value(filters: Array) { + @Input() set value(filters: string[]) { this.loading = false; if (Array.isArray(filters)) { this.formControl.setValue(filters); @@ -94,8 +94,8 @@ export class TableFilterSortTemplateComponent { this.options()?.length < this.column().paginatedFilterPageSize || this.options()?.length === this.previousLength && this.searchValue() === this.previousSearchValue : this.paginatedOptions()?.length === this.options()?.length); - @Input() subOptions: Array<{ label: string; value: string }>; - @Input() tooltip: boolean = false; + @Input() subOptions: { label: string; value: string }[]; + @Input() tooltip = false; @Output() filterChanged = new EventEmitter(); @Output() subFilterChanged = new EventEmitter(); @Output() menuClosed = new EventEmitter(); @@ -163,7 +163,7 @@ export class TableFilterSortTemplateComponent { loadMore() { this.loading = true; - this.pageNumber.set(this.pageNumber() + 1); + this.pageNumber.update(num => num + 1); if (!this.column().asyncFilter) { window.setTimeout(() => this.loading = false, 300); } 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 dcbee886..8efb0e62 100755 --- 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 @@ -37,9 +37,14 @@
    - {{ noDataMessage }} + @if (!loading() && !noDataTemplate) { + No data to show + }
    + @if (!loading()) { + + }     @for (col of columns; track trackByColFn($index, col)) { - @switch (col?.headerType) { @case (colHeaderTypeEnum.sortFilter) { @@ -117,7 +125,7 @@ (dblclick)="!minView && checkClick({e: $event, data: rowData})"> @if (!minView) { @for (col of columns; track trackByColFn(i, col); let i = $index) { -
    -
    @@ -167,10 +175,10 @@
    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 c6c01f36..d6bc6b6c 100755 --- 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 @@ -13,6 +13,7 @@ import { OnInit, Output, QueryList, + signal, TemplateRef, TrackByFunction, ViewChild, @@ -37,7 +38,7 @@ import {Store} from '@ngrx/store'; import {selectScaleFactor} from '@common/core/reducers/view.reducer'; import {trackById} from '@common/shared/utils/forms-track-by'; import {sortCol} from '@common/shared/utils/sortCol'; -import {mkConfig, download, generateCsv} from 'export-to-csv'; +import {mkConfig, download, generateCsv, asString} from 'export-to-csv'; import {prepareColsForDownload} from '@common/shared/utils/download'; import {NgTemplateOutlet} from '@angular/common'; import {ResizableColumnDirective} from '@common/shared/ui-components/data/table/resizable-column.directive'; @@ -85,7 +86,7 @@ export class TableComponent implements AfterContentIni private loadMoreDebouncer: Subject; public menuItems = [] as MenuItem[]; minView: boolean; - private _filters: { [s: string]: FilterMetadata }; + private _filters: Record; private readonly isChrome = navigator.userAgent.indexOf('Chrome') > -1; public lastRowExpanded: boolean; public noDataTop: number; @@ -97,10 +98,11 @@ export class TableComponent implements AfterContentIni loadButton: ElementRef; @ViewChildren('loadButton') loadButtons: QueryList>; @ViewChild('cm', {static: true}) menu: ContextMenu; + @ViewChild('noData', {static: true}) noData: TemplateRef; @ContentChildren(PrimeTemplate) templates: QueryList; private _tableData: D[]; private _columnsOrder: string[]; - public loading: boolean; + public loading = signal(true); private scaleFactor: number; private waiting: boolean; public scrollContainer: HTMLDivElement; @@ -113,9 +115,12 @@ export class TableComponent implements AfterContentIni @Input() expandRowOnClick = true; @Input() initialColumns; private waitForClick: number; + private allColumns: ISmCol[]; @Input() set tableData(tableData: D[]) { - this.loading = false; + if (tableData) { + this.loading.set(false); + } this.rowsNumber = tableData ? tableData.length : 0; this._tableData = tableData; } @@ -138,6 +143,7 @@ export class TableComponent implements AfterContentIni @Input() set columns(columns: ISmCol[]) { if (columns?.length > 0) { this._columns = columns.filter(col => !col.hidden); + this.allColumns = columns; this.orderColumns(); this.resize(); } @@ -166,7 +172,7 @@ export class TableComponent implements AfterContentIni @Input() rowHover: boolean; @Input() noHeader = false; @Input() simple = false; - @Input() expandedRowKeys: { [s: string]: boolean } = {}; + @Input() expandedRowKeys: Record = {}; @Input() rowExpandMode: 'multiple' | 'single' = 'multiple'; @Input() cardsCollapsed = false; @@ -179,7 +185,7 @@ export class TableComponent implements AfterContentIni this.calcResize(); } - @Input() set filters(filters: { [s: string]: FilterMetadata }) { + @Input() set filters(filters: Record) { this._filters = filters; if (!this.minView) { this.table.filters = filters; @@ -190,7 +196,7 @@ export class TableComponent implements AfterContentIni } } - @Input() noDataMessage = 'No data to show'; + @Input() noDataTemplate: TemplateRef; @Input() checkedItems = []; @Input() virtualScroll: boolean; @Input() virtualScrollOptions: ScrollerOptions = {}; @@ -481,7 +487,7 @@ export class TableComponent implements AfterContentIni } loadMore() { - this.loading = true; + this.loading.set(true); if (this.autoLoadMore) { this.loadMoreClicked.emit(); } else { @@ -559,7 +565,7 @@ export class TableComponent implements AfterContentIni }); } - get sortableCols(): Array { + get sortableCols(): ISmCol[] { return (this.initialColumns || this.columns).filter(col => col.sortable); } @@ -589,6 +595,22 @@ export class TableComponent implements AfterContentIni this.lastRowExpanded = expanded && expandedIndex === this.rowsNumber - 1; } + getTableCopy() { + const colsOrder = this.columnsOrder ?? this.columns.map(col => col.id); + const sortedAllColumns = colsOrder.map(sortCol => this.allColumns.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 csvConfig = mkConfig({useKeysAsHeaders: true}); + return asString(generateCsv(csvConfig)(rows)); + } + downloadTableAsCSV(tableName?: string) { const options = mkConfig({ @@ -596,7 +618,10 @@ export class TableComponent implements AfterContentIni showColumnHeaders: true, }); - const downloadCols = prepareColsForDownload(this.columns); + const colsOrder = this.columnsOrder ?? this.columns.map(col => col.id); + const sortedAllColumns = colsOrder.map(sortCol => this.allColumns.find(col => col.id === sortCol)).filter(col => !!col); + const rest = this.allColumns.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) => { diff --git a/src/app/webapp-common/shared/ui-components/data/table/table.consts.ts b/src/app/webapp-common/shared/ui-components/data/table/table.consts.ts index e0f51896..4ac33414 100755 --- a/src/app/webapp-common/shared/ui-components/data/table/table.consts.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table.consts.ts @@ -26,6 +26,7 @@ export interface ISmCol { header?: string; // the title header. label?: string; // Labels to show in cards mode.. hidden?: boolean; // the column visibility. + includeInDownload?: boolean; frozen?: boolean; headerType?: ColHeaderTypeEnum; filterType?: ColHeaderFilterTypeEnum; 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 04eb7c46..8c1f5c74 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 @@ -74,15 +74,3 @@ export class ChooseColorDirective { } -export const attachColorChooser = (text: string, buttonElement: Element, colorHash: ColorHashService, store: Store, withAlpha?: boolean, orgColor?: number[]) => { - const directive = new ChooseColorDirective(new ElementRef(buttonElement), store); - directive.colorButtonRef = new ElementRef(buttonElement); - directive.stringToColor = text; - directive.colorPickerWithAlpha = withAlpha; - const listener = (e: MouseEvent) => { - directive.smChooseColor = colorHash.initColor(text, orgColor); - directive.openColorPicker(e); - }; - buttonElement.removeEventListener('click', listener); - buttonElement.addEventListener('click', listener); -}; 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 d2a48b3a..476c4cb5 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 @@ -7,6 +7,7 @@ import {StoreModule} from '@ngrx/store'; import {colorPreferenceReducer} from './choose-color.reducer'; + export const colorSyncedKeys = [ 'colorPreferences', ]; @@ -25,7 +26,7 @@ const _declarations = [ CommonModule, ColorPickerModule, StoreModule.forFeature('colorsPreference', colorPreferenceReducer), - ], + ], exports : _declarations }) export class ChooseColorModule { diff --git a/src/app/webapp-common/shared/ui-components/directives/prevent-keys-by-numbers.directive.ts b/src/app/webapp-common/shared/ui-components/directives/prevent-keys-by-numbers.directive.ts new file mode 100644 index 00000000..1cf0fb96 --- /dev/null +++ b/src/app/webapp-common/shared/ui-components/directives/prevent-keys-by-numbers.directive.ts @@ -0,0 +1,19 @@ +import {Directive, HostListener, input} from '@angular/core'; + +@Directive({ + selector: '[smPreventKeysByNumbersDirective]', + standalone: true, +}) +export class PreventKeysByNumbersDirective { + keys = input([]) + @HostListener('keydown', ['$event']) + public onKeyDown(event: any): boolean { + if (this.keys().includes(event.which)) { + event.target.blur(); + return false; + } else { + return true; + } + + } +} diff --git a/src/app/webapp-common/shared/ui-components/directives/searchText.directive.ts b/src/app/webapp-common/shared/ui-components/directives/searchText.directive.ts index d797b6f6..c5a70890 100644 --- a/src/app/webapp-common/shared/ui-components/directives/searchText.directive.ts +++ b/src/app/webapp-common/shared/ui-components/directives/searchText.directive.ts @@ -32,12 +32,13 @@ export class SearchTextDirective implements AfterViewInit { const originalTerm = text.match(re)?.[0]; this.el.nativeElement.innerHTML = ''; if (originalTerm) { + const seperators = text.match(re); text.split(re).forEach((part, index, arr) => { this.renderer.appendChild(this.el.nativeElement, this.renderer.createText(part)); if (index < arr.length - 1) { const span = this.renderer.createElement('span'); this.renderer.addClass(span, this.highlightClass) - span.innerText = this.term; + span.innerText = seperators[index]; this.renderer.appendChild(this.el.nativeElement, span); } }); diff --git a/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.ts b/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.ts index 6393b228..58367291 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.ts @@ -23,6 +23,20 @@ export const presetColors = [ '#d5d728', ]; +export const presetColorsDark = [ + '#21a2da', // muted blue + '#ff7f0e', // safety orange + '#2ca02c', // cooked asparagus green + '#e65c5c', // brick red + '#9467bd', // muted purple + '#edd913', // curry yellow-green + '#cc796e', // chestnut brown + '#e377c2', // raspberry yogurt pink + '#7f7f7f', // middle gray + '#17becf', // blue-teal + '#f44778', + '#cbcd24', +]; @Component({ selector: 'sm-color-picker-wrapper', 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 436017aa..1b3f750f 100755 --- 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 @@ -142,6 +142,7 @@ $inline-edit-base-width: 93%; } .editable-pen { position: static; + margin-left: 12px; } } } 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 024cf260..12f68c0b 100755 --- 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 @@ -93,8 +93,8 @@ export class InlineEditComponent implements OnDestroy { return; } - const templateWidth = this.fixedWidth || Math.max(this.template.nativeElement.getBoundingClientRect().width - (this.multiline ? 0 : 120), 200); - this.renderer.setStyle(this.inlineInputRef.nativeElement, 'width', `${templateWidth}px`); + const templateWidth = this.fixedWidth || Math.max(this.template.nativeElement.getBoundingClientRect().width - (this.multiline ? 20 : 120), 200); + this.renderer.setStyle(this.inlineInputRef.nativeElement.parentElement, 'width', `${templateWidth}px`); this.inlineValue = this.originalText; event?.stopPropagation(); setTimeout(() => { 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 057b915b..75c90ff5 100755 --- 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 @@ -1,44 +1,50 @@ + + - - - + data-id="searchInputField" + #searchBar + [placeholder]="placeholder()" + (focusin)="focusInput(true)" + (focusout)="focusInput(false)" + (input)="onValueChange()" + (keydown)="onKeyDown($event)" + > + @if (!hideIcons() && searchBar.value.length === 0) { + + } @else { + + } - - - -
    - + +     + @if (enableNavigation()) { + @if (!searchResultsCount()) {
    -
    {{searchCounterIndex + 1}} of {{searchResultsCount}}
    + } + @if (searchResultsCount() > 0 && !empty) {
    - +
    {{searchCounterIndex() + 1}} of {{searchResultsCount()}}
    +
    + } + [class.disabled]="empty || searchCounterIndex() < 1" + (click)="findNext(true)"> - - - - + [class.disabled]="empty || searchCounterIndex() + 1 === searchResultsCount() || !searchResultsCount()" + (click)="findNext()"> + } + + + 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 179abd8f..a8b5447d 100755 --- 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 @@ -251,7 +251,7 @@ $search-font-size: 14px; :host-context(.hyper-params-custom-col) { .search-input-container { - margin: 0 12px; + margin: 0 24px; width: auto; } } 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 f87dd68f..fe734a0a 100755 --- 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,16 +1,15 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, - EventEmitter, - Input, OnChanges, OnDestroy, - OnInit, - Output, SimpleChanges, - ViewChild + OnInit, SimpleChanges, + ViewChild, input, output, effect, + inject } from '@angular/core'; import {Subject, Subscription, timer} from 'rxjs'; import {debounce, distinctUntilChanged, filter, tap} from 'rxjs/operators'; -import {NgIf} from '@angular/common'; +import {NgTemplateOutlet} from '@angular/common'; + @Component({ @@ -20,45 +19,46 @@ import {NgIf} from '@angular/common'; changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - NgIf + NgTemplateOutlet ] }) export class SearchComponent implements OnInit, OnChanges, OnDestroy { + private cdr = inject(ChangeDetectorRef); public value$ = new Subject(); - - @Input() minimumChars = 3; - @Input() debounceTime = 300; - @Input() placeholder: string = 'Type to search'; - @Input() hideIcons: boolean = false; - @Input() expandOnHover = false; - @Input() enableNavigation = false; - @Input() searchResultsCount = null; - @Input() searchCounterIndex = -1; public empty = true; - public active: boolean = true; - public countResults: number; + public active = true; public focused: boolean; private subs = new Subscription(); - @Input() set value(value: string) { - this.searchBarInput.nativeElement.value = value || ''; - } - - @Output() valueChanged = new EventEmitter(); + minimumChars = input(3); + debounceTime = input(300); + placeholder = input('Type to search'); + hideIcons = input(false); + expandOnHover = input(false); + enableNavigation = input(false); + searchResultsCount = input(null); + searchCounterIndex = input(-1); + value = input(''); + + valueChanged = output(); @ViewChild('searchBar', {static: true}) searchBarInput; - constructor(private readonly cdr: ChangeDetectorRef) {} + constructor() { + effect(() => { + this.searchBarInput.nativeElement.value = this.value() || ''; + }); + } ngOnInit(): void { this.subs.add(this.value$.pipe( tap((val: string) => this.empty = val?.length === 0), distinctUntilChanged(), - debounce((val: string) => val.length > 0 ? timer(this.debounceTime) : timer(0)), - filter(val => val.length >= this.minimumChars || val.length === 0) + debounce((val: string) => val.length > 0 ? timer(this.debounceTime()) : timer(0)), + filter(val => val.length >= this.minimumChars() || val.length === 0) ) .subscribe((value: string) => { - if (value.length >= this.minimumChars) { + if (value.length >= this.minimumChars()) { this.valueChanged.emit(value); } else { // in case user backspace all chars @@ -77,7 +77,7 @@ export class SearchComponent implements OnInit, OnChanges, OnDestroy { if (event.key === 'Escape' || event.key === 'Esc') { this.clear(); } else if (event.key === 'Enter' && - (!this.enableNavigation || (this.searchCounterIndex + 1 < this.searchResultsCount)) && + (!this.enableNavigation() || (this.searchCounterIndex() + 1 < this.searchResultsCount())) && this.searchBarInput.nativeElement.value.length > 0 ) { this.valueChanged.emit(this.searchBarInput.nativeElement.value); @@ -91,11 +91,13 @@ export class SearchComponent implements OnInit, OnChanges, OnDestroy { clear(focus = true) { this.value$.next(''); this.searchBarInput.nativeElement.value = ''; - focus && this.searchBarInput.nativeElement.focus(); + if (focus) { + this.searchBarInput.nativeElement.focus(); + } } updateActive(active: boolean) { - if (this.expandOnHover) { + if (this.expandOnHover()) { if (this.empty) { this.active = active; 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.html b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.html index 24e84c76..09bf0957 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.html +++ b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.html @@ -18,7 +18,7 @@ (onSelectionChange)= "customOptionSelected($event)" >"{{filterText}}" (Add item) } - @for (option of filteredItems(); track option) { + @for (option of filteredItems(); track option.label + $index) { {{option.label}} } 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 9373c065..1ed906e0 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 @@ -58,7 +58,7 @@ export class SelectAutocompleteForTemplateFormsComponent implements ControlValue isNewName = false; onChange: (any) => void; onTouch: () => void; - onValidate: () => void; + onValidate: (any) => void; protected control = new FormControl(); @@ -93,7 +93,7 @@ export class SelectAutocompleteForTemplateFormsComponent implements ControlValue const value = this.value(); this.onChange && this.onChange(this.control.value); this.onTouch && this.onTouch(); - this.onValidate && this.onValidate(); + this.onValidate && this.onValidate(this.value()); }); } diff --git a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.html b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.html index 01306b66..d77ec6f9 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.html +++ b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.html @@ -1,50 +1,57 @@ -
    - - + + + + @for (item of selected(); track item.value) { - - - + } + + + @if (!disabled()) { + + } - - "{{filterText}}"(Add item) - - - {{option.label}} - + @if (chipCtrl.value && isNewName$() && allowAddingOptions()) { + + "{{chipCtrl.value}}"(Add item) + + } + @for (option of filteredItems(); track option.label) { + + {{option.label}} + + }
    diff --git a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.scss b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.scss index 19acfab4..0b952dc5 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.scss +++ b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.scss @@ -7,7 +7,7 @@ height: 26px; } - ng-form, mat-form-field { +mat-form-field { display: block; } 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 444a485b..94f8c9eb 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 @@ -1,33 +1,29 @@ import { - AfterViewInit, ChangeDetectionStrategy, - Component, + Component, computed, effect, ElementRef, EventEmitter, - forwardRef, - Input, - OnDestroy, - Output, - ViewChild + forwardRef, input, + Output, signal, viewChild, } from '@angular/core'; -import {TemplateFormSectionBaseDirective} from '../../template-forms-ui/templateFormSectionBase'; -import {FormControl, FormsModule, NG_VALUE_ACCESSOR, ReactiveFormsModule} from '@angular/forms'; +import {ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR, ReactiveFormsModule} from '@angular/forms'; import {COMMA, ENTER} from '@angular/cdk/keycodes'; -import {filter, map, startWith} from 'rxjs/operators'; -import {Observable, fromEvent, Subscription} from 'rxjs'; -import {MatOptionModule, MatOptionSelectionChange} from '@angular/material/core'; +import {fromEvent, switchMap} from 'rxjs'; +import {filter} from 'rxjs/operators'; import { - MatAutocompleteModule, + MatAutocomplete, MatAutocompleteSelectedEvent, - MatAutocompleteTrigger + MatAutocompleteTrigger, MatOption } from '@angular/material/autocomplete'; -import {MatChipInputEvent, MatChipsModule} from '@angular/material/chips'; -import {MatFormFieldModule} from '@angular/material/form-field'; -import {AsyncPipe, NgFor, NgIf} from '@angular/common'; +import {MatChipGrid, MatChipInput, MatChipInputEvent} from '@angular/material/chips'; +import {MatFormField, MatSuffix} from '@angular/material/form-field'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; import {ChipsComponent} from '@common/shared/ui-components/buttons/chips/chips.component'; import {LabeledFormFieldDirective} from '@common/shared/directive/labeled-form-field.directive'; -import {isArray} from 'lodash-es'; +import {takeUntilDestroyed, toObservable, toSignal} from '@angular/core/rxjs-interop'; +import {MatOptionSelectionChange} from '@angular/material/core'; +import {computedPrevious} from 'ngxtension/computed-previous'; +import {isEqual} from 'lodash-es'; export interface IOption { @@ -47,155 +43,205 @@ export interface IOption { multi: true }], standalone: true, - imports: [FormsModule, NgIf, NgFor, AsyncPipe, MatChipsModule, MatOptionModule, MatFormFieldModule, MatAutocompleteModule, ClickStopPropagationDirective, ChipsComponent, LabeledFormFieldDirective, ReactiveFormsModule] + imports: [ClickStopPropagationDirective, ChipsComponent, LabeledFormFieldDirective, ReactiveFormsModule, MatChipGrid, + MatChipInput, MatAutocompleteTrigger, MatAutocomplete, MatOption, MatFormField, MatSuffix] }) -export class SelectAutocompleteWithChipsComponent extends TemplateFormSectionBaseDirective implements OnDestroy, AfterViewInit { - private _items: { label: string; value: string }[]; - private _focusIt: boolean; - public loading = true; - separatorKeysCodes: number[] = [ENTER, COMMA]; - filterText = ''; - isNewName = false; - public chipCtrl = new FormControl(null); - public filteredItems$: Observable<{ label: string; value: string }[]>; - private keyDownSub: Subscription; - - protected readonly trackByValue = (index: number, option: IOption) => option?.value ?? option; - - @Input() errorMsg: string; - @Input() multiple = true; - @Input() appearance: 'outline' | 'fill'; - @Input() name: string; - @Input() showSearchIcon = false; - @Input() formFieldClass: string; - @Output() customOptionAdded = new EventEmitter(); - @Input() override disabled = false; - @Input() clearable = true; - @Input() placeholder = ''; - @Input() optionAddable = false; - @Input() autofocus = false; - - @Input() set items(items: { label: string; value: string }[]) { - this.loading = false; - this._items = Array.isArray(items) ? items : [items]; - this.chipCtrl.setValue(null); - this.disabled ? this.chipCtrl.disable() : this.chipCtrl.enable(); - } +export class SelectAutocompleteWithChipsComponent implements ControlValueAccessor { - get items() { - return this._items || []; - } + onChange: (any) => void; + onTouched: () => void; - @Input() set focusIt(isFocus) { - if (isFocus && this.autofocus) { - this._focusIt = isFocus; - setTimeout(() => this.autocompleteInput.nativeElement.focus(), 50); + separatorKeysCodes: number[] = [ENTER, COMMA]; + public chipCtrl = new FormControl(null); + protected selected = signal(null); + private prevSelected = computedPrevious(this.selected); + + + multiple = input(true); + appearance = input<'outline' | 'fill'>('outline'); + name = input(); + formFieldClass = input(); + disabled = input(false); + clearable = input(true); + placeholder = input(''); + allowAddingOptions = input(false); + autofocus = input(false); + items = input([]); + focusIt = input(); + + protected autocompleteInput = viewChild>('autocompleteInput'); + autocomplete = viewChild(MatAutocompleteTrigger); + + protected valueChanged = toSignal(this.chipCtrl.valueChanges); + protected safeItems = computed(() => this.items() ? Array.isArray(this.items()) ? this.items() : [this.items()] as unknown as IOption[] : []); + protected loading = computed(() => !this.items()); + protected isNewName$ = computed(() => { + if (this.valueChanged() && typeof this.valueChanged() !== 'object') { + const value = this.valueChanged(); + const itemsLabels = this.safeItems()?.map(item => item.label) as string[] ?? []; + const selectedLabels = this.selected()?.map(item => item.label) as string[] ?? []; + return !itemsLabels.includes(value) && !selectedLabels.includes(value); } else { - this._focusIt = false; + return false } - } - - get focusIt() { - return this._focusIt; - } - - @ViewChild('autocompleteInput') autocompleteInput: ElementRef; - @ViewChild(MatAutocompleteTrigger) autocomplete: MatAutocompleteTrigger; - - override set value(val) { - super.value = !val || isArray(val) ? val : [val]; - } + }); + + protected filteredItems = computed(() => { + const value = this.valueChanged(); + const currLabels = this.selected()?.map(item => item.label) as string[] || []; + if (this.valueChanged() && typeof this.valueChanged() !== 'object') { + const filterValue = value?.toLowerCase(); + return this.safeItems().filter(item => + item.label?.toLowerCase().includes(filterValue) && !currLabels.includes(item.label) + ); + } else { + return this.safeItems().filter(item => !currLabels.includes(item.label)); + } + }); + private init = false; + + constructor() { + effect(() => { + const selection = this.selected(); + if (this.init && !isEqual(this.selected(), this.prevSelected())) { + if(this.onChange) { + this.onChange(selection); + } + if (this.onTouched) { + this.onTouched(); + } + } + }); + + effect(() => { + if (this.items()) { + this.chipCtrl.setValue(null); + } + }); + + effect(() => { + if (this.disabled()) { + this.chipCtrl.disable(); + } else { + this.chipCtrl.enable(); + } + }); + + effect(() => { + if (this.focusIt() && this.autofocus() && this.autocompleteInput()) { + setTimeout(() => this.autocompleteInput().nativeElement.focus(), 50); + } + }); + + toObservable(this.autocompleteInput) + .pipe( + takeUntilDestroyed(), + filter(comp => !!comp?.nativeElement), + switchMap(comp => fromEvent(comp.nativeElement, 'keydown')) + ) + .subscribe((keyDown: KeyboardEvent) => { + if (keyDown.key === 'Backspace' && (keyDown.target as HTMLInputElement).value === '') { + this.removeLastChip(); + } - ngOnDestroy() { - this.keyDownSub?.unsubscribe(); + if (this.autocomplete().panelOpen) { + keyDown.stopPropagation(); + } + }); } - private _filter(value: string) { - this.filterText = value; - const currentVal = !this.val || Array.isArray(this.val) ? this.val : [this.val]; - const currLabels = currentVal?.map(item => item?.label || item) as string[] || []; - const itemsLabels = this.items.map(item => item.label) as string[]; - this.isNewName = !itemsLabels.includes(value); - const filterValue = value?.toLowerCase(); - return this.items.filter(item => - item.label?.toLowerCase().includes(filterValue) && !currLabels.includes(item.label) - ); - } + @Output() customOptionAdded = new EventEmitter(); - displayFn(item: {label: string} | string): string { + displayFn(item: { label: string } | string): string { return typeof item === 'string' ? item : item?.label; } remove(item: IOption) { - this.value = this.val.filter(it => it.value !== item.value); + this.selected.update(selected => selected.filter(chip => chip.value !== item.value)); this.chipCtrl.setValue(null); - this.autocompleteInput.nativeElement.value = ''; + this.autocompleteInput().nativeElement.value = ''; } clear() { - this.value = null; this.chipCtrl.setValue(null); - this.autocompleteInput.nativeElement.value = ''; + this.selected.set(null); + this.autocompleteInput().nativeElement.value = ''; } + add(event: MatChipInputEvent) { const value = (event.value || '').trim(); - if (!this.optionAddable || this.multiple && this.val.find(option => option.value === value)) { - return + const selectedOption = this.selected()?.find(option => option.value === value); + if (!this.allowAddingOptions() || this.multiple() && selectedOption) { + return; } - if (value) { - this.value = this.multiple ? this.val.concat([value]) : [value]; + let option = this.safeItems().find(option => option.value === value); + if (!option) { + option = {value, label: value}; + this.customOptionAdded.emit(option); + } + this.selected.update(selected => this.multiple() ? (selected ?? []).concat(option) : [option]); this.chipCtrl.setValue(null); } - event.chipInput!.clear(); + if (event.chipInput) { + event.chipInput!.clear(); + } + this.autocompleteInput().nativeElement.value = ''; } - selected(event: MatAutocompleteSelectedEvent) { + optionSelected(event: MatAutocompleteSelectedEvent) { const value = event.option.value; - this.value = this.multiple ? this.val.concat([value]) : [value]; + // this.value = this.multiple ? this.val.concat([value]) : [value]; + const option = this.safeItems().find(option => option.value === value); + if (option) { + this.selected.update(selected => this.multiple() ? (selected ?? []).concat(option) : [option]); + } this.chipCtrl.setValue(null); - this.autocompleteInput.nativeElement.value = ''; + this.autocompleteInput().nativeElement.value = ''; } removeLastChip() { - if (Array.isArray(this.val) && this.val.length > 0) { - this.writeValue(this.val.slice(0, -1)); - } else if (this.val?.value) { - this.writeValue(null); - this.filterText = ''; - } + this.selected.update(selected => selected.slice(0, selected.length - 1)); } - ngAfterViewInit(): void { - setTimeout(() => { - this.keyDownSub = fromEvent(this.autocompleteInput.nativeElement, 'keydown').subscribe((keyDown: KeyboardEvent) => { - if (keyDown.key === 'Backspace' && (keyDown.target as HTMLInputElement).value === '') { - this.removeLastChip(); - } + openDropdown() { + if (this.autocomplete().panelOpen) { + this.autocomplete().closePanel(); + } else { + this.autocomplete().openPanel(); + } + } - if (this.autocomplete.panelOpen) { - keyDown.stopPropagation(); - } - }); + writeValue(val: IOption[] | IOption) { + if (val) { + this.selected.set(Array.isArray(val) ? val : [val]); + } + window.setTimeout(() => this.init = true); + } - this.filteredItems$ = this.chipCtrl.valueChanges - .pipe( - startWith(''), - filter(value => typeof value !== 'object' || value === null), - map(value => value ?? ''), - map(value => this._filter(value)), - ); - }, 0); + registerOnChange(fn: () => void) { + this.onChange = fn; } - trackByFn(index, item) { - return item?.label ?? item; + registerOnTouched(fn: () => void) { + this.onTouched = fn; } - openDropdown () { - this.autocomplete.panelOpen ? this.autocomplete.closePanel() : this.autocomplete.openPanel(); + setDisabledState?(isDisabled: boolean) { + if (isDisabled) { + this.chipCtrl.disable(); + } else { + this.chipCtrl.enable(); + } } + addOption($event: MatOptionSelectionChange) { + this.add({ + input: undefined, + value: $event.source.value, + chipInput: undefined + }); + } } diff --git a/src/app/webapp-common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component.html b/src/app/webapp-common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component.html index 5c15628e..cbf6a0bf 100755 --- a/src/app/webapp-common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component.html +++ b/src/app/webapp-common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component.html @@ -2,9 +2,9 @@ (xClicked)="closeDialog(undefined)" [closeOnX]="false" [iconClass]="iconClass" [iconData]="iconData">
    {{reference}}
    -
    +
    - + 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 87faed1f..110181f3 100755 --- 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 @@ -4,7 +4,7 @@ import {ConfirmDialogConfig} from './confirm-dialog.model'; import {DialogTemplateComponent} from '@common/shared/ui-components/overlay/dialog-template/dialog-template.component'; import {MatCheckboxModule} from '@angular/material/checkbox'; import {FormsModule} from '@angular/forms'; -import {SafePipe} from '@common/shared/pipes/safe.pipe'; +import {SaferPipe} from '@common/shared/pipes/safe.pipe'; import {NgIf, NgTemplateOutlet} from '@angular/common'; @Component({ @@ -16,18 +16,19 @@ import {NgIf, NgTemplateOutlet} from '@angular/common'; DialogTemplateComponent, MatCheckboxModule, FormsModule, - SafePipe, NgIf, - NgTemplateOutlet + NgTemplateOutlet, + SaferPipe ] }) export class ConfirmDialogComponent { - @Input() displayX: boolean = true; + @Input() displayX = true; showNeverShowAgain: boolean; title: string; body?: string; template?: TemplateRef; + templateContext: any; yes = 'OK'; no = 'Cancel'; iconClass = ''; @@ -47,6 +48,7 @@ export class ConfirmDialogComponent { this.reference = data.reference || ''; this.body = data.body || ''; this.template = data.template; + this.templateContext = data.templateContext; this.yes = data.yes || ''; this.no = typeof data.no === 'string' && data?.no ? data.no : ''; this.iconClass = data.iconClass || ''; diff --git a/src/app/webapp-common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.model.ts b/src/app/webapp-common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.model.ts index 500e0b7f..c78ef60b 100755 --- a/src/app/webapp-common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.model.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.model.ts @@ -1,11 +1,12 @@ import {TemplateRef} from '@angular/core'; -export interface ConfirmDialogConfig { +export interface ConfirmDialogConfig { width?: number; centerText?: boolean; title?: string; body?: string; - template?: TemplateRef; + template?: TemplateRef; + templateContext?: Context; reference?: string; yes?: string; no?: string | boolean; diff --git a/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.html b/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.html index cdefbc3f..1f918cac 100755 --- a/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.html +++ b/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.html @@ -1,28 +1,38 @@ -
    +
    -
    - - -
    -
    + @if (displayX) { +
    + + + @if (pageHeader) { +
    +
    +
    + }
    -
    - - + }
    -
    -
    -
    -
    + @if (iconClass) { +
    +
    +
    + } + @if (iconData) { +
    -
    -
    {{header}}
    -
    -
    -

    -
    + } + @if (header) { +
    +
    {{header}}
    +
    + } + @if (subHeader) { +
    +

    +
    + }
    diff --git a/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.scss b/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.scss index 35a48f55..050f6cdf 100755 --- a/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.scss +++ b/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.scss @@ -20,6 +20,10 @@ $generic-font-size: 11px; text-align: center; color: $blue-800; text-transform: uppercase; + + &.no-uppercase { + text-transform: unset; + } } .sub-header { 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 340ab5ec..f11987b5 100755 --- 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 @@ -1,34 +1,33 @@ import {booleanAttribute, Component, ElementRef, EventEmitter, Input, Output, ViewChild} from '@angular/core'; import {MatDialogRef} from '@angular/material/dialog'; -import {NgClass, NgIf} from '@angular/common'; import {CdkScrollableModule} from '@angular/cdk/scrolling'; +import {SaferPipe} from '@common/shared/pipes/safe.pipe'; @Component({ selector: 'sm-dialog-template', templateUrl: './dialog-template.component.html', styleUrls: ['./dialog-template.component.scss'], imports: [ - NgClass, - NgIf, - CdkScrollableModule - ], + CdkScrollableModule, + SaferPipe +], standalone: true }) export class DialogTemplateComponent { - @Input({transform: booleanAttribute}) displayX: boolean = true; - @Input({transform: booleanAttribute}) closeOnX: boolean = true; + @Input({transform: booleanAttribute}) displayX = true; + @Input({transform: booleanAttribute}) closeOnX = true; - @Input() theme: string = 'light-theme'; + @Input() theme = 'light-theme'; @Input() containerClass: string; - @Input() closedCodeLabel: string = 'VIEW COMMAND LINE'; + @Input() closedCodeLabel = 'VIEW COMMAND LINE'; @Input() iconClass: string; // the icon class (see icons.scss). @Input() iconData: string; @Input() header: string; @Input() subHeader: string; @Input() pageHeader: string; - @Input() codeParams; + @Input() headerClass: string; @Output() xClicked = new EventEmitter(); @ViewChild('container', {static: true}) container: ElementRef; 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 7c3181a5..fdfd7a3e 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 @@ -85,9 +85,9 @@ export class EditJsonComponent implements AfterViewInit{ this.textData = undefined; } else if (this.typeJson && typeof data.textData !== 'string') { if (data.reorder) { - this.textData = jsonPipe.transform(orderJson(data.textData)); + this.textData = this.jsonPipe.transform(orderJson(data.textData)); } else { - this.textData = jsonPipe.transform(data.textData); + this.textData = this.jsonPipe.transform(data.textData); } } else { this.textData = data.textData as string; diff --git a/src/app/webapp-common/shared/ui-components/overlay/overlay/overlay.component.html b/src/app/webapp-common/shared/ui-components/overlay/overlay/overlay.component.html index 4fa02dea..cfe60a37 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/overlay/overlay.component.html +++ b/src/app/webapp-common/shared/ui-components/overlay/overlay/overlay.component.html @@ -1 +1 @@ -
    +
    diff --git a/src/app/webapp-common/shared/ui-components/panel/card2/card-component2.component.html b/src/app/webapp-common/shared/ui-components/panel/card2/card-component2.component.html index 6123cdbb..c7363381 100644 --- a/src/app/webapp-common/shared/ui-components/panel/card2/card-component2.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/card2/card-component2.component.html @@ -1,7 +1,7 @@
    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 d8b66487..6d3c8248 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,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; +import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; @Component({ selector : 'sm-card2', @@ -6,17 +6,10 @@ import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; styleUrls : ['./card-component2.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class CardComponent2 implements OnInit { +export class CardComponent2 { @Input() header: string; @Input() text: string; @Input() showBorder = false; @Input() headerClassName = ''; - - constructor() { - } - - ngOnInit() { - } - } diff --git a/src/app/webapp-common/shared/ui-components/panel/card2/card.module.ts b/src/app/webapp-common/shared/ui-components/panel/card2/card.module.ts index d83a85be..45977680 100644 --- a/src/app/webapp-common/shared/ui-components/panel/card2/card.module.ts +++ b/src/app/webapp-common/shared/ui-components/panel/card2/card.module.ts @@ -3,10 +3,11 @@ import {CommonModule} from '@angular/common'; import {CardComponent2} from './card-component2.component'; import {SyncScrollDirective} from '../../directives/sync-scroll.directive'; + @NgModule({ declarations: [CardComponent2, SyncScrollDirective], imports : [ - CommonModule + CommonModule, ], exports: [CardComponent2, SyncScrollDirective], }) diff --git a/src/app/webapp-common/shared/ui-components/panel/menu-item/menu-item.component.html b/src/app/webapp-common/shared/ui-components/panel/menu-item/menu-item.component.html index 6e5b3b5c..14fac82b 100755 --- a/src/app/webapp-common/shared/ui-components/panel/menu-item/menu-item.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/menu-item/menu-item.component.html @@ -13,7 +13,7 @@
    {{itemLabel}}
    @if (sortOrder) { - + }
    @if (removable) { diff --git a/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.html b/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.html index a3503bac..e94ff722 100755 --- a/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.html @@ -1,5 +1,9 @@
    -
    {{header?.toUpperCase()}}@if(multi){}
    +
    {{header?.toUpperCase()}} + @if (badge) { + {{badge}} + } +
    @if (subHeader) {
    {{subHeader}}
    } diff --git a/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.scss b/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.scss index 6ee33d3f..5f2b92e0 100755 --- a/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.scss +++ b/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.scss @@ -22,6 +22,16 @@ bottom: 7px; } + .badge { + margin-left: 10px; + background-color: $purple; + color: white; + padding: 2px 6px; + border-radius: 3px; + font-size: 11px; + font-weight: normal; + } + sm-menu { position: absolute; } diff --git a/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.ts b/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.ts index dfa8028b..5d9b6229 100755 --- a/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.ts +++ b/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.ts @@ -1,10 +1,12 @@ import {Component, EventEmitter, Input, Output} from '@angular/core'; +import { TooltipDirective } from '../../indicators/tooltip/tooltip.directive'; @Component({ selector: 'sm-navbar-item', templateUrl: './navbar-item.component.html', styleUrls: ['./navbar-item.component.scss'], standalone: true, + imports: [TooltipDirective] }) export class NavbarItemComponent { @@ -12,7 +14,8 @@ export class NavbarItemComponent { @Input() active: boolean; @Input() direction: 'bottom' | 'top' = 'bottom'; @Input() subHeader: string; - @Input() multi: boolean = false; - @Input() large: boolean = true; + @Input() badge: string; + @Input() badgeTooltip: string; + @Input() large = true; @Output() itemSelected = new EventEmitter(); } diff --git a/src/app/webapp-common/shared/ui-components/panel/project-card-menu/project-card-menu.component.html b/src/app/webapp-common/shared/ui-components/panel/project-card-menu/project-card-menu.component.html index 93b438f4..914698cf 100644 --- a/src/app/webapp-common/shared/ui-components/panel/project-card-menu/project-card-menu.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/project-card-menu/project-card-menu.component.html @@ -1,9 +1,9 @@ - + (itemClicked)="projectEditClicked.emit(project)"> (); @Output() newProjectClicked = new EventEmitter(); @Output() projectNameInlineActivated = new EventEmitter(); + @Output() projectEditClicked = new EventEmitter(); @Input() project; } diff --git a/src/app/webapp-common/shared/ui-components/panel/project-card/project-card.component.html b/src/app/webapp-common/shared/ui-components/panel/project-card/project-card.component.html index c4775e5e..9489a413 100755 --- a/src/app/webapp-common/shared/ui-components/panel/project-card/project-card.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/project-card/project-card.component.html @@ -14,28 +14,21 @@ (click)="subProjectClicked(subProject.id)" [smTooltip]="subProject?.name" [matTooltipShowDelay]="300" - [innerHTML]="subProject?.name| breadcrumbsEllipsis | purify " + [innerHTML]="subProject?.name | breadcrumbsEllipsis" >
    - - + {{project.basename}} - + [showAlwaysTooltip]="(project.name?.includes('/'))" + >{{ project.basename }} + @if (!hideMenu && project.default_output_destination) { + + } +
    Sample
    @@ -66,7 +60,7 @@
    - COMPUTE TIME: {{computeTime}} + COMPUTE TIME: {{ computeTime }}
    diff --git a/src/app/webapp-common/shared/ui-components/panel/project-card/project-card.component.ts b/src/app/webapp-common/shared/ui-components/panel/project-card/project-card.component.ts index d4ac94d9..e86e0f00 100755 --- a/src/app/webapp-common/shared/ui-components/panel/project-card/project-card.component.ts +++ b/src/app/webapp-common/shared/ui-components/panel/project-card/project-card.component.ts @@ -7,7 +7,6 @@ import {trackById} from '@common/shared/utils/forms-track-by'; import {CdkFixedSizeVirtualScroll, CdkVirtualForOf, CdkVirtualScrollViewport} from '@angular/cdk/scrolling'; import {CardComponent} from '@common/shared/ui-components/panel/card/card.component'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; -import {SaferPipe} from '@common/shared/pipes/safe.pipe'; import {BreadcrumbsEllipsisPipe} from '@common/shared/pipes/breadcrumbs-ellipsis.pipe'; import {InlineEditComponent} from '@common/shared/ui-components/inputs/inline-edit/inline-edit.component'; import { @@ -17,6 +16,7 @@ import {ProjectsSharedModule} from '~/features/projects/shared/projects-shared.m import {CircleCounterComponent} from '@common/shared/ui-components/indicators/circle-counter/circle-counter.component'; import {NgIf} from '@angular/common'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; +import {MultiLineTooltipComponent} from '@common/shared/components/multi-line-tooltip/multi-line-tooltip.component'; @Component({ @@ -28,7 +28,6 @@ import {ClickStopPropagationDirective} from '@common/shared/ui-components/direct CdkVirtualScrollViewport, CardComponent, TooltipDirective, - SaferPipe, BreadcrumbsEllipsisPipe, InlineEditComponent, ShowTooltipIfEllipsisDirective, @@ -37,7 +36,8 @@ import {ClickStopPropagationDirective} from '@common/shared/ui-components/direct CdkFixedSizeVirtualScroll, NgIf, CdkVirtualForOf, - ClickStopPropagationDirective + ClickStopPropagationDirective, + MultiLineTooltipComponent ], standalone: true }) @@ -69,6 +69,7 @@ export class ProjectCardComponent { @Output() deleteProjectClicked = new EventEmitter(); @Output() moveToClicked = new EventEmitter(); @Output() newProjectClicked = new EventEmitter(); + @Output() projectEditClicked = new EventEmitter(); @ViewChild('projectName', {static: true}) projectName; diff --git a/src/app/webapp-common/shared/ui-components/styles/bootstrap-settings.scss b/src/app/webapp-common/shared/ui-components/styles/bootstrap-settings.scss index db07c648..c0fe84b5 100755 --- a/src/app/webapp-common/shared/ui-components/styles/bootstrap-settings.scss +++ b/src/app/webapp-common/shared/ui-components/styles/bootstrap-settings.scss @@ -46,18 +46,26 @@ $btn-font-family: $font-family-base; --bs-border-width: 1px; - // @import '~bootstrap/scss/bootstrap.scss'; + // @import 'bootstrap/scss/bootstrap.scss'; @import 'bootstrap/scss/bootstrap-reboot'; - @import 'bootstrap/scss/bootstrap-grid'; @import 'bootstrap/scss/bootstrap-utilities'; @import "bootstrap/scss/buttons"; - @import "bootstrap/scss/button-group"; @import "bootstrap/scss/card"; label { display: inline-flex; } + a { + color: $blue-100; + text-decoration-thickness: 1px; + text-underline-offset: 0.25em; + &:not(.mat-mdc-list-item, .item, .mat-mdc-menu-item, .al-icon, .mdc-tab):hover { + color: #fff; + text-decoration: underline; + } + } + .btn { font-size: 12px; line-height: normal; @@ -237,17 +245,24 @@ $btn-font-family: $font-family-base; $input-height: map-get($light-theme-input, height); $label-margin-bottom: 0; - //@import '~bootstrap/scss/bootstrap.scss'; + //@import 'bootstrap/scss/bootstrap.scss'; @import 'bootstrap/scss/bootstrap-reboot'; - @import 'bootstrap/scss/bootstrap-grid'; @import 'bootstrap/scss/bootstrap-utilities'; @import "bootstrap/scss/grid"; @import "bootstrap/scss/buttons"; - @import "bootstrap/scss/button-group"; @import "bootstrap/scss/card"; --bs-border-width: 1px; + a { + color: $purple; + text-decoration-thickness: 1px; + text-underline-offset: 0.25em; + &:not(.mat-mdc-list-item, .mat-mdc-menu-item, .mdc-tab):hover { + color: $purple; + } + } + .btn { font-size: 12px; line-height: normal; diff --git a/src/app/webapp-common/shared/ui-components/styles/icons.scss b/src/app/webapp-common/shared/ui-components/styles/icons.scss index 9f937e95..a95fb161 100755 --- a/src/app/webapp-common/shared/ui-components/styles/icons.scss +++ b/src/app/webapp-common/shared/ui-components/styles/icons.scss @@ -31,7 +31,7 @@ } &.blue-500 { - color: $blue-500; + color: $blue-500 !important; } &.blue-600 { @@ -130,6 +130,11 @@ height: 64px; font-size: 64px; } + &.xxxl { + width: 88px; + height: 88px; + font-size: 88px; + } } .al-icon { @@ -565,6 +570,30 @@ @include icon('#{$assets-icons-path}/ico-google.svg'); } +.i-aws { + @include icon('#{$assets-icons-path}/ico-aws.svg'); +} + +.i-azure { + @include icon('#{$assets-icons-path}/ico-azure.svg'); +} + +.i-google-cloud { + @include icon('#{$assets-icons-path}/ico-google-cloud-storage.svg'); +} + +.i-aws-cloud { + @include icon('#{$assets-icons-path}/ico-aws-S3-storage.svg'); +} + +.i-azure-cloud { + @include icon('#{$assets-icons-path}/ico-azure-blob-storage.svg'); +} + +.i-minio { + @include icon('#{$assets-icons-path}/logo_minio.svg'); +} + .i-github { @include icon('#{$assets-icons-path}/ico-github.svg'); } diff --git a/src/app/webapp-common/shared/ui-components/styles/material-overide.scss b/src/app/webapp-common/shared/ui-components/styles/material-overide.scss index 74cf4b6a..ac2da81a 100644 --- a/src/app/webapp-common/shared/ui-components/styles/material-overide.scss +++ b/src/app/webapp-common/shared/ui-components/styles/material-overide.scss @@ -13,6 +13,11 @@ --mat-option-label-text-tracking: 0; --mat-option-label-text-line-height: 32px; + .mat-mdc-tab-link { + --mat-tab-header-label-text-size: 12px; + --mat-tab-header-inactive-ripple-color: transparent; + --mat-tab-header-active-ripple-color: transparent; + } mat-error { font-size: 12px; @@ -29,11 +34,33 @@ &.mat-form-field-appearance-outline { &.black { - background-color: #000; - .mat-mdc-select-value, .mat-mdc-select-arrow { color: $blue-200; } + + .mdc-text-field { + background: black; + border-radius: 4px; + } + + &.mat-mdc-form-field-has-icon-suffix { + .mat-mdc-form-field-infix::after { + right: -35px; + width: 35px; + } + } + + &.notched { + .mat-mdc-form-field-infix::before { + left: -12px; + width: 12px; + } + + .mat-mdc-form-field-infix::after { + right: -12px; + width: 12px; + } + } } .mat-mdc-text-field-wrapper { @@ -131,6 +158,13 @@ } .dark-theme { + + .mat-mdc-tab-nav-bar { + --mat-tab-header-inactive-label-text-color: #{$blue-300}; + --mat-tab-header-inactive-focus-label-text-color: #{$neon-yellow}; + --mat-tab-header-inactive-hover-label-text-color: #{$neon-yellow}; + } + .mdc-text-field--outlined:not(.mdc-text-field--disabled) { .mdc-notched-outline__leading, .mdc-notched-outline__notch, .mdc-notched-outline__trailing { --mdc-outlined-text-field-focus-outline-width: 1px; @@ -153,28 +187,78 @@ .mat-mdc-select { --mat-select-enabled-trigger-text-color: #{$blue-200}; } + .mat-mdc-option { --mat-option-label-text-color: #{$blue-200}; + &.mdc-list-item--selected:not(.mdc-list-item--disabled) .mat-mdc-menu-item-text { --mat-option-selected-state-label-text-color: #{$blue-100}; } } + .mat-mdc-select-arrow { --mat-select-enabled-arrow-color: #{$blue-300}; } - .mat-mdc-form-field.mat-focused .mat-mdc-select-arrow { - --mat-select-focused-arrow-color: #{$blue-100}; + + .mat-mdc-form-field.mat-focused { + .mat-mdc-select-arrow { + --mat-select-focused-arrow-color: #{$blue-100}; + } + + .mat-mdc-form-field-required-marker { + color: $blue-250; + } + } + /* placeholder */ .mdc-text-field:not(.mdc-text-field--disabled) .mdc-text-field__input::placeholder { color: $blue-300; } + .mat-mdc-menu-item .mat-mdc-menu-submenu-icon { --mat-menu-item-icon-color: #{$blue-300}; } + .mdc-text-field:not(.mdc-text-field--disabled) .mdc-text-field__input { color: $blue-200; } + + .mat-mdc-form-field, .mat-mdc-form-field.notched { + + mat-label { + color: $blue-200; + } + + .mdc-notched-outline__notch { + clip-path: unset; + } + + .mdc-text-field--outlined.mdc-text-field--disabled .mdc-notched-outline__notch { + border-color: rgba(0, 0, 0, 0.06); + } + + .mat-mdc-text-field-wrapper.mdc-text-field--outlined .mdc-notched-outline__notch { + border-color: $blue-500; + } + + .mat-mdc-text-field-wrapper.mdc-text-field--focused .mdc-notched-outline__notch { + border-color: $blue-400; + } + + .mat-mdc-text-field-wrapper.mdc-text-field--invalid .mdc-notched-outline__notch { + border-color: var(--mdc-outlined-text-field-error-outline-color); + } + } + + input:-webkit-autofill, + input:-webkit-autofill:hover, + input:-webkit-autofill:focus, + input:-webkit-autofill:active{ + -webkit-text-fill-color: $blue-200; + -webkit-box-shadow: 0 0 0 30px #000 inset !important; + } + } .light-theme { @@ -183,35 +267,49 @@ --mdc-outlined-text-field-label-text-color: #{$blue-400}; --mat-select-placeholder-text-color: #{$blue-300}; + .mat-mdc-tab-nav-bar { + --mat-tab-header-inactive-label-text-color: #{$blue-300}; + --mat-tab-header-inactive-focus-label-text-color: #{$purple}; + --mat-tab-header-inactive-hover-label-text-color: #{$purple}; + } + mat-option { --mat-option-hover-state-layer-color: #{$blue-50}; --mat-option-focus-state-layer-color: #{$blue-100}; - --mat-option-selected-state-layer-color: #{$blue-50}; + --mat-option-selected-state-layer-color: #{$blue-100}; + --mat-full-pseudo-checkbox-unselected-icon-color: #{$blue-200}; margin: 0 4px; } .mat-mdc-select { - --mat-select-enabled-trigger-text-color: #{$blue-500}; + --mat-select-enabled-trigger-text-color: #{$blue-400}; } + .mat-mdc-option { - --mat-option-label-text-color: #{$blue-500}; + --mat-option-label-text-color: #{$blue-400}; + &.mdc-list-item--selected:not(.mdc-list-item--disabled) .mat-mdc-menu-item-text { --mat-option-selected-state-label-text-color: #{$blue-600}; } } + .mat-mdc-select-arrow { --mat-select-enabled-arrow-color: #{$blue-400}; } + .mat-mdc-form-field.mat-focused .mat-mdc-select-arrow { --mat-select-focused-arrow-color: #{$blue-500}; } + /* placeholder */ .mdc-text-field:not(.mdc-text-field--disabled) .mdc-text-field__input::placeholder { color: $blue-300; } + .mat-mdc-menu-item .mat-mdc-menu-submenu-icon { --mat-menu-item-icon-color: #{$blue-400}; } + .mdc-text-field:not(.mdc-text-field--disabled) .mdc-text-field__input { color: $blue-500; } @@ -370,14 +468,14 @@ body.dark-theme .mat-mdc-autocomplete-panel.dark-outline { } .mat-mdc-slide-toggle .mdc-switch { - margin-right: 8px; - --mdc-switch-selected-icon-size: 8px; - --mdc-switch-unselected-icon-size: 8px; - --mdc-switch-handle-width: 14px; - --mdc-switch-handle-height: 14px; - --mat-switch-with-icon-handle-size: 14px; - --mdc-switch-track-width: 30px; - --mdc-switch-state-layer-size: 32px; + margin-right: 8px; + --mdc-switch-selected-icon-size: 8px; + --mdc-switch-unselected-icon-size: 8px; + --mdc-switch-handle-width: 14px; + --mdc-switch-handle-height: 14px; + --mat-switch-with-icon-handle-size: 14px; + --mdc-switch-track-width: 30px; + --mdc-switch-state-layer-size: 32px; } .light-theme .mat-mdc-slider.mat-primary { @@ -462,12 +560,7 @@ body.dark-theme .mat-mdc-autocomplete-panel.dark-outline { .mat-mdc-tab-link.mdc-tab { height: 38px !important; padding: 0 16px; - color: $blue-300; min-width: 40px; - - &.mdc-tab-indicator--active { - color: $purple; - } } .dark-theme, .light-theme { diff --git a/src/app/webapp-common/shared/ui-components/styles/mixins/common.scss b/src/app/webapp-common/shared/ui-components/styles/mixins/common.scss index e0f11837..0099d1d8 100755 --- a/src/app/webapp-common/shared/ui-components/styles/mixins/common.scss +++ b/src/app/webapp-common/shared/ui-components/styles/mixins/common.scss @@ -29,6 +29,8 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + display: flex; + align-items: center; } @mixin card-sub-title(){ diff --git a/src/app/webapp-common/shared/ui-components/styles/variables.scss b/src/app/webapp-common/shared/ui-components/styles/variables.scss index aa7aa37f..f8ce9a56 100755 --- a/src/app/webapp-common/shared/ui-components/styles/variables.scss +++ b/src/app/webapp-common/shared/ui-components/styles/variables.scss @@ -60,6 +60,7 @@ $pipeline-running: $turquoise; $pipeline-failed: #d65b52; $pipeline-aborted: $completed-blue; $pipeline-completed: $completed-blue; +$pipeline-published: $neon-green; $error-dark: #ed8a83; diff --git a/src/app/webapp-common/shared/ui-components/tags/tag-color-menu/tag-color-menu.component.html b/src/app/webapp-common/shared/ui-components/tags/tag-color-menu/tag-color-menu.component.html index 8f82b227..58221799 100644 --- a/src/app/webapp-common/shared/ui-components/tags/tag-color-menu/tag-color-menu.component.html +++ b/src/app/webapp-common/shared/ui-components/tags/tag-color-menu/tag-color-menu.component.html @@ -45,10 +45,10 @@
    -
    +
    {{tag.caption}}
    diff --git a/src/app/webapp-common/shared/ui-components/tags/tag-list/tag-list.component.ts b/src/app/webapp-common/shared/ui-components/tags/tag-list/tag-list.component.ts index 23506135..d9a635a5 100644 --- a/src/app/webapp-common/shared/ui-components/tags/tag-list/tag-list.component.ts +++ b/src/app/webapp-common/shared/ui-components/tags/tag-list/tag-list.component.ts @@ -11,6 +11,7 @@ import {TagColorService} from '../../../services/tag-color.service'; import {Observable} from 'rxjs'; import {UserTagComponent} from '@common/shared/ui-components/tags/user-tag/user-tag.component'; import {AsyncPipe, NgForOf, NgIf} from '@angular/common'; +import {PushPipe} from '@ngrx/component'; export interface Tag { caption: string; @@ -29,7 +30,8 @@ export interface Tag { UserTagComponent, NgIf, NgForOf, - AsyncPipe + AsyncPipe, + PushPipe ], changeDetection: ChangeDetectionStrategy.OnPush }) diff --git a/src/app/webapp-common/shared/ui-components/tags/tags-menu/tags-menu.component.html b/src/app/webapp-common/shared/ui-components/tags/tags-menu/tags-menu.component.html index b1dad4cc..2bcf188d 100644 --- a/src/app/webapp-common/shared/ui-components/tags/tags-menu/tags-menu.component.html +++ b/src/app/webapp-common/shared/ui-components/tags/tags-menu/tags-menu.component.html @@ -20,7 +20,7 @@ autocomplete="off" >
    - { - const existingNames = control.value.map(c => c[prefix]?.value ?? c[prefix]); + const existingNames = control.value.map(c => c[prefix]?.value ?? c[prefix]).filter(c => c); const forbidden = hasDuplicates(existingNames); return existingNames && forbidden ? {[`uniqueName-${prefix}`]: duplicatesMap(existingNames)} : null; }; diff --git a/src/app/webapp-common/shared/utils/download.ts b/src/app/webapp-common/shared/utils/download.ts index 840e3514..f519cf20 100644 --- a/src/app/webapp-common/shared/utils/download.ts +++ b/src/app/webapp-common/shared/utils/download.ts @@ -11,7 +11,7 @@ export const download = (data: string, exportName: string) => { }; export const prepareColsForDownload = (cols: ISmCol[], valuesMap?: {[colId: string]: {key: any; value: any}[]}) => - cols.filter(col => col.id !== 'selected' && !col.hidden) + cols.filter(col => col.id !== 'selected' && (col.includeInDownload || !col.hidden)) .map(col => col.getter && isArray(col.getter) ? col.getter.map(getterKey => ({...col, downloadKey: getterKey})) : col).flat() .map(thisCol => ({ diff --git a/src/app/webapp-common/shared/utils/helpers.util.ts b/src/app/webapp-common/shared/utils/helpers.util.ts index 3154f03b..49c709df 100644 --- a/src/app/webapp-common/shared/utils/helpers.util.ts +++ b/src/app/webapp-common/shared/utils/helpers.util.ts @@ -2,7 +2,7 @@ import {isNil, isUndefined} from 'lodash-es'; import {excludedKey} from '@common/shared/utils/tableParamEncode'; export function hasValue(value): boolean { - return !isUndefined(value) && !isNil(value); + return !isUndefined(value) && !isNil(value) && value.length !== 0; } export function getValueOrDefault(value: T, fallbackValue?: F): T | F { diff --git a/src/app/webapp-common/shared/utils/shared-utils.ts b/src/app/webapp-common/shared/utils/shared-utils.ts index d8bed4a5..93d32db8 100755 --- a/src/app/webapp-common/shared/utils/shared-utils.ts +++ b/src/app/webapp-common/shared/utils/shared-utils.ts @@ -1,7 +1,7 @@ import {MEDIA_VIDEO_EXTENSIONS, MediaContentTypeEnum} from '~/app.constants'; import {ActivatedRoute} from '@angular/router'; import {EXPERIMENT_GRAPH_ID_PREFIX} from '../../experiments/shared/common-experiments.const'; -import {capitalize, get, last, snakeCase} from 'lodash-es'; +import {capitalize, escape, get, last, snakeCase} from 'lodash-es'; import {User} from '~/business-logic/model/users/user'; import {TABLE_SORT_ORDER} from '../ui-components/data/table/table.consts'; import {camelCase} from 'lodash-es'; @@ -66,7 +66,7 @@ export const isHtmlOrText = (url: string) => { const parsed = new URL(url); const ext = last(parsed.pathname.split('.')); return ['txt', 'text', 'html', 'htm'].includes(ext); - } catch (e) { + } catch { return false; } }; @@ -79,10 +79,10 @@ export const createModelLink = (uri, modelId, modelSignedUri) => { }; export const allItemsAreSelected = (itemsInView: { id: string }[], selectedItems: { id: string }[]) => { - if (itemsInView?.length === 0 || selectedItems.length === 0) { + if (itemsInView?.length === 0 || selectedItems?.length === 0) { return false; } else { - const selectedItemsIds = selectedItems.map(item => item.id); + const selectedItemsIds = selectedItems?.map(item => item.id); return (itemsInView?.every(item => selectedItemsIds.includes(item.id))); } }; @@ -174,9 +174,9 @@ export function crc32(str, ...rest /* , polynomial = 0x04C11DB7, initialValue = export const htmlTextShort = (name: string, limit = 80) => { if (name?.length > limit) { - return `${name.slice(0, limit - 3)}...`; + return `${escape(name.slice(0, limit - 3))}...`; } - return name; + return escape(name); }; export const findRegexRecursively = (object, field: string, regex: RegExp) => { @@ -224,7 +224,7 @@ export const getScaleFactor = (isMobile = false) => { screenHeight = window.screen.height < window.screen.width ? window.screen.height : window.screen.width; dimensionRatio = Math.max(60, Math.min(100, Math.round((100 * (screenHeight / 1080) / 10)) * 10)); } - } catch (err) { + } catch { dimensionRatio = 100; } dimensionRatio = 10000 / dimensionRatio; diff --git a/src/app/webapp-common/shared/utils/statistics.ts b/src/app/webapp-common/shared/utils/statistics.ts index 4dbca551..a8cc12de 100644 --- a/src/app/webapp-common/shared/utils/statistics.ts +++ b/src/app/webapp-common/shared/utils/statistics.ts @@ -1,5 +1,6 @@ import {last} from 'lodash-es'; import {maxInArray} from '@common/shared/utils/helpers.util'; +import {ResourceUsageSeries} from '~/business-logic/model/workers/resourceUsageSeries'; export interface DataPoint { date: string; @@ -125,3 +126,19 @@ export function addFullRangeMarkers(topics: Topic[], fromDate: number, toDate: n topics[0].dates.splice(0, 0, {date: (new Date(fromDate * 1000)).toISOString(), value: null}); topics[0].dates.push({date: (new Date(toDate * 1000)).toISOString(), value: null}); } + +export function activitySeriesToTopic(data: ResourceUsageSeries, topicIndex: number, forceTitle?: string) { + if (!data) { + return null; + } + return { + topic: topicIndex, + topicName: forceTitle ?? data.title, + topicID: forceTitle ?? data.title, + dates: data.dates?.map((date, i) => ({ + originalDate: date, + date: new Date(date).toISOString(), + value: data.values[i], + })) ?? [] + } as Topic; +} diff --git a/src/app/webapp-common/shared/utils/tableParamEncode.ts b/src/app/webapp-common/shared/utils/tableParamEncode.ts index bdaaa11d..0677804c 100644 --- a/src/app/webapp-common/shared/utils/tableParamEncode.ts +++ b/src/app/webapp-common/shared/utils/tableParamEncode.ts @@ -28,12 +28,12 @@ export interface MetricColumn { export const excludedKey = '__$not'; -const metricVariantDelimiter = '\u203A' +const metricVariantDelimiter = '\u203A'; export const MetricValueTypeStrings = { value: '(Last)', max_value: '(Max)', - min_value: '(Min)', + min_value: '(Min)' }; export const getValueTypeName = (valueType: MetricValueType) => MetricValueTypeStrings[valueType] ?? valueType; @@ -156,7 +156,7 @@ export const decodeColumns = (columns: string[], tableCols: ISmCol[]): [string[] export const decodeHyperParam = (col: ISmCol): { name: string; section: string } => { const [section, ...name] = col.id.replace('hyperparams.', '').split('.'); - return { section, name: name.join('.') }; + return {section, name: name.join('.')}; }; export const createMetricColumn = (column: MetricColumn, projectId: string): ISmCol => ({ @@ -165,7 +165,7 @@ export const createMetricColumn = (column: MetricColumn, projectId: string): ISm sortable: true, filterable: true, filterType: ColHeaderFilterTypeEnum.durationNumeric, - header: `${column.metric} ${metricVariantDelimiter} ${column.variant}${getValueTypeName(column.valueType) ? ' ' + getValueTypeName(column.valueType): ''}`, + header: `${column.metric} ${metricVariantDelimiter} ${column.variant}${getValueTypeName(column.valueType) ? ' ' + getValueTypeName(column.valueType) : ''}`, hidden: false, /* eslint-disable @typescript-eslint/naming-convention */ metric_hash: column.metricHash, @@ -178,9 +178,9 @@ export const createMetricColumn = (column: MetricColumn, projectId: string): ISm variantName: column.variant }); -export const createCompareMetricColumn = (column: MetricVariantResult): Partial => ({ +export const createCompareMetricColumn = (column: MetricVariantResult, hideList = []): Partial => ({ id: `last_metrics.${column.metric_hash}.${column.variant_hash}.value`, - hidden: false, + hidden: hideList.includes(`${column.metric} - ${column.variant}`) }); export const createMetadataCol = (key, projectId): ISmCol => ({ @@ -210,3 +210,15 @@ export const createFiltersFromStore = (_tableFilters: { [key: string]: FilterMet return returnTableFilters; }, {}); }; + +export const decodeURIComponentSafe = (value: string) => { + try { + return decodeURIComponent(value); + } catch (error) { + if (error.name === 'URIError') { + return decodeURIComponent(value.replace(/%(?![0-9][0-9a-fA-F]+)/g, '%25')); + } else { + throw error; + } + } +}; diff --git a/src/app/webapp-common/shared/utils/validation-utils.ts b/src/app/webapp-common/shared/utils/validation-utils.ts index c1f1fb48..bbb50ed0 100644 --- a/src/app/webapp-common/shared/utils/validation-utils.ts +++ b/src/app/webapp-common/shared/utils/validation-utils.ts @@ -36,3 +36,5 @@ export function validateJson(obj) { } return true; } + +export const NotOnlyWhiteSpacePattern = /^(?!\s*$).+/; diff --git a/src/app/webapp-common/tasks/tasks.utils.ts b/src/app/webapp-common/tasks/tasks.utils.ts index 6701357c..a0bb65ed 100755 --- a/src/app/webapp-common/tasks/tasks.utils.ts +++ b/src/app/webapp-common/tasks/tasks.utils.ts @@ -33,6 +33,8 @@ export const mergeTasks = (tableTask, task) => { return task; }; +export const allowedMergedTypes = ['scatter', 'scattergl', 'bar', 'scatter3d', 'box', 'histogram']; + export const _mergeVariants = (base: Array, variant) => base.slice().concat(variant); export const _mergePlotsData = (base: any, toMerge: any) => @@ -162,14 +164,14 @@ export const groupIterations = (plots: MetricsPlotEvent[]): { [title: string]: E if (plotParsed.data[0] && !plotParsed.data[0].name) { plotParsed.data[0].name = plot.variant; } - if (index > -1 && plotParsed.data && plotParsed.data[0] && ['scatter', 'bar'].includes(plotParsed.data[0]?.type) && previousPlotIsMergable) { + if (index > -1 && plotParsed.data && plotParsed.data[0] && allowedMergedTypes.includes(plotParsed.data[0]?.type) && previousPlotIsMergable) { const basePlotParsed = tryParseJson(groupedPlots[metric][index].plot_str); groupedPlots[metric][index].plot_str = _mergePlotsData(basePlotParsed, plotParsed); groupedPlots[metric][index].variants.push(plot.variant); } else { groupedPlots[metric].push({...plot, plot_str: JSON.stringify(plotParsed), variants: [plot.variant]}); } - previousPlotIsMergable = onlySdk[metric] && shouldMerge[metric] && (index > -1 || (index === -1 && ['scatter', 'bar'].includes(plotParsed.data[0]?.type))); + previousPlotIsMergable = onlySdk[metric] && shouldMerge[metric] && (index > -1 || (index === -1 && allowedMergedTypes.includes(plotParsed.data[0]?.type))); return groupedPlots; }, {}); }; @@ -251,15 +253,14 @@ export const convertMultiPlots = (plots: { [metric: string]: { [variant: string] const graphs = graphGroup[1]; acc[key] = Object.values(graphs).map( graph => { - const singleTask = new Set(graph.data.map(d => d.task)).size === 1; + const singleTask = new Set(graph.data.map(d => d.task)).size === 1 || graph.data.filter(d => !d.fakePlot).length === 1; return {...prepareGraph(graph.data, graph.layout, graph.config, {...graph, task: graph.task}), tags: singleTask ? tagsLists?.[graph.task] ?? [] : []}; } ); return acc; }, {}); -export const multiplotsAddChartToGroup = (charts, parsed, metric, experimentName, experiment, experimentId, variant, iteration, isMultipleVar: boolean) => { - const allowedMergedTypes = ['scatter', 'scattergl', 'bar', 'scatter3d']; +export const multiplotsAddChartToGroup = (charts, parsed, metric, experimentName, experiment, experimentId, variant, iteration, showIterationInName: boolean) => { let fullName: string; const metricVariant = `${metric} - ${variant}`; //isMultipleVar ? `${metric} - ${variant}` : metric; if (parsed.layout && parsed.layout.images) { @@ -268,7 +269,7 @@ export const multiplotsAddChartToGroup = (charts, parsed, metric, experimentName } const index = Object.keys(charts[metricVariant]).length; charts[metricVariant][index] = parsed; - charts[metricVariant][index].layout.title = `${experiment} (iteration ${iteration})`; + charts[metricVariant][index].layout.title = showIterationInName ? `${experiment} (iteration ${iteration})` : experiment; charts[metricVariant][index].task = experimentId; charts[metricVariant][index].metric = metric; charts[metricVariant][index].variant = variant; @@ -290,8 +291,10 @@ export const multiplotsAddChartToGroup = (charts, parsed, metric, experimentName if (!charts[metricName]) { charts[metricName] = {}; } - isVariantsSplited && delete variantPlot.legendgroup; + variantPlot.legendgroup = experiment; if ((!variantPlot.type || allowedMergedTypes.includes(variantPlot.type))) { + // Overrides user's showlegend: false in compare + variantPlot.showlegend = true; if (variantPlot.name) { fullName = `${metricVariant} - ${variantPlot.name}`; } else { @@ -300,8 +303,9 @@ export const multiplotsAddChartToGroup = (charts, parsed, metric, experimentName if (isVariantsSplited) { variantPlot.seriesName = variantPlot.name; } - variantPlot.name = allWithoutName ? `${experiment} (iteration ${iteration}) ${i}` : `${experiment} (iteration ${iteration})`; - variantPlot.colorKey = experimentName; + const iterationString = showIterationInName ? `(iteration ${iteration})` : ''; + variantPlot.name = allWithoutName ? `${experiment} ${iterationString}${i? ' ' + i : ''}` : `${experiment}${iterationString ? ' ' + iterationString : ''}`; + variantPlot.colorKey = `${experimentName}-${experimentId}`; variantPlot.task = experimentId; } else if (variantPlot.type === 'table') { variantPlot.name = experiment; @@ -311,26 +315,34 @@ export const multiplotsAddChartToGroup = (charts, parsed, metric, experimentName fullName = `${metricVariant} - ${experiment}`; variantPlot.seriesName = variantPlot.name; variantPlot.name = experiment; - variantPlot.colorKey = experimentName; + variantPlot.colorKey = `${experimentName}-${experimentId}`; variantPlot.task = experimentId; } + if (!charts[metricName][fullName]) { charts[metricName][fullName] = Object.assign({}, parsed); charts[metricName][fullName].data = [variantPlot]; } else { charts[metricName][fullName].data = _mergeVariants(charts[metricName][fullName].data.slice(), variantPlot); + charts[metricName][fullName].data?.forEach( (dat, i) => + //we don't need to show all occurrences of same legend - show only first + dat.showlegend = charts[metricName][fullName].data.findIndex(p => p.task === dat.task) === i); isMultipleTasks = true; } charts[metricName][fullName].layout = Object.assign({}, {...charts[metricName][fullName].layout}) as Layout; // charts[metricName][fullName].layout.title = isMultipleTasks ? variantPlot.seriesName ?? '' : `${experiment} (iteration ${iteration})`; - charts[metricName][fullName].layout.title = variantPlot.seriesName ?? (isMultipleTasks ? '' : variantPlot.name) ?? ''; + charts[metricName][fullName].layout.title = variantPlot.seriesName || (isMultipleTasks ? '' : variantPlot.name) || ''; charts[metricName][fullName].layout.name = charts[metricName][fullName].layout.name ? `${charts[metricName][fullName].layout.name} - ${experiment}` : fullName; charts[metricName][fullName].layout.barmode = isMultipleTasks ? 'group' : 'stack'; - charts[metricName][fullName].layout.showlegend = isMultipleTasks ? true : charts[metricName][fullName].layout.showlegend; + charts[metricName][fullName].layout.showlegend = isMultipleTasks ? undefined : charts[metricName][fullName].layout.showlegend; charts[metricName][fullName].layout.orientation = isMultipleTasks ? 'h' : charts[metricName][fullName].layout.orientation; charts[metricName][fullName].metric = metric; charts[metricName][fullName].variant = variant; + charts[metricName][fullName].iter = isMultipleTasks ? null : charts[metricName][fullName].iter ?? parseInt(iteration); charts[metricName][fullName].task = charts[metricName][fullName].task ?? experimentId; + if (isMultipleTasks && charts[metricName][fullName].layout?.legend?.title) { + charts[metricName][fullName].layout.legend.title = ''; + } } return charts; }; @@ -341,7 +353,6 @@ function shouldBeMergedObj(experimentsPlots: { [expId: string]: { data: ExtData[ } function shouldBeMerged(experimentsPlots: { data: ExtData[], layout: ExtLayout, config?: plotly.Config; metric: string }[]): {[metric: string]: boolean} { - const allowedMergedTypes = ['scatter', 'scattergl', 'bar', 'scatter3d']; const shouldMerge = {}; experimentsPlots.forEach((plot) => shouldMerge[plot.metric] = plot.data.length > 0 && plot.data.every(data => allowedMergedTypes.includes(data.type))); experimentsPlots.forEach((plot) => { @@ -359,6 +370,8 @@ export const seperateMultiplotsVariants = (mixedPlot: IMultiplot, isMultipleVari if (!values || values.length === 0) { return {charts: mixedPlot, parsingError: false}; } + + const showIterationInName = values.some(a => Object.values(a).some(b => Object.keys(b).some(c => c !== '0'))); for (const variant of values) { const experimentsPlots = Object.entries(variant).reduce((acc, [experimentId, experimentData]) => { const iterationKey = Object.keys(experimentData)[0]; @@ -379,14 +392,14 @@ export const seperateMultiplotsVariants = (mixedPlot: IMultiplot, isMultipleVari parsingError = true; } if (shouldBeMergedObj(experimentsPlots)) { - charts = multiplotsAddChartToGroup(charts, parsed, plot.metric, iteration.name, experimentName, experimentId, plot.variant, iterationKey, isMultipleVarients); + charts = multiplotsAddChartToGroup(charts, parsed, plot.metric, iteration.name, experimentName, experimentId, plot.variant, iterationKey, showIterationInName); } else { charts[`${plot.metric} - ${plot.variant}`] = charts[`${plot.metric} - ${plot.variant}`] ?? {}; const plotObj = {...parsed, metric: plot.metric, variant: plot.variant, task: experimentId}; plotObj.layout.showlegend = true; plotObj.layout.title = `${experimentName} (iteration ${iterationKey})`; plotObj.data.forEach((p, i) => { - p.colorKey = p.name ?? experimentName; + p.colorKey = `${p.name ?? experimentName}-${experimentId}`; p.name = p.name ?? `series ${i + 1}`; }); charts[`${plot.metric} - ${plot.variant}`][`${plot.metric} - ${plot.variant} - ${experimentName}`] = plotObj; @@ -397,12 +410,34 @@ export const seperateMultiplotsVariants = (mixedPlot: IMultiplot, isMultipleVari return {charts, parsingError}; }; +function removeRedundantExperiments(multiPlots: ReportsApiMultiplotsResponse, experimentsIds: string[]) { + if (experimentsIds.length === 0) { + return multiPlots; + } + // When we remove experiment form the list, don't call BE, just remove it from plots data + return Object.entries(multiPlots).reduce((acc, [metric, variant]) => { + acc[metric] = Object.entries(variant).reduce((acc1, [variantName, exps]) => { + acc1[variantName] = Object.entries(exps).reduce((acc2, [expId, plot]) => { + if (experimentsIds.includes(expId)) { + acc2[expId] = plot; + } + return acc2; + }, {}); + return acc1; + }, {}); + return acc; + }, {}); +} + export const prepareMultiPlots = (multiPlots: ReportsApiMultiplotsResponse, globalLegend: Partial[] = []): { merged: ReportsApiMultiplotsResponse; parsingError: boolean } => { let hadParsingError = false; if (!multiPlots) { return {merged: multiPlots, parsingError: false}; } + const experimentsIds = globalLegend.map(g => g.id); + const newMultiPlots = removeRedundantExperiments(multiPlots, experimentsIds) + const idToName = {}; const duplicateNamesObject = globalLegend.reduce((acc, legendItem) => { const experimentName = legendItem.name; @@ -411,7 +446,7 @@ export const prepareMultiPlots = (multiPlots: ReportsApiMultiplotsResponse, glob return acc; }, {} as { [name: string]: boolean }); - const merged = Object.entries(multiPlots).reduce((acc, graph) => { + const merged = Object.entries(newMultiPlots).reduce((acc, graph) => { if (!graph[1]) { return acc; } @@ -427,20 +462,34 @@ export const prepareMultiPlots = (multiPlots: ReportsApiMultiplotsResponse, glob function addMissingExperimentsToPlots(charts, idToName) { Object.values(charts as any).forEach(variant => Object.values(variant).forEach(plot => { + const multiVariant = Object.keys(variant).length > 1; if (!plot.layout?.images && plot.data?.[0]?.type !== 'table') { - plot.data.filter(data => data.showlegend === false).forEach(data => data.visible = true); + // (WIP) We should deal with overriding user legend false before + plot.data.filter(data => data.showlegend === false).forEach(data => { + data.visible = true; + // data.showlegend = true; + }); const existsTasksIds = (plot.data).map(data => data.task); - Object.keys(idToName).forEach(taskId => !existsTasksIds.includes(taskId) && plot.data.push({ - colorKeys: idToName[taskId], - name: idToName[taskId], - type: plot.data[0]?.type, - task: taskId, - mode: plot.data[0]?.mode, - visible: 'legendonly', - x: [null], - y: [null], - z: plot.data[0]?.type === 'scatter3d' ? [null] : undefined - })); + Object.keys(idToName).forEach(taskId => { + if (!existsTasksIds.includes(taskId)) { + // For plots that only one experiment involve, we need to remove the title (We deal with multiple experiments before) + if (!multiVariant && allowedMergedTypes.includes(plot.data[0]?.type)) { + plot.layout.title = ''; + } + plot.data.push({ + colorKey: `${idToName[taskId]}-${taskId}`, + name: idToName[taskId], + type: plot.data[0]?.type, + task: taskId, + mode: plot.data[0]?.mode, + visible: 'legendonly', + fakePlot: true, + x: [null], + y: [null], + z: plot.data[0]?.type === 'scatter3d' ? [null] : undefined + }) + } + }); } })); } diff --git a/src/app/webapp-common/workers-and-queues/actions/queues.actions.ts b/src/app/webapp-common/workers-and-queues/actions/queues.actions.ts index 66e7d91c..1f9b666e 100755 --- a/src/app/webapp-common/workers-and-queues/actions/queues.actions.ts +++ b/src/app/webapp-common/workers-and-queues/actions/queues.actions.ts @@ -23,8 +23,8 @@ export const queueActions = createActionGroup({ 'move experiment to top of queue': props<{ task: string }>(), 'move experiment in queue': props<{ task: string; count: number }>(), 'remove experiment from queue': props<{ task: string }>(), - 'move experiment to other queue': props<{ task: string; queue: string }>(), - 'add experiment to queue': props<{ task: string; queue: string }>(), + 'move experiment to other queue': props<{ task: string; queueId: string; queueName: string }>(), + 'add experiment to queue': props<{ task: string; queueId: string; queueName: string }>(), 'get stats': props<{ maxPoints?: number }>(), 'set stats': props<{ data: { wait: Topic[]; length: Topic[] } }>(), 'reset stats': emptyProps(), diff --git a/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.ts b/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.ts index e14ce38c..1942e36e 100644 --- a/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.ts +++ b/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.ts @@ -4,7 +4,7 @@ import { viewChild, } from '@angular/core'; import {Store} from '@ngrx/store'; -import {interval, combineLatest, switchMap, fromEvent} from 'rxjs'; +import {interval, combineLatest, switchMap, fromEvent, startWith} from 'rxjs'; import {Queue} from '~/business-logic/model/queues/queue'; import {queueActions} from '../../actions/queues.actions'; import {selectQueuesStatsTimeFrame, selectQueueStats, selectStatsErrorNotice} from '../../reducers/index.reducer'; @@ -59,7 +59,7 @@ export class QueueStatsComponent { combineLatest([ toObservable(this.waitChartRef), this.store.select(selectQueuesStatsTimeFrame), - fromEvent(window, 'resize') + fromEvent(window, 'resize').pipe(startWith(0)) ]) .pipe( takeUntilDestroyed(), @@ -68,7 +68,7 @@ export class QueueStatsComponent { const range = parseInt(timeFrame, 10); let width = waitChartRef?.nativeElement.clientWidth ?? 1000; width = Math.min(0.8 * width, 1000); - return Math.max(Math.floor(range / width), 5); + return Math.max(Math.floor(range / width), 40); }), switchMap(granularity => interval(granularity * 1000)) ) diff --git a/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.html b/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.html index 364f8f80..bb490fc3 100755 --- a/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.html +++ b/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.html @@ -4,7 +4,7 @@ NEW QUEUE } - +
    diff --git a/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.ts b/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.ts index 00592499..d09faf1f 100755 --- a/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.ts +++ b/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.ts @@ -108,7 +108,7 @@ export class QueuesComponent { } moveExperimentToOtherQueue($event) { - this.store.dispatch(queueActions.moveExperimentToOtherQueue({task: $event.task.id, queue: $event.queue.id})); + this.store.dispatch(queueActions.moveExperimentToOtherQueue({task: $event.task.id, queueId: $event.queue.id, queueName: $event.queue.name})); } moveExperimentInQueue({task, count}) { diff --git a/src/app/webapp-common/workers-and-queues/containers/workers-stats/workers-stats.component.html b/src/app/webapp-common/workers-and-queues/containers/workers-stats/workers-stats.component.html index a454ed87..d9aacbcf 100644 --- a/src/app/webapp-common/workers-and-queues/containers/workers-stats/workers-stats.component.html +++ b/src/app/webapp-common/workers-and-queues/containers/workers-stats/workers-stats.component.html @@ -1,36 +1,46 @@
    -
    Workers Utilization
    - - - - {{chartParam.label}} - - - - - + @if (!activeWorker()) { +
    Workers Utilization
    + } + @if (activeWorker()) { + + + @for (chartParam of chartParamOptions; track chartParam.label) { + + {{chartParam.label}} + + } + + + } + @if (statsError()) { + + + }
    - - - {{timeFrame.label}} - + + @for (timeFrame of timeFrameOptions; track timeFrame.label) { + + {{timeFrame.label}} + + }
    diff --git a/src/app/webapp-common/workers-and-queues/containers/workers-stats/workers-stats.component.ts b/src/app/webapp-common/workers-and-queues/containers/workers-stats/workers-stats.component.ts index 839a3310..e90b1702 100644 --- a/src/app/webapp-common/workers-and-queues/containers/workers-stats/workers-stats.component.ts +++ b/src/app/webapp-common/workers-and-queues/containers/workers-stats/workers-stats.component.ts @@ -1,29 +1,23 @@ import { ChangeDetectionStrategy, - ChangeDetectorRef, Component, - Input, - OnDestroy, - OnInit, - ViewChild, - ViewContainerRef + computed, + ElementRef, + inject, + input, + signal, + viewChild } from '@angular/core'; -import {combineLatest, Subscription} from 'rxjs'; -import {filter} from 'rxjs/operators'; import {Store} from '@ngrx/store'; import {Worker} from '~/business-logic/model/workers/worker'; import {Topic} from '@common/shared/utils/statistics'; -import { - IOption -} from '@common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component'; +import {IOption} from '@common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component'; import {getWorkers, setStats, setStatsParams} from '../../actions/workers.actions'; -import { - selectStats, - selectStatsErrorNotice, - selectStatsParams, - selectStatsTimeFrame -} from '../../reducers/index.reducer'; +import {selectStats, selectStatsErrorNotice, selectStatsParams, selectStatsTimeFrame} from '../../reducers/index.reducer'; import {timeFrameOptions} from '@common/constants'; +import {combineLatest, interval, switchMap} from 'rxjs'; +import {takeUntilDestroyed, toObservable} from '@angular/core/rxjs-interop'; +import {distinctUntilChanged, filter, map} from 'rxjs/operators'; @Component({ selector: 'sm-workers-graph', @@ -31,27 +25,47 @@ import {timeFrameOptions} from '@common/constants'; styleUrls: ['./workers-stats.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class WorkersStatsComponent implements OnInit, OnDestroy { - private chartDataSubscription: Subscription; - private chartParamSubscription: Subscription; - public statsError$ = this.store.select(selectStatsErrorNotice); - private intervaleHandle: number; - public currentParam: string; - public currentTimeFrame: string; - public refreshChart = true; - public activeWorker: Worker; - public yAxisLabel: string; - - @ViewChild('chart', {read: ViewContainerRef, static: true}) chartRef: ViewContainerRef; - - @Input() set worker(worker: Worker) { - if (this.activeWorker?.id !== worker?.id) { - this.activeWorker = worker; - if (worker) { - this.yAxisLabel = this.yAxisLabels[this.currentParam]; - } - this.chartChanged(); - } +export class WorkersStatsComponent { + private store = inject(Store); + + protected statsError = this.store.selectSignal(selectStatsErrorNotice); + protected currentTimeFrame = this.store.selectSignal(selectStatsTimeFrame); + protected currentParam = this.store.selectSignal(selectStatsParams); + protected chartData = this.store.selectSignal(selectStats); + + protected chartRef = viewChild>('chart'); + public activeWorker = input(); + protected chartState = computed(() => ({ + chart: this.chartData(), + refreshChart: signal(!this.chartData()) + })) + public yAxisLabel = computed(() => this.activeWorker() ? this.yAxisLabels[this.currentParam()] : 'Count'); + + constructor() { + combineLatest([ + toObservable(this.chartRef), + toObservable(this.activeWorker).pipe(distinctUntilChanged((a, b) => a?.id === b?.id)), + this.store.select(selectStatsParams), + this.store.select(selectStatsTimeFrame), + ]) + .pipe( + takeUntilDestroyed(), + filter(([chart]) => !!chart), + switchMap(() => { + const range = parseInt(this.currentTimeFrame(), 10); + this.chartState().refreshChart.set(true); + const maxPoints = Math.min(0.8 * this.chartRef().nativeElement.clientWidth || 1000, 1000); + const granularity = Math.max(Math.floor(range / maxPoints), 40); + this.store.dispatch(setStats({data: null})); + this.store.dispatch(getWorkers({maxPoints})); + + return interval(granularity * 1000) + .pipe(map(() => { + this.store.dispatch(getWorkers({maxPoints})); + })); + }) + ) + .subscribe() } timeFrameOptions = timeFrameOptions; @@ -59,79 +73,23 @@ export class WorkersStatsComponent implements OnInit, OnDestroy { {label: 'CPU and GPU Usage', value: 'cpu_usage;gpu_usage'}, {label: 'Memory Usage', value: 'memory_used'}, {label: 'Video Memory', value: 'gpu_memory_used'}, - {label: 'Network Usage', value: 'network_rx;network_tx'}, + {label: 'Network Usage', value: 'network_rx;network_tx'} // {label: 'Frames Processed', value: 'frames'}, ]; public yAxisLabels = { - /* eslint-disable @typescript-eslint/naming-convention */ 'cpu_usage;gpu_usage': 'Usage %', memory_used: 'Bytes', gpu_memory_used: 'Bytes', 'network_rx;network_tx': 'Bytes/sec' - /* eslint-enable @typescript-eslint/naming-convention */ }; - public chartData: Topic[]; - - constructor(public store: Store, private cdr: ChangeDetectorRef) { - } - - ngOnInit() { - this.chartParamSubscription = combineLatest([ - this.store.select(selectStatsTimeFrame), - this.store.select(selectStatsParams) - ]) - .pipe(filter(([timeFrame, param]) => !!timeFrame && !!param)) - .subscribe(([timeFrame, param]) => { - this.currentParam = param; - this.currentTimeFrame = timeFrame; - this.yAxisLabel = this.activeWorker ? this.yAxisLabels[param] : 'Count'; - this.chartChanged(); - }); - - this.chartDataSubscription = this.store.select(selectStats).subscribe( - (data) => { - if (data) { - this.refreshChart = false; - this.chartData = data; - this.cdr.detectChanges(); - } - } - ); - - this.chartChanged(); - } - - ngOnDestroy() { - this.chartDataSubscription.unsubscribe(); - this.chartParamSubscription.unsubscribe(); - clearInterval(this.intervaleHandle); - } - - chartChanged() { - const range = parseInt(this.currentTimeFrame, 10); - clearInterval(this.intervaleHandle); - this.refreshChart = true; - let width = this.chartRef.element.nativeElement.clientWidth || 1000; - width = Math.min(0.8 * width, 1000); - const granularity = Math.max(Math.floor(range / width), this.activeWorker ? 10 : 40); - - this.store.dispatch(setStats({data: null})); - this.store.dispatch(getWorkers({maxPoints: width})); - - this.intervaleHandle = window.setInterval(() => { - this.store.dispatch(getWorkers({maxPoints: width})); - }, granularity * 1000); - } chartParamChange(event) { - this.currentParam = event; - this.store.dispatch(setStatsParams({timeFrame: this.currentTimeFrame, param: this.currentParam})); + this.store.dispatch(setStatsParams({timeFrame: this.currentTimeFrame(), param: event})); } timeFrameChange(event) { - this.currentTimeFrame = event; - this.store.dispatch(setStatsParams({timeFrame: this.currentTimeFrame, param: this.currentParam})); + this.store.dispatch(setStatsParams({timeFrame: event, param: this.currentParam()})); } } diff --git a/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.html b/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.html index f4f4d2bb..558f96c0 100755 --- a/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.html +++ b/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.html @@ -1,17 +1,17 @@ - + - - + diff --git a/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.ts b/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.ts index 17f6ffbf..44a0e337 100755 --- a/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.ts +++ b/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.ts @@ -1,6 +1,6 @@ import {Component, OnInit} from '@angular/core'; import {Store} from '@ngrx/store'; -import {getSelectedWorker, workersTableSortChanged} from '../../actions/workers.actions'; +import {getSelectedWorker, WorkerExt, workersTableSortChanged} from '../../actions/workers.actions'; import {selectSelectedWorker, selectWorkers, selectWorkersTableSortFields} from '../../reducers/index.reducer'; import {ActivatedRoute, Router} from '@angular/router'; import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; @@ -34,11 +34,10 @@ export class WorkersComponent implements OnInit { const selectedWorker = workers.find(worker => worker.id === this.routerWorkerId); this.selectWorker(selectedWorker); }); - } - public selectWorker(worker) { + public selectWorker(worker: WorkerExt) { this.store.dispatch(getSelectedWorker({worker})); return this.router.navigate( [], 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 9e071407..3c6c23f6 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 @@ -7,6 +7,7 @@ a[href]:hover { color: white; + text-decoration: none; } sm-simple-table-2 { diff --git a/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.scss b/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.scss index 88913272..15280625 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.scss +++ b/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.scss @@ -7,6 +7,7 @@ a[href]:hover { color: white; + text-decoration: none; } .worker-info-container { diff --git a/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.ts b/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.ts index 770423a1..42e87dc5 100755 --- a/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.ts +++ b/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.ts @@ -13,7 +13,7 @@ import {WorkerExt} from '@common/workers-and-queues/actions/workers.actions'; }) export class WorkersTableComponent extends BaseTableView { - public cols: Array; + public cols: ISmCol[]; public readonly WORKERS_TABLE_COL_FIELDS = WORKERS_TABLE_COL_FIELDS; private _workers: WorkerExt[]; @@ -89,4 +89,7 @@ export class WorkersTableComponent extends BaseTableView { // eslint-disable-next-line @typescript-eslint/no-unused-vars emitSelection(selection: any[]) { } + + openContextMenu(data: { e: Event; rowData; single?: boolean; backdrop?: boolean }) { + } } diff --git a/src/app/webapp-common/workers-and-queues/effects/queues.effects.ts b/src/app/webapp-common/workers-and-queues/effects/queues.effects.ts index 66ba96a4..527dc497 100755 --- a/src/app/webapp-common/workers-and-queues/effects/queues.effects.ts +++ b/src/app/webapp-common/workers-and-queues/effects/queues.effects.ts @@ -1,7 +1,8 @@ import {Injectable} from '@angular/core'; import {catchError, filter, map, mergeMap, switchMap, tap} from 'rxjs/operators'; import {Store} from '@ngrx/store'; -import {Actions, createEffect, ofType, concatLatestFrom} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {ApiQueuesService} from '~/business-logic/api-services/queues.service'; import {QueuesGetQueueMetricsRequest} from '~/business-logic/model/queues/queuesGetQueueMetricsRequest'; import {QueuesGetQueueMetricsResponse} from '~/business-logic/model/queues/queuesGetQueueMetricsResponse'; @@ -9,14 +10,15 @@ import { selectQueues, selectQueuesStatsTimeFrame, selectQueuesTableSortFields, - selectQueueStats, selectSelectedQueue + selectQueueStats, + selectSelectedQueue } from '../reducers/index.reducer'; import {activeLoader, addMessage, deactivateLoader} from '../../core/actions/layout.actions'; import {requestFailed} from '../../core/actions/http.actions'; import {queueActions} from '../actions/queues.actions'; import {QueueMetrics} from '~/business-logic/model/queues/queueMetrics'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; -import {cloneDeep} from 'lodash-es'; +import {cloneDeep, escape} from 'lodash-es'; import {addFullRangeMarkers, addStats, removeFullRangeMarkers} from '../../shared/utils/statistics'; import {hideNoStatsNotice, showStatsErrorNotice} from '../actions/stats.actions'; import {encodeOrder} from '../../shared/utils/tableParamEncode'; @@ -27,6 +29,7 @@ import {MESSAGES_SEVERITY} from '@common/constants'; import {MatDialog} from '@angular/material/dialog'; import {ConfirmDialogComponent} from '@common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component'; import {ConfirmDialogConfig} from '@common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.model'; +import {of} from 'rxjs'; @Injectable() export class QueuesEffect { @@ -50,10 +53,10 @@ export class QueuesEffect { concatLatestFrom( () => this.store.select(selectQueuesTableSortFields)), switchMap(([action, orderFields]) => this.queuesApi.queuesGetAllEx({ - /* eslint-disable @typescript-eslint/naming-convention */ + only_fields: ['*', 'entries.task.name'], order_by: encodeOrder(orderFields) - /* eslint-enable @typescript-eslint/naming-convention */ + }).pipe( mergeMap(res => [queueActions.setQueues({queues: sortTable(orderFields, res.queues)}), deactivateLoader(action.type)]), catchError(err => [deactivateLoader(action.type), requestFailed(err)]) @@ -78,7 +81,7 @@ export class QueuesEffect { tap(action => this.store.dispatch(activeLoader(action.type))), switchMap(action => this.queuesApi.queuesGetAllEx({ id: [action.queue.id], - // eslint-disable-next-line @typescript-eslint/naming-convention + only_fields: ['*', 'entries.task.name'] }).pipe( mergeMap(res => [ @@ -95,7 +98,7 @@ export class QueuesEffect { filter(([, queue]) => !!queue), switchMap(([action, queue]) => this.queuesApi.queuesGetAllEx({ id: [queue.id], - // eslint-disable-next-line @typescript-eslint/naming-convention + only_fields: ['*', 'entries.task.name'] }).pipe( mergeMap(res => [ @@ -112,7 +115,7 @@ export class QueuesEffect { { data: { title: 'Delete Queue', - body: `Are you sure you would like to delete the "${action.queue.name}" queue?`, + body: `Are you sure you would like to delete the "${escape(action.queue.name)}" queue?`, centerText: true, yes: 'Delete', no: 'Cancel', @@ -133,10 +136,8 @@ export class QueuesEffect { clearQueue = createEffect(() => this.actions.pipe( ofType(queueActions.clearQueue), - switchMap(action => this.tasksApi.tasksDequeueMany({ - ids: action.queue.entries.map(ent => (ent.task as unknown as {id: string})?.id), - // eslint-disable-next-line @typescript-eslint/naming-convention - remove_from_all_queues: true + switchMap(action => this.queuesApi.queuesClearQueue({ + queue: action.queue.id }).pipe( concatLatestFrom(() => [this.store.select(selectSelectedQueue)]), mergeMap(([, selectedQueue]) => [ @@ -144,7 +145,10 @@ export class QueuesEffect { ...(selectedQueue ? [queueActions.refreshSelectedQueue({})] : []), deactivateLoader(action.type) ]), - catchError(err => [deactivateLoader(action.type), requestFailed(err), addMessage(MESSAGES_SEVERITY.ERROR, 'Clear queue failed')]) + catchError(err => [ + deactivateLoader(action.type), + requestFailed(err), + addMessage(MESSAGES_SEVERITY.ERROR, 'Clear queue failed')]) )) )); @@ -156,7 +160,10 @@ export class QueuesEffect { task: action.task }).pipe( map(() => queueActions.refreshSelectedQueue({})), - catchError(err => [deactivateLoader(action.type), requestFailed(err), addMessage(MESSAGES_SEVERITY.ERROR, 'Move Experiment failed')]) + catchError(err => [ + deactivateLoader(action.type), + requestFailed(err), + addMessage(MESSAGES_SEVERITY.ERROR, 'Move Experiment failed')]) )) )); @@ -168,7 +175,9 @@ export class QueuesEffect { task: action.task }).pipe( map(() => queueActions.refreshSelectedQueue({})), - catchError(err => [deactivateLoader(action.type), requestFailed(err), addMessage(MESSAGES_SEVERITY.ERROR, 'Move Experiment failed')]) + catchError(err => [deactivateLoader(action.type), + requestFailed(err), + addMessage(MESSAGES_SEVERITY.ERROR, 'Move Experiment failed')]) )) )); @@ -182,17 +191,22 @@ export class QueuesEffect { count: (action.count) }).pipe( map(() => queueActions.refreshSelectedQueue({})), - catchError(err => [queueActions.refreshSelectedQueue({}), deactivateLoader(action.type), requestFailed(err), addMessage(MESSAGES_SEVERITY.ERROR, 'Move Queue failed')]) + catchError(err => [ + queueActions.refreshSelectedQueue({}), + deactivateLoader(action.type), + requestFailed(err), + addMessage(MESSAGES_SEVERITY.ERROR, 'Move Queue failed')]) ) ), )); removeExperimentFromQueue = createEffect(() => this.actions.pipe( ofType(queueActions.removeExperimentFromQueue), - switchMap((action) => this.tasksApi.tasksDequeue({ + concatLatestFrom(() => this.store.select(selectSelectedQueue)), + switchMap(([action, queue]) => this.queuesApi.queuesRemoveTask({ task: action.task, - // eslint-disable-next-line @typescript-eslint/naming-convention - remove_from_all_queues: true + queue: queue.id, + update_task_status: true }).pipe( map(() => queueActions.refreshSelectedQueue({})), catchError(err => [deactivateLoader(action.type), requestFailed(err), @@ -204,7 +218,7 @@ export class QueuesEffect { ofType(queueActions.moveExperimentToOtherQueue), concatLatestFrom(() => this.store.select(selectSelectedQueue)), switchMap(([action, queue]) => this.queuesApi.queuesRemoveTask({queue: queue.id, task: action.task}).pipe( - map(() => queueActions.addExperimentToQueue({task: action.task, queue: action.queue})), + map(() => queueActions.addExperimentToQueue({task: action.task, queueId: action.queueId, queueName: action.queueName})), catchError(err => [deactivateLoader(action.type), requestFailed(err), addMessage(MESSAGES_SEVERITY.ERROR, 'Move Queue to other queue failed')]) ) @@ -213,9 +227,15 @@ export class QueuesEffect { addExperimentToQueue = createEffect(() => this.actions.pipe( ofType(queueActions.addExperimentToQueue), - switchMap((action) => this.queuesApi.queuesAddTask({queue: action.queue, task: action.task}).pipe( + switchMap((action)=> action.queueId? of(action): this.queuesApi.queuesCreate({name: action.queueName}).pipe( + map((res)=> {return {...action, queueId: res.id}}) + )), + switchMap((action) => this.queuesApi.queuesAddTask({queue: action.queueId, task: action.task}).pipe( mergeMap(() => [queueActions.refreshSelectedQueue({}), queueActions.getQueues()]), - catchError(err => [deactivateLoader(action.type), requestFailed(err), addMessage(MESSAGES_SEVERITY.ERROR, 'Add experiment to queue failed')]) + catchError(err => [ + deactivateLoader(action.type), + requestFailed(err), + addMessage(MESSAGES_SEVERITY.ERROR, 'Add experiment to queue failed')]) ) ) )); @@ -232,13 +252,13 @@ export class QueuesEffect { const granularity = Math.max(Math.floor(range / action.maxPoints), queue ? 10 : 40); const req: QueuesGetQueueMetricsRequest = { - /* eslint-disable @typescript-eslint/naming-convention */ + from_date: now - range, to_date: now, queue_ids: queue ? [queue.id] : undefined, interval: granularity }; - /* eslint-enable @typescript-eslint/naming-convention */ + return this.queuesApi.queuesGetQueueMetrics(req).pipe( mergeMap((res: QueuesGetQueueMetricsResponse) => { let newStats = {wait: null, length: null}; @@ -254,7 +274,7 @@ export class QueuesEffect { if (res.queues.length) { newQueue = res.queues[0]; } else { - // eslint-disable-next-line @typescript-eslint/naming-convention + newQueue = {dates: [], avg_waiting_times: [], queue_lengths: []}; } const waitData = [{ @@ -292,7 +312,13 @@ export class QueuesEffect { addFullRangeMarkers(newStats.length, now - range, now); } } - return [deactivateLoader(action.type), queueActions.setStats({data: newStats}), hideNoStatsNotice()]; + return [ + deactivateLoader(action.type), + queueActions.setStats({data: newStats}), + queueActions.getQueues(), + queueActions.refreshSelectedQueue({autoRefresh: true}), + hideNoStatsNotice() + ]; }), catchError(err => [deactivateLoader(action.type), queueActions.setStats({data: {wait: [], length: []}}), 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 b3c83390..af51b167 100755 --- a/src/app/webapp-common/workers-and-queues/effects/workers.effects.ts +++ b/src/app/webapp-common/workers-and-queues/effects/workers.effects.ts @@ -1,5 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Action, Store} from '@ngrx/store'; import {castArray, cloneDeep} from 'lodash-es'; import {catchError, map, mergeMap, switchMap} from 'rxjs/operators'; diff --git a/src/app/webapp-common/workers-and-queues/reducers/index.reducer.ts b/src/app/webapp-common/workers-and-queues/reducers/index.reducer.ts index a26b347d..867690c0 100755 --- a/src/app/webapp-common/workers-and-queues/reducers/index.reducer.ts +++ b/src/app/webapp-common/workers-and-queues/reducers/index.reducer.ts @@ -3,6 +3,7 @@ import {reducer as queuesReducer, State as QueuesState} from './queues.reducer'; import {workersReducer, WorkersState} from './workers.reducer'; import {statsReducer, StatsState} from './stats.reducer'; import {selectRouterQueryParams} from '@common/core/reducers/router-reducer'; +import {WorkerExt} from '@common/workers-and-queues/actions/workers.actions'; interface State { workers: WorkersState, @@ -28,7 +29,7 @@ export const selectQueuesStatsTimeFrame = createSelector(selectQueuesState, sta export const selectQueuesTableSortFields = createSelector(selectQueuesState, state => state.tableSortFields); export const selectWorkersState = createSelector(workersAndQueues, state => state.workers); -export const selectWorkers = createSelector(selectWorkersState, state => state.data); +export const selectWorkers = createSelector(selectWorkersState, state => state.data as WorkerExt[]); export const selectStats = createSelector(selectWorkersState, state => state.stats); export const selectSelectedWorker = createSelector(selectWorkersState, state => state.selectedWorker); export const selectWorkersTableSortFields = createSelector(selectWorkersState, state => state.tableSortFields); diff --git a/src/environments/base.ts b/src/environments/base.ts index 6e7b3f86..896127cd 100644 --- a/src/environments/base.ts +++ b/src/environments/base.ts @@ -60,6 +60,7 @@ export interface Environment { baseHref?: string; displayTips: boolean; onlyPasswordLogin: boolean; + blockUserScript?: boolean; } export const BASE_ENV = { @@ -88,7 +89,7 @@ export const BASE_ENV = { hideUpdateNotice: false, showSurvey: false, accountAdministration: false, - useFilesProxy: false, + useFilesProxy: true, legal: {TOULink: 'https://allegro.ai/legal-platform-tou/'}, plotlyURL: 'app/webapp-common/assets/plotly-2.31.1.min.js', slackLink: 'https://joinslack.clear.ml', diff --git a/tsconfig.json b/tsconfig.json index bba30388..be9903ea 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -33,7 +33,7 @@ "~/*": [ "app/*" ] - }, + } }, "angularCompilerOptions": { "enableI18nLegacyMessageIdFormat": false,