From d81819a3a22b3c29ab0e4d4b08caf9c481ea535b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 08:04:47 +0000 Subject: [PATCH 1/2] feat(Dependencies): Update typescript-eslint monorepo to v8 | datasource | package | from | to | | ---------- | -------------------------------- | ------ | ----- | | npm | @typescript-eslint/eslint-plugin | 7.18.0 | 8.1.0 | | npm | @typescript-eslint/parser | 7.18.0 | 8.1.0 | --- package-lock.json | 226 +++++++++++----------------------------------- package.json | 6 +- 2 files changed, 56 insertions(+), 176 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2fbdf56dca..cb47763483 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@denbi/cloud-portal-webapp", - "version": "4.855.0", + "version": "4.856.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@denbi/cloud-portal-webapp", - "version": "4.855.0", + "version": "4.856.0", "dependencies": { "@angular-eslint/eslint-plugin": "^18.3.0", "@angular/animations": "18.2.0", @@ -79,8 +79,8 @@ "@playwright/test": "1.46.0", "@types/jasmine": "5.1.4", "@types/node": "20.14.15", - "@typescript-eslint/eslint-plugin": "^7.2.0", - "@typescript-eslint/parser": "^7.2.0", + "@typescript-eslint/eslint-plugin": "^8.0.0", + "@typescript-eslint/parser": "^8.0.0", "async": "3.2.5", "audit-ci": "6.6.1", "autoprefixer": "10.4.20", @@ -5999,31 +5999,32 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz", - "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.1.0.tgz", + "integrity": "sha512-LlNBaHFCEBPHyD4pZXb35mzjGkuGKXU5eeCA1SxvHfiRES0E82dOounfVpL4DCqYvJEKab0bZIA0gCRpdLKkCw==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.18.0", - "@typescript-eslint/type-utils": "7.18.0", - "@typescript-eslint/utils": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0", + "@typescript-eslint/scope-manager": "8.1.0", + "@typescript-eslint/type-utils": "8.1.0", + "@typescript-eslint/utils": "8.1.0", + "@typescript-eslint/visitor-keys": "8.1.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": "^7.0.0", - "eslint": "^8.56.0" + "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -6031,49 +6032,28 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz", - "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.18.0", - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/typescript-estree": "7.18.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/parser": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz", - "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.1.0.tgz", + "integrity": "sha512-U7iTAtGgJk6DPX9wIWPPOlt1gO57097G06gIcl0N0EEnNw8RGD62c+2/DiP/zL7KrkqnnqF7gtFGR7YgzPllTA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "7.18.0", - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/typescript-estree": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0", + "@typescript-eslint/scope-manager": "8.1.0", + "@typescript-eslint/types": "8.1.0", + "@typescript-eslint/typescript-estree": "8.1.0", + "@typescript-eslint/visitor-keys": "8.1.0", "debug": "^4.3.4" }, "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": { - "eslint": "^8.56.0" + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -6082,16 +6062,16 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz", - "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==", - "dev": true, + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.1.0.tgz", + "integrity": "sha512-DsuOZQji687sQUjm4N6c9xABJa7fjvfIdjqpSIIVOgaENf2jFXiM9hIBZOL3hb6DHK9Nvd2d7zZnoMLf9e0OtQ==", + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0" + "@typescript-eslint/types": "8.1.0", + "@typescript-eslint/visitor-keys": "8.1.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -6099,61 +6079,37 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz", - "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.1.0.tgz", + "integrity": "sha512-oLYvTxljVvsMnldfl6jIKxTaU7ok7km0KDrwOt1RHYu6nxlhN3TIx8k5Q52L6wR33nOwDgM7VwW1fT1qMNfFIA==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "7.18.0", - "@typescript-eslint/utils": "7.18.0", + "@typescript-eslint/typescript-estree": "8.1.0", + "@typescript-eslint/utils": "8.1.0", "debug": "^4.3.4", "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": { - "eslint": "^8.56.0" - }, "peerDependenciesMeta": { "typescript": { "optional": true } } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz", - "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.18.0", - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/typescript-estree": "7.18.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/types": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz", - "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==", - "dev": true, + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.1.0.tgz", + "integrity": "sha512-q2/Bxa0gMOu/2/AKALI0tCKbG2zppccnRIRCW6BaaTlRVaPKft4oVYPp7WOPpcnsgbr0qROAVCVKCvIQ0tbWog==", + "license": "MIT", "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -6161,13 +6117,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz", - "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==", - "dev": true, + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.1.0.tgz", + "integrity": "sha512-NTHhmufocEkMiAord/g++gWKb0Fr34e9AExBRdqgWdVBaKoei2dIyYKD9Q0jBnvfbEA5zaf8plUFMUH6kQ0vGg==", + "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0", + "@typescript-eslint/types": "8.1.0", + "@typescript-eslint/visitor-keys": "8.1.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -6176,7 +6132,7 @@ "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", @@ -6192,7 +6148,6 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.1.0.tgz", "integrity": "sha512-ypRueFNKTIFwqPeJBfeIpxZ895PQhNyH4YID6js0UoBImWYoSjBsahUn9KMiJXh94uOjVBgHD9AmkyPsPnFwJA==", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@typescript-eslint/scope-manager": "8.1.0", @@ -6210,69 +6165,11 @@ "eslint": "^8.57.0 || ^9.0.0" } }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.1.0.tgz", - "integrity": "sha512-DsuOZQji687sQUjm4N6c9xABJa7fjvfIdjqpSIIVOgaENf2jFXiM9hIBZOL3hb6DHK9Nvd2d7zZnoMLf9e0OtQ==", - "peer": true, - "dependencies": { - "@typescript-eslint/types": "8.1.0", - "@typescript-eslint/visitor-keys": "8.1.0" - }, - "engines": { - "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/types": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.1.0.tgz", - "integrity": "sha512-q2/Bxa0gMOu/2/AKALI0tCKbG2zppccnRIRCW6BaaTlRVaPKft4oVYPp7WOPpcnsgbr0qROAVCVKCvIQ0tbWog==", - "peer": true, - "engines": { - "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": "8.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.1.0.tgz", - "integrity": "sha512-NTHhmufocEkMiAord/g++gWKb0Fr34e9AExBRdqgWdVBaKoei2dIyYKD9Q0jBnvfbEA5zaf8plUFMUH6kQ0vGg==", - "peer": true, - "dependencies": { - "@typescript-eslint/types": "8.1.0", - "@typescript-eslint/visitor-keys": "8.1.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^1.3.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/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { + "node_modules/@typescript-eslint/visitor-keys": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.1.0.tgz", "integrity": "sha512-ba0lNI19awqZ5ZNKh6wCModMwoZs457StTebQ0q1NP58zSi2F6MOZRXwfKZy+jB78JNJ/WH8GSh2IQNzXX8Nag==", - "peer": true, + "license": "MIT", "dependencies": { "@typescript-eslint/types": "8.1.0", "eslint-visitor-keys": "^3.4.3" @@ -6285,23 +6182,6 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz", - "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "7.18.0", - "eslint-visitor-keys": "^3.4.3" - }, - "engines": { - "node": "^18.18.0 || >=20.0.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", diff --git a/package.json b/package.json index 6c4264d829..ea4bffbb64 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@denbi/cloud-portal-webapp", - "version": "4.855.0", + "version": "4.856.0", "description": "de.NBI Cloud Portal", "scripts": { "ng": "ng serve", @@ -89,8 +89,8 @@ "@playwright/test": "1.46.0", "@types/jasmine": "5.1.4", "@types/node": "20.14.15", - "@typescript-eslint/eslint-plugin": "^7.2.0", - "@typescript-eslint/parser": "^7.2.0", + "@typescript-eslint/eslint-plugin": "^8.0.0", + "@typescript-eslint/parser": "^8.0.0", "async": "3.2.5", "audit-ci": "6.6.1", "autoprefixer": "10.4.20", From c6738cd2db80c69cb603f63e9eba4a2fe65329bb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 08:06:07 +0000 Subject: [PATCH 2/2] fix(Linting):blacked code --- .husky/pre-commit | 4 +--- package.json | 7 +++---- src/app/api-connector/group.service.ts | 8 ++++---- src/app/api-connector/news.service.ts | 4 ++-- src/app/api-connector/playbook.service.ts | 2 +- .../applications/type-overview.component.ts | 18 +++++++++--------- src/app/shared/breadcrumb.component.ts | 2 +- .../application-base-class.component.ts | 2 +- .../virtualmachines/conda/res-env.component.ts | 2 +- .../virtualmachines/flavordetail.component.ts | 2 +- .../imageCarouselSlide.component.ts | 2 +- .../virtualmachines/imagedetail.component.ts | 2 +- .../number-charts/number-charts.component.ts | 6 +++--- 13 files changed, 29 insertions(+), 32 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 3b608ae656..0cd82b6522 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,3 +1 @@ -#!/bin/sh - -npx lint-staged +yarn \ No newline at end of file diff --git a/package.json b/package.json index ea4bffbb64..fca477e26a 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "e2e": "npm-run-all -p -r webdriver-start protractor", "pree2e": "webdriver-manager update --standalone false --gecko false --quiet", "compodoc": "./node_modules/.bin/compodoc -p src/tsconfig.app.json", - "prepare": "husky init" + "prepare": "husky" }, "resolutions": {}, "private": true, @@ -123,8 +123,7 @@ "url-loader": "4.1.1", "webpack-cli": "5.1.4" }, - "overrides": { - }, + "overrides": {}, "lint-staged": { "*.{js,jsx,ts}": [ "prettier --write", @@ -136,4 +135,4 @@ "*.js": "eslint --cache --fix", "*.{js,css,md}": "prettier --write" } -} \ No newline at end of file +} diff --git a/src/app/api-connector/group.service.ts b/src/app/api-connector/group.service.ts index 0122236ca0..044f03284a 100644 --- a/src/app/api-connector/group.service.ts +++ b/src/app/api-connector/group.service.ts @@ -18,14 +18,14 @@ export class GroupService { this.http = http; } - toggleVisibility(groupId: string | number): Observable { - return this.http.post(`${ApiSettings.getApiBaseURL()}projects/${groupId}/toggle_member_names_visibility/`, { + toggleVisibility(groupId: string | number): Observable { + return this.http.post(`${ApiSettings.getApiBaseURL()}projects/${groupId}/toggle_member_names_visibility/`, { withCredentials: true, }); } - toggleStartingMachines(groupId: string | number): Observable { - return this.http.post(`${ApiSettings.getApiBaseURL()}projects/${groupId}/toggle_starting_machines/`, { + toggleStartingMachines(groupId: string | number): Observable { + return this.http.post(`${ApiSettings.getApiBaseURL()}projects/${groupId}/toggle_starting_machines/`, { withCredentials: true, }); } diff --git a/src/app/api-connector/news.service.ts b/src/app/api-connector/news.service.ts index 883f784644..50d1363400 100644 --- a/src/app/api-connector/news.service.ts +++ b/src/app/api-connector/news.service.ts @@ -50,8 +50,8 @@ export class NewsService { }); } - getFacilitiesFromWagtail(): Observable { - return this.http.get(`${ApiSettings.getApiBaseURL()}facility-management/`, { + getFacilitiesFromWagtail(): Observable { + return this.http.get(`${ApiSettings.getApiBaseURL()}facility-management/`, { withCredentials: true, }); } diff --git a/src/app/api-connector/playbook.service.ts b/src/app/api-connector/playbook.service.ts index 60d0f7ccd1..ea796be4da 100644 --- a/src/app/api-connector/playbook.service.ts +++ b/src/app/api-connector/playbook.service.ts @@ -17,7 +17,7 @@ export class PlaybookService { getPlaybookForVM(vm_id: string): Observable { - return this.http.get(`${this.baseUrl}${vm_id}/`, { + return this.http.get(`${this.baseUrl}${vm_id}/`, { withCredentials: true, }); } diff --git a/src/app/applications/type-overview.component.ts b/src/app/applications/type-overview.component.ts index 13378e1502..e0d8d0d2b1 100644 --- a/src/app/applications/type-overview.component.ts +++ b/src/app/applications/type-overview.component.ts @@ -22,19 +22,19 @@ export class TypeOverviewComponent implements OnInit { kubernetes_color: string = '#326ce5'; is_vo_admin: boolean = is_vo; - simpleVM_logo_link: String; - simpleVM_ease_logo: String; - simpleVM_curve_logo: String; - simpleVM_remote_logo: String; + simpleVM_logo_link: string; + simpleVM_ease_logo: string; + simpleVM_curve_logo: string; + simpleVM_remote_logo: string; kubernetes_logo_link: string; kubernetes_logo_border: string; - openstack_logo_link: String; - openstack_api_logo: String; - openstack_conf_logo: String; - openstack_scale_logo: String; - static_img_folder: String = 'static/webapp/assets/img/'; + openstack_logo_link: string; + openstack_api_logo: string; + openstack_conf_logo: string; + openstack_scale_logo: string; + static_img_folder: string = 'static/webapp/assets/img/'; WIKI_WORKSHOPS: string = WIKI_WORKSHOPS; SIMPLE_VM_LINK: string = SIMPLE_VM_LINK; diff --git a/src/app/shared/breadcrumb.component.ts b/src/app/shared/breadcrumb.component.ts index 63350b81fe..d1fca443d4 100644 --- a/src/app/shared/breadcrumb.component.ts +++ b/src/app/shared/breadcrumb.component.ts @@ -17,7 +17,7 @@ import { filter } from 'rxjs/operators'; `, }) export class BreadcrumbsComponent implements OnInit { - breadcrumbs: Object[]; + breadcrumbs: object[]; constructor(private router: Router, private route: ActivatedRoute) { this.router = router; diff --git a/src/app/shared/shared_modules/baseClass/application-base-class.component.ts b/src/app/shared/shared_modules/baseClass/application-base-class.component.ts index cf49e0cb30..d7d868746c 100644 --- a/src/app/shared/shared_modules/baseClass/application-base-class.component.ts +++ b/src/app/shared/shared_modules/baseClass/application-base-class.component.ts @@ -84,7 +84,7 @@ export class ApplicationBaseClassComponent extends AbstractBaseClass { /** * */ - constantStrings: Object; + constantStrings: object; /** * List of flavors. diff --git a/src/app/virtualmachines/conda/res-env.component.ts b/src/app/virtualmachines/conda/res-env.component.ts index 86bec728f3..72b2df9863 100644 --- a/src/app/virtualmachines/conda/res-env.component.ts +++ b/src/app/virtualmachines/conda/res-env.component.ts @@ -26,7 +26,7 @@ export class ResEnvComponent implements OnInit, OnChanges, OnDestroy { @Input() blockedImageTagsResenv: BlockedImageTagResenv[]; @Input() workshopMode: boolean = false; - Object: Object = Object; + Object: object = Object; templates_to_block: string[] = []; diff --git a/src/app/virtualmachines/flavordetail.component.ts b/src/app/virtualmachines/flavordetail.component.ts index 3d484b4d10..1f59027d8f 100644 --- a/src/app/virtualmachines/flavordetail.component.ts +++ b/src/app/virtualmachines/flavordetail.component.ts @@ -57,7 +57,7 @@ export class FlavorDetailComponent implements OnInit, OnChanges { // icons for graphics within flavor cards: - STATIC_IMG_FOLDER: String = 'static/webapp/assets/img/'; + STATIC_IMG_FOLDER: string = 'static/webapp/assets/img/'; CPU_ICON_PATH: string = `${this.STATIC_IMG_FOLDER}/new_instance/cpu_icon.svg`; RAM_ICON_PATH: string = `${this.STATIC_IMG_FOLDER}/new_instance/ram_icon.svg`; diff --git a/src/app/virtualmachines/imageCarouselSlide.component.ts b/src/app/virtualmachines/imageCarouselSlide.component.ts index f70acfe60b..0c927a6bf9 100644 --- a/src/app/virtualmachines/imageCarouselSlide.component.ts +++ b/src/app/virtualmachines/imageCarouselSlide.component.ts @@ -23,7 +23,7 @@ export class ImageCarouselSlideComponent implements OnInit { object_fit_scale: string = 'scale'; image_visible: boolean = true; regexp_data_test_id: RegExp = /[ ().]/g; - STATIC_IMG_FOLDER: String = 'static/webapp/assets/img/'; + STATIC_IMG_FOLDER: string = 'static/webapp/assets/img/'; RAM_ICON_PATH: string = `${this.STATIC_IMG_FOLDER}/new_instance/ram_icon.svg`; STORAGE_ICON_PATH: string = `${this.STATIC_IMG_FOLDER}/new_instance/storage_icon.svg`; diff --git a/src/app/virtualmachines/imagedetail.component.ts b/src/app/virtualmachines/imagedetail.component.ts index 4af039c381..519f906386 100644 --- a/src/app/virtualmachines/imagedetail.component.ts +++ b/src/app/virtualmachines/imagedetail.component.ts @@ -65,7 +65,7 @@ export class ImageDetailComponent implements OnInit, OnDestroy { } } - STATIC_IMG_FOLDER: String = 'static/webapp/assets/img/'; + STATIC_IMG_FOLDER: string = 'static/webapp/assets/img/'; RAM_ICON_PATH: string = `${this.STATIC_IMG_FOLDER}/new_instance/ram_icon.svg`; STORAGE_ICON_PATH: string = `${this.STATIC_IMG_FOLDER}/new_instance/storage_icon.svg`; diff --git a/src/app/vo_manager/number-charts/number-charts.component.ts b/src/app/vo_manager/number-charts/number-charts.component.ts index d6cbcd89c4..52648f88ca 100644 --- a/src/app/vo_manager/number-charts/number-charts.component.ts +++ b/src/app/vo_manager/number-charts/number-charts.component.ts @@ -73,7 +73,7 @@ export class NumberChartsComponent implements OnInit { getData(): void { /* tslint:disable */ this.numbersService.getProjectCounterTimeline().subscribe( - (result: Object[]): void => { + (result: object[]): void => { result.forEach((valuePack: any): void => { this.runningOpenstack.push(valuePack['running_openstack']); this.runningSimpleVM.push(valuePack['running_simple_vm']); @@ -89,8 +89,8 @@ export class NumberChartsComponent implements OnInit { ); this.numbersService.getRamCoresTimeline().subscribe( - (result: Object[]): void => { - result.forEach((valuePack: Object): void => { + (result: object[]): void => { + result.forEach((valuePack: object): void => { this.openstackCores.push(valuePack['openstack_cores']); this.openstackRam.push(valuePack['openstack_ram']); this.simpleVMCores.push(valuePack['simple_vm_cores']);