diff --git a/README.md b/README.md index d49aa9dec1..d00d11eb12 100644 --- a/README.md +++ b/README.md @@ -71,4 +71,3 @@ Tested with Browserstack ## License The work done has been licensed under Apache License 2.0. The license file can be found [here](LICENSE). - diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts deleted file mode 100644 index d4b5478234..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { KubernetesNodePodsListConfigService } from '../../list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service'; - -@Component({ - selector: 'app-kubernetes-node-pods', - templateUrl: './kubernetes-node-pods.component.html', - styleUrls: ['./kubernetes-node-pods.component.scss'], - providers: [{ - provide: ListConfig, - useClass: KubernetesNodePodsListConfigService, - }] -}) -export class KubernetesNodePodsComponent {} diff --git a/deploy/ci/tasks/dev-releases/create-chart-helper.sh b/deploy/ci/tasks/dev-releases/create-chart-helper.sh index a08c7e13f6..2c8b5218f1 100644 --- a/deploy/ci/tasks/dev-releases/create-chart-helper.sh +++ b/deploy/ci/tasks/dev-releases/create-chart-helper.sh @@ -81,8 +81,8 @@ patchHelmChartAppVersion() { local CHART_PATH=$1 local STRATOS_FOLDER=$2 - if [ -f "${STRATOS_FOLDER}/custom-src/stratos.yaml" ]; then - PROD_VERSION=$(cat "${STRATOS_FOLDER}/custom-src/stratos.yaml" | grep "productVersion") + if [ -f "${STRATOS_FOLDER}/stratos.yaml" ]; then + PROD_VERSION=$(cat "${STRATOS_FOLDER}/stratos.yaml" | grep "productVersion") if [ ! -z "${PROD_VERSION}" ]; then PROD_VERSION=$(echo $PROD_VERSION | grep --extended --only-matching '[0-9\.]+') if [ ! -z "${PROD_VERSION}" ]; then diff --git a/deploy/ci/tasks/dev-releases/create-chart.yml b/deploy/ci/tasks/dev-releases/create-chart.yml index 043e6be351..9cb8935fd7 100644 --- a/deploy/ci/tasks/dev-releases/create-chart.yml +++ b/deploy/ci/tasks/dev-releases/create-chart.yml @@ -38,9 +38,9 @@ run: updateHelmDependency # Run customization script if there is one - if [ -f "${STRATOS}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then + if [ -f "${STRATOS}/deploy/kubernetes/custom/customize-helm.sh" ]; then echo "Applying Helm Chart customizations" - ${STRATOS}/custom-src/deploy/kubernetes/customize-helm.sh "${STRATOS}/deploy/kubernetes/console" + ${STRATOS}/deploy/kubernetes/custom/customize-helm.sh "${STRATOS}/deploy/kubernetes/console" fi # Generate imagelist diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh index 1b19bf1408..f838cc3549 100755 --- a/deploy/kubernetes/build.sh +++ b/deploy/kubernetes/build.sh @@ -137,8 +137,8 @@ __DIRNAME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" STRATOS_PATH=${__DIRNAME}/../../ source "${STRATOS_PATH}/deploy/common-build.sh" -if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/custom-build.sh" ]; then - source "${STRATOS_PATH}/custom-src/deploy/kubernetes/custom-build.sh" +if [ -f "${STRATOS_PATH}/deploy/kubernetes/custom/custom-build.sh" ]; then + source "${STRATOS_PATH}/deploy/kubernetes/custom/custom-build.sh" HAS_CUSTOM_BUILD="true" fi @@ -238,9 +238,9 @@ rm -rf "${DEST_HELM_CHART_PATH}/**/*.orig" # Run customization script if there is one # This can do things like provide a custom __stratos.tpl file -if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then +if [ -f "${STRATOS_PATH}/deploy/kubernetes/custom/customize-helm.sh" ]; then printf "${YELLOW}${BOLD}Applying Helm Chart customizations${RESET}\n" - "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" "${DEST_HELM_CHART_PATH}" + "${STRATOS_PATH}/deploy/kubernetes/custom/customize-helm.sh" "${DEST_HELM_CHART_PATH}" fi # Fetch subcharts diff --git a/deploy/kubernetes/console/Chart.yaml b/deploy/kubernetes/console/Chart.yaml index c12c15f631..22538c426e 100644 --- a/deploy/kubernetes/console/Chart.yaml +++ b/deploy/kubernetes/console/Chart.yaml @@ -5,4 +5,4 @@ version: 0.1.0 appVersion: 0.1.0 sources: - https://github.com/cloudfoundry/stratos -icon: https://github.com/cloudfoundry/stratos/raw/master/deploy/kubernetes/console/icon.png \ No newline at end of file +icon: https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/console/icon.png \ No newline at end of file diff --git a/custom-src/deploy/kubernetes/__stratos.tpl b/deploy/kubernetes/custom/__stratos.tpl similarity index 100% rename from custom-src/deploy/kubernetes/__stratos.tpl rename to deploy/kubernetes/custom/__stratos.tpl diff --git a/custom-src/deploy/kubernetes/custom-build.sh b/deploy/kubernetes/custom/custom-build.sh similarity index 100% rename from custom-src/deploy/kubernetes/custom-build.sh rename to deploy/kubernetes/custom/custom-build.sh diff --git a/custom-src/deploy/kubernetes/customize-helm.sh b/deploy/kubernetes/custom/customize-helm.sh similarity index 94% rename from custom-src/deploy/kubernetes/customize-helm.sh rename to deploy/kubernetes/custom/customize-helm.sh index e57c571440..674ec4f99a 100755 --- a/custom-src/deploy/kubernetes/customize-helm.sh +++ b/deploy/kubernetes/custom/customize-helm.sh @@ -30,8 +30,8 @@ echo -e "${CYAN}Patching Chart.yaml${RESET}" sed -i.bak -e 's@https://github.com/cloudfoundry/stratos@https://github.com/SUSE/stratos@g' ${CHART_PATH}/Chart.yaml # Change the URL of the icon to be the SUSE one -ICON_URL="https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/icon.png" -SUSE_ICON_URL="https://raw.githubusercontent.com/SUSE/stratos/custom-src/deploy/kubernetes/icon.png" +ICON_URL="https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/console/icon.png" +SUSE_ICON_URL="https://raw.githubusercontent.com/SUSE/stratos/master/deploy/kubernetes/custom/icon.png" sed -i.bak -e 's@'"${ICON_URL}"'@'"${SUSE_ICON_URL}"'@g' ${CHART_PATH}/Chart.yaml SRC="A Helm chart for deploying Stratos UI Console" diff --git a/custom-src/deploy/kubernetes/icon.png b/deploy/kubernetes/custom/icon.png similarity index 100% rename from custom-src/deploy/kubernetes/icon.png rename to deploy/kubernetes/custom/icon.png diff --git a/custom-src/deploy/kubernetes/imagelist.txt b/deploy/kubernetes/custom/imagelist.txt similarity index 100% rename from custom-src/deploy/kubernetes/imagelist.txt rename to deploy/kubernetes/custom/imagelist.txt diff --git a/deploy/kubernetes/imagelist-gen.sh b/deploy/kubernetes/imagelist-gen.sh index 1605cdb54d..a4bf5e5156 100755 --- a/deploy/kubernetes/imagelist-gen.sh +++ b/deploy/kubernetes/imagelist-gen.sh @@ -17,9 +17,9 @@ STRATOS_FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd ../../ && pwd )" # Add any customizations function addCustomizations() { - if [ -f "${STRATOS_FOLDER}/custom-src/deploy/kubernetes/imagelist.txt" ];then + if [ -f "${STRATOS_FOLDER}/deploy/kubernetes/custom/imagelist.txt" ];then echo "Including custom imagelist contents" - cat "${STRATOS_FOLDER}/custom-src/deploy/kubernetes/imagelist.txt" >> ./imagelist.txt + cat "${STRATOS_FOLDER}/deploy/kubernetes/custom/imagelist.txt" >> ./imagelist.txt # Update version number VERSION=$(grep -Po 'consoleVersion: \K(.*)' ./values.yaml) diff --git a/docs/customizing.md b/docs/customizing.md index e81f9ebabd..f0defe7d76 100644 --- a/docs/customizing.md +++ b/docs/customizing.md @@ -24,7 +24,7 @@ To aid in migrating we've provided these instructions. 1) Check that your ts config file defines the public api file. - `src/tsconfig.json` file's `compilerOptions/paths` section should contain something like `"@custom/extensions": ["frontend/packages/custom_extensions/src/public-api.ts"]`. 1) Check that your new package's package.json defines your custom module and if application custom-routing module. - - See `src/frontend/packages/suse_extensions/package.json` file's `stratos` section. + - See `src/frontend/packages/custom_extensions/package.json` file's `stratos` section. - Note your `routingModule` entry label should not have a preceding `_`. 1) Build Stratos in your usual way, for instance `npm run build`. - It could be that this fails due to TypeScript import issues, if so go through these and fix. diff --git a/examples/custom-src/frontend/assets/custom/acme_logo.png b/examples/custom-src/frontend/assets/custom/acme_logo.png deleted file mode 100644 index 397545f790..0000000000 Binary files a/examples/custom-src/frontend/assets/custom/acme_logo.png and /dev/null differ diff --git a/examples/custom-src/frontend/assets/eula.html b/examples/custom-src/frontend/assets/eula.html deleted file mode 100644 index 1f2241fe1c..0000000000 --- a/examples/custom-src/frontend/assets/eula.html +++ /dev/null @@ -1,5 +0,0 @@ -

AMCE Corp End User License Agreement

- -

PLEASE READ THIS AGREEMENT CAREFULLY.

- -

This is an exmaple EULA.

diff --git a/examples/custom-src/frontend/assets/login-bg.jpg b/examples/custom-src/frontend/assets/login-bg.jpg deleted file mode 100644 index 2b2e8e42f7..0000000000 Binary files a/examples/custom-src/frontend/assets/login-bg.jpg and /dev/null differ diff --git a/examples/custom-src/frontend/assets/logo.png b/examples/custom-src/frontend/assets/logo.png deleted file mode 100644 index 8129763913..0000000000 Binary files a/examples/custom-src/frontend/assets/logo.png and /dev/null differ diff --git a/examples/custom-src/frontend/favicon.ico b/examples/custom-src/frontend/favicon.ico deleted file mode 100644 index 60f452c054..0000000000 Binary files a/examples/custom-src/frontend/favicon.ico and /dev/null differ diff --git a/examples/custom-src/frontend/loading.css b/examples/custom-src/frontend/loading.css deleted file mode 100644 index 9633b127db..0000000000 --- a/examples/custom-src/frontend/loading.css +++ /dev/null @@ -1,38 +0,0 @@ -.stratos-initial-load-spinner-container { - align-items: center; - background-color: #0D2C40; - display: flex; - justify-content: center; - height: 100%; - left: 0; - position: absolute; - top: 0; - width: 100%; -} - -.stratos-initial-load-spinner-logo { - position: absolute; - height: 60px; -} - -.stratos-initial-load-spinner { - animation: stratos-initial-load-animate 1s infinite linear; - box-sizing: border-box; - border: 5px solid rgba(86, 107, 121, 0.45); - border-radius: 50%; - border-top-color: #00B2E2; - display: inline-block; - height: 128px; - margin: 0 auto; - width: 128px; -} - -@keyframes stratos-initial-load-animate { - 0% { - transform: rotate(0deg); - } - - 100% { - transform: rotate(359deg); - } -} diff --git a/examples/custom-src/frontend/loading.html b/examples/custom-src/frontend/loading.html deleted file mode 100644 index cf66894e7b..0000000000 --- a/examples/custom-src/frontend/loading.html +++ /dev/null @@ -1,3 +0,0 @@ -
- -
\ No newline at end of file diff --git a/examples/custom-src/frontend/sass/custom.scss b/examples/custom-src/frontend/sass/custom.scss deleted file mode 100644 index e3eb84c38a..0000000000 --- a/examples/custom-src/frontend/sass/custom.scss +++ /dev/null @@ -1,18 +0,0 @@ -// Custom ACME Theme - -// ACME Primary Material Design pallette -// From http://mcg.mbitson.com/#!?mcgpalette0=%233f51b5 -$acme-primary: (50: #e8eaf6, 100: #c5cbe9, 200: #9fa8da, 300: #7985cb, 400: #5c6bc0, 500: #3f51b5, 600: #394aae, 700: #3140a5, 800: #29379d, 900: #1b278d, A100: #c6cbff, A200: #939dff, A400: #606eff, A700: #4757ff, contrast: ( 50: #000000, 100: #000000, 200: #000000, 300: #000000, 400: #ffffff, 500: #ffffff, 600: #ffffff, 700: #ffffff, 800: #ffffff, 900: #ffffff, A100: #000000, A200: #000000, A400: #ffffff, A700: #ffffff, )); -$mat-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, )); - -// Common -$acme-theme-primary: mat-palette($acme-primary); -$acme-theme-warn: mat-palette($mat-red); - -// Dark Theme -$stratos-dark-theme: mat-dark-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn); - -// Default Theme -$stratos-theme: mat-light-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn); - -@import 'custom/acme'; diff --git a/examples/custom-src/frontend/sass/custom/acme-colors.scss b/examples/custom-src/frontend/sass/custom/acme-colors.scss deleted file mode 100644 index 878c2cda32..0000000000 --- a/examples/custom-src/frontend/sass/custom/acme-colors.scss +++ /dev/null @@ -1,7 +0,0 @@ -$acme-primary: #00c081; -$acme-secondary: #00243e; -$acme-text: #fff; -$acme-text-gray: #ccc; -$acme-button-gray: #888; -$acme-dark-blue: #06253a; -$acme-blue: #073155; diff --git a/examples/custom-src/frontend/sass/custom/acme.scss b/examples/custom-src/frontend/sass/custom/acme.scss deleted file mode 100644 index 75794ebb6e..0000000000 --- a/examples/custom-src/frontend/sass/custom/acme.scss +++ /dev/null @@ -1,71 +0,0 @@ -// Style overrides -// Acme Brand primary colour -$acme-primary-color: #035a97; - -// Secondary blue colour -$acme-secondary: #035a97; -$acme-text: #fff; -$acme-text-gray: #ccc; -$acme-dark-blue: #06253a; -$acme-blue: #073155; -$acme-side-nav: $acme-secondary; -$acme-side-nav-active: #003358; - -body.stratos { - app-page-subheader { - .page-subheader { - background-color: #fff; - color: #333; - } - } - - .page-header__divider { - color: #333; - } - - .page-header__menu-button-icon { - background-color: $acme-primary-color; - color: $acme-text; - } - - .mat-tab-nav-bar.mat-primary.mat-background-primary { - .mat-tab-links { - background-color: #fff; - color: #333; - } - .mat-tab-link { - color: #333; - } - .mat-ink-bar { - background-color: $acme-primary-color; - } - } - - .stratos-title__logo { - width: 160px; - } - - .page-header .mat-toolbar.mat-primary { - background-color: #fff; - color: #333; - } - - // Use Acme Blue Side Navigation - .side-nav, - .side-nav__top, - .side-nav__item--active:hover { - background-color: $acme-side-nav; - } - .side-nav__item--active, - .side-nav__item:hover { - background-color: $acme-side-nav-active; - } - .side-nav__bottom { - color: $acme-text-gray; - } - - // Show the text Stratos beneath the Acme logo - .stratos-title > .stratos-title__header { - display: inline-block; - } -} diff --git a/examples/custom-src/stratos.yaml b/examples/custom-src/stratos.yaml deleted file mode 100644 index d891b8a09c..0000000000 --- a/examples/custom-src/stratos.yaml +++ /dev/null @@ -1,2 +0,0 @@ -# Change the page title of the Stratos App -title: "ACME Stratos" \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index eec8e18f4e..348215c0d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2512,9 +2512,9 @@ } }, "@babel/helper-validator-identifier": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz", - "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==", + "version": "7.10.3", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz", + "integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==", "dev": true }, "@babel/types": { @@ -4060,8 +4060,7 @@ "arr-diff": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" }, "arr-filter": { "version": "1.1.2", @@ -4075,8 +4074,7 @@ "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" }, "arr-map": { "version": "2.0.2", @@ -4090,8 +4088,7 @@ "arr-union": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", - "dev": true + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" }, "array-each": { "version": "1.0.1", @@ -4183,8 +4180,7 @@ "array-unique": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, "arraybuffer.slice": { "version": "0.0.7", @@ -4268,8 +4264,7 @@ "assign-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", - "dev": true + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" }, "ast-types-flow": { "version": "0.0.7", @@ -4340,8 +4335,7 @@ "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "autoprefixer": { "version": "9.7.4", @@ -4532,7 +4526,6 @@ "version": "0.11.2", "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, "requires": { "cache-base": "^1.0.1", "class-utils": "^0.3.5", @@ -4547,7 +4540,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "requires": { "is-descriptor": "^1.0.0" } @@ -4556,7 +4548,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, "requires": { "kind-of": "^6.0.0" } @@ -4565,7 +4556,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, "requires": { "kind-of": "^6.0.0" } @@ -4574,7 +4564,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, "requires": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -5191,7 +5180,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true, "requires": { "collection-visit": "^1.0.0", "component-emitter": "^1.2.1", @@ -5460,7 +5448,6 @@ "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "dev": true, "requires": { "arr-union": "^3.1.0", "define-property": "^0.2.5", @@ -5472,7 +5459,6 @@ "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -5697,7 +5683,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "dev": true, "requires": { "map-visit": "^1.0.0", "object-visit": "^1.0.0" @@ -5786,8 +5771,7 @@ "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, "component-inherit": { "version": "0.0.3", @@ -5957,8 +5941,7 @@ "copy-descriptor": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "copy-props": { "version": "2.0.4", @@ -6121,8 +6104,7 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cosmiconfig": { "version": "5.2.1", @@ -6705,7 +6687,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -6724,8 +6705,7 @@ "decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", - "dev": true + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, "decompress-response": { "version": "3.3.0", @@ -6853,7 +6833,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, "requires": { "is-descriptor": "^1.0.2", "isobject": "^3.0.1" @@ -6863,7 +6842,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, "requires": { "kind-of": "^6.0.0" } @@ -6872,7 +6850,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, "requires": { "kind-of": "^6.0.0" } @@ -6881,7 +6858,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, "requires": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -7947,7 +7923,6 @@ "version": "2.1.4", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, "requires": { "debug": "^2.3.3", "define-property": "^0.2.5", @@ -7962,7 +7937,6 @@ "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -7971,7 +7945,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -8049,7 +8022,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, "requires": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -8059,7 +8031,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, "requires": { "is-plain-object": "^2.0.4" } @@ -8081,7 +8052,6 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, "requires": { "array-unique": "^0.3.2", "define-property": "^1.0.0", @@ -8097,7 +8067,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "requires": { "is-descriptor": "^1.0.0" } @@ -8106,7 +8075,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -8115,7 +8083,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, "requires": { "kind-of": "^6.0.0" } @@ -8124,7 +8091,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, "requires": { "kind-of": "^6.0.0" } @@ -8133,7 +8099,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, "requires": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -8601,8 +8566,7 @@ "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" }, "for-own": { "version": "1.0.0", @@ -8693,7 +8657,6 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, "requires": { "map-cache": "^0.2.2" } @@ -8782,6 +8745,32 @@ "requires": { "yallist": "^4.0.0" } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "requires": { + "remove-trailing-separator": "^1.0.1" + } + }, + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "requires": { + "repeat-string": "^1.6.1" + } } } }, @@ -8878,8 +8867,7 @@ "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "dev": true + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" }, "getpass": { "version": "0.1.7", @@ -9247,8 +9235,7 @@ "graceful-fs": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", - "dev": true + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" }, "graphlib": { "version": "2.1.8", @@ -9522,7 +9509,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "dev": true, "requires": { "get-value": "^2.0.6", "has-values": "^1.0.0", @@ -9533,7 +9519,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "dev": true, "requires": { "is-number": "^3.0.0", "kind-of": "^4.0.0" @@ -9543,7 +9528,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -9552,7 +9536,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -9563,7 +9546,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -9987,8 +9969,7 @@ "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==" }, "ini": { "version": "1.3.5", @@ -10175,7 +10156,6 @@ "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -10184,7 +10164,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -10221,8 +10200,7 @@ "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-callable": { "version": "1.1.4", @@ -10257,7 +10235,6 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -10266,7 +10243,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -10283,7 +10259,6 @@ "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -10293,8 +10268,7 @@ "kind-of": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, @@ -10313,8 +10287,7 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" }, "is-extglob": { "version": "2.1.1", @@ -10439,7 +10412,6 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, "requires": { "isobject": "^3.0.1" } @@ -10556,8 +10528,7 @@ "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" }, "is-wsl": { "version": "2.2.0", @@ -10577,8 +10548,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isbinaryfile": { "version": "4.0.6", @@ -10594,8 +10564,7 @@ "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, "isstream": { "version": "0.1.2", @@ -11449,6 +11418,11 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -11475,6 +11449,11 @@ "ansi-regex": "^5.0.0" } }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -11728,8 +11707,7 @@ "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, "klaw-sync": { "version": "2.1.0", @@ -12236,8 +12214,7 @@ "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", - "dev": true + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" }, "map-stream": { "version": "0.1.0", @@ -12249,7 +12226,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "dev": true, "requires": { "object-visit": "^1.0.0" } @@ -12509,7 +12485,6 @@ "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -12530,7 +12505,6 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -12548,7 +12522,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -12559,7 +12532,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, "requires": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -12571,7 +12543,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -12582,7 +12553,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -12591,7 +12561,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -12602,7 +12571,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, "requires": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" @@ -12864,7 +12832,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", - "dev": true, "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -12874,7 +12841,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, "requires": { "is-plain-object": "^2.0.4" } @@ -12934,8 +12900,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "multicast-dns": { "version": "6.2.3", @@ -12980,7 +12945,6 @@ "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -14019,7 +13983,6 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "dev": true, "requires": { "copy-descriptor": "^0.1.0", "define-property": "^0.2.5", @@ -14030,7 +13993,6 @@ "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -14039,7 +14001,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -14153,7 +14114,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "dev": true, "requires": { "isobject": "^3.0.0" } @@ -14287,7 +14247,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, "requires": { "isobject": "^3.0.1" } @@ -14980,8 +14939,7 @@ "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", - "dev": true + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" }, "path-browserify": { "version": "0.0.1", @@ -15236,8 +15194,7 @@ "posix-character-classes": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", - "dev": true + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { "version": "7.0.27", @@ -15951,8 +15908,7 @@ "process-nextick-args": { "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 + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, "process-on-spawn": { "version": "1.0.0", @@ -16552,7 +16508,6 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -16653,7 +16608,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, "requires": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" @@ -16838,20 +16792,17 @@ "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" }, "repeat-element": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==", - "dev": true + "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==" }, "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, "replace-ext": { "version": "1.0.0", @@ -17220,8 +17171,7 @@ "resolve-url": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", - "dev": true + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" }, "responselike": { "version": "1.0.2", @@ -17245,8 +17195,7 @@ "ret": { "version": "0.1.15", "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, "retry": { "version": "0.12.0", @@ -17578,14 +17527,12 @@ "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==" }, "safe-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true, "requires": { "ret": "~0.1.10" } @@ -17971,7 +17918,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", - "dev": true, "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -17983,7 +17929,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -18084,7 +18029,6 @@ "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "dev": true, "requires": { "base": "^0.11.1", "debug": "^2.2.0", @@ -18100,7 +18044,6 @@ "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -18109,7 +18052,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { "is-extendable": "^0.1.0" } @@ -18120,7 +18062,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "dev": true, "requires": { "define-property": "^1.0.0", "isobject": "^3.0.0", @@ -18131,7 +18072,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "requires": { "is-descriptor": "^1.0.0" } @@ -18140,7 +18080,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, "requires": { "kind-of": "^6.0.0" } @@ -18149,7 +18088,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, "requires": { "kind-of": "^6.0.0" } @@ -18158,7 +18096,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, "requires": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -18171,7 +18108,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "dev": true, "requires": { "kind-of": "^3.2.0" }, @@ -18180,7 +18116,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -18436,7 +18371,6 @@ "version": "0.5.3", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", - "dev": true, "requires": { "atob": "^2.1.2", "decode-uri-component": "^0.2.0", @@ -18466,8 +18400,7 @@ "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", - "dev": true + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" }, "sourcemap-codec": { "version": "1.4.8", @@ -18655,7 +18588,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, "requires": { "extend-shallow": "^3.0.0" } @@ -18733,7 +18665,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "dev": true, "requires": { "define-property": "^0.2.5", "object-copy": "^0.1.0" @@ -18743,7 +18674,6 @@ "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { "is-descriptor": "^0.1.0" } @@ -19152,7 +19082,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, "requires": { "safe-buffer": "~5.1.0" } @@ -19860,7 +19789,6 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "dev": true, "requires": { "kind-of": "^3.0.2" }, @@ -19869,7 +19797,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -19886,7 +19813,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, "requires": { "define-property": "^2.0.2", "extend-shallow": "^3.0.2", @@ -20180,7 +20106,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", @@ -20287,7 +20212,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "dev": true, "requires": { "has-value": "^0.3.1", "isobject": "^3.0.0" @@ -20297,7 +20221,6 @@ "version": "0.3.1", "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "dev": true, "requires": { "get-value": "^2.0.3", "has-values": "^0.1.4", @@ -20308,7 +20231,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, "requires": { "isarray": "1.0.0" } @@ -20318,8 +20240,7 @@ "has-values": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", - "dev": true + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" } } }, @@ -20413,8 +20334,7 @@ "urix": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "dev": true + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" }, "url": { "version": "0.11.0", @@ -20470,8 +20390,7 @@ "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, "user-home": { "version": "2.0.0", @@ -20502,8 +20421,7 @@ "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=" }, "util-promisify": { "version": "2.1.0", diff --git a/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.ts b/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.ts index fc0663320a..a093ea3d6d 100644 --- a/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.ts +++ b/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.ts @@ -14,7 +14,7 @@ export enum AppMonitorComponentTypes { FETCHING = 'MONITOR_FETCHING', } -export interface IApplicationMonitorComponentState { +export interface IActionMonitorComponentState { busy: boolean; error: boolean; completed: boolean; @@ -23,7 +23,7 @@ export interface IApplicationMonitorComponentState { export class ActionMonitorComponentState { - public currentState: Observable; + public currentState: Observable; constructor( private entityMonitorFactory: EntityMonitorFactory, @@ -37,7 +37,7 @@ export class ActionMonitorComponentState { } private getStateObservable(entityMonitor: EntityMonitor, monitorState: AppMonitorComponentTypes) - : Observable { + : Observable { switch (monitorState) { case AppMonitorComponentTypes.DELETE: return this.getDeletingState(entityMonitor); @@ -50,7 +50,7 @@ export class ActionMonitorComponentState { } } - private getDeletingState(entityMonitor: EntityMonitor): Observable { + private getDeletingState(entityMonitor: EntityMonitor): Observable { return entityMonitor.entityRequest$.pipe( map(requestState => ({ busy: requestState.deleting.busy, @@ -61,7 +61,7 @@ export class ActionMonitorComponentState { ); } - private getFetchingState(entityMonitor: EntityMonitor): Observable { + private getFetchingState(entityMonitor: EntityMonitor): Observable { const completed$ = this.getHasCompletedObservable( entityMonitor.entityRequest$.pipe( map(requestState => requestState.fetching), @@ -82,7 +82,7 @@ export class ActionMonitorComponentState { private fetchUpdatingState = (requestState: RequestInfoState): ActionState => (requestState.updating[this.updateKey] || { busy: false, error: false, message: '' }) - private getUpdatingState(entityMonitor: EntityMonitor): Observable { + private getUpdatingState(entityMonitor: EntityMonitor): Observable { const completed$ = this.getHasCompletedObservable( @@ -125,7 +125,7 @@ export class AppActionMonitorIconComponent implements OnInit { // State observable - use this instead of creating one @Input() - public state: Observable; + public state: Observable; @Input() public entityKey: string; @@ -143,7 +143,7 @@ export class AppActionMonitorIconComponent implements OnInit { public updateKey = rootUpdatingKey; @Output() - public currentState: Observable; + public currentState: Observable; constructor(private entityMonitorFactory: EntityMonitorFactory) { } @@ -151,14 +151,14 @@ export class AppActionMonitorIconComponent implements OnInit { if (this.state) { this.currentState = this.state; } else { - const state: ActionMonitorComponentState = new ActionMonitorComponentState( - this.entityMonitorFactory, - this.id, - this.schema, - this.monitorState, - this.updateKey - ); - this.currentState = state.currentState; + const state: ActionMonitorComponentState = new ActionMonitorComponentState( + this.entityMonitorFactory, + this.id, + this.schema, + this.monitorState, + this.updateKey + ); + this.currentState = state.currentState; } } } diff --git a/src/frontend/packages/store/src/jetstream.ts b/src/frontend/packages/store/src/jetstream.ts index 12477fabba..fb8cb84451 100644 --- a/src/frontend/packages/store/src/jetstream.ts +++ b/src/frontend/packages/store/src/jetstream.ts @@ -67,7 +67,7 @@ export function hasJetStreamError(pages: Partial[]): Jet }) as JetStreamErrorResponse; } -function isJetstreamError(err: any): JetStreamErrorResponse { +export function isJetstreamError(err: any): JetStreamErrorResponse { return !!( err && err.error && diff --git a/src/frontend/packages/suse-extensions/package.json b/src/frontend/packages/suse-extensions/package.json new file mode 100644 index 0000000000..c7ba7878a7 --- /dev/null +++ b/src/frontend/packages/suse-extensions/package.json @@ -0,0 +1,12 @@ +{ + "name": "@suse/extensions", + "version": "0.0.1", + "peerDependencies": { + "@angular/common": "^6.0.0-rc.0 || ^6.0.0", + "@angular/core": "^6.0.0-rc.0 || ^6.0.0" + }, + "stratos": { + "module": "SuseModule", + "routingModule": "SuseRoutingModule" + } +} diff --git a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.html b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.html similarity index 100% rename from custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.html rename to src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.html diff --git a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.scss b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.scss similarity index 100% rename from custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.scss rename to src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.scss diff --git a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts diff --git a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.ts b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.ts similarity index 89% rename from custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.ts rename to src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.ts index 85f2fdbf50..044d47f2c4 100644 --- a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.ts @@ -3,8 +3,8 @@ import { Component } from '@angular/core'; import { Store } from '@ngrx/store'; import { map } from 'rxjs/operators'; +import { StratosAction, StratosActionType } from '../../../../../core/src/core/extension/extension-service'; import { AppState } from '../../../../../store/src/app-state'; -import { StratosAction, StratosActionType } from '../../../core/extension/extension-service'; @StratosAction({ diff --git a/custom-src/frontend/app/custom/helm/chart-view/monocular.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/chart-view/monocular.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.html diff --git a/custom-src/frontend/app/custom/helm/chart-view/monocular.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/chart-view/monocular.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.scss diff --git a/custom-src/frontend/app/custom/helm/chart-view/monocular.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts similarity index 93% rename from custom-src/frontend/app/custom/helm/chart-view/monocular.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts index 85b081676a..fb74ce9981 100644 --- a/custom-src/frontend/app/custom/helm/chart-view/monocular.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts @@ -1,5 +1,5 @@ -import { ActivatedRoute, Router } from '@angular/router'; import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'app-monocular', diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/create-release/create-release.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.html diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/create-release/create-release.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.scss diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts similarity index 94% rename from custom-src/frontend/app/custom/helm/create-release/create-release.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts index 45793d2149..d830c232f6 100644 --- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts @@ -6,12 +6,12 @@ import { ActivatedRoute } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs'; import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators'; +import { EndpointsService } from '../../../../../core/src/core/endpoints.service'; +import { safeUnsubscribe } from '../../../../../core/src/core/utils.service'; +import { ConfirmationDialogConfig } from '../../../../../core/src/shared/components/confirmation-dialog.config'; +import { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service'; +import { StepOnNextFunction, StepOnNextResult } from '../../../../../core/src/shared/components/stepper/step/step.component'; import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types'; -import { EndpointsService } from '../../../core/endpoints.service'; -import { safeUnsubscribe } from '../../../core/utils.service'; -import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config'; -import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service'; -import { StepOnNextFunction, StepOnNextResult } from '../../../shared/components/stepper/step/step.component'; import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog'; import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory'; import { KubernetesNamespace } from '../../kubernetes/store/kube.types'; diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.module.ts similarity index 69% rename from custom-src/frontend/app/custom/helm/create-release/create-release.module.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.module.ts index 336c219ae3..924e790d1e 100644 --- a/custom-src/frontend/app/custom/helm/create-release/create-release.module.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { CoreModule } from '../../../core/core.module'; -import { SharedModule } from '../../../shared/shared.module'; +import { CoreModule } from '../../../../../core/src/core/core.module'; +import { SharedModule } from '../../../../../core/src/shared/shared.module'; import { CreateReleaseComponent } from './create-release.component'; diff --git a/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-catalog.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/helm-entity-catalog.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-catalog.ts diff --git a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/helm-entity-factory.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts diff --git a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/helm-entity-generator.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts diff --git a/custom-src/frontend/app/custom/helm/helm-testing.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-testing.module.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/helm-testing.module.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/helm-testing.module.ts diff --git a/custom-src/frontend/app/custom/helm/helm.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts similarity index 95% rename from custom-src/frontend/app/custom/helm/helm.module.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts index 4a375945ae..d03d15582b 100644 --- a/custom-src/frontend/app/custom/helm/helm.module.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { CoreModule } from '../../core/core.module'; -import { SharedModule } from '../../shared/shared.module'; +import { CoreModule } from '../../../../core/src/core/core.module'; +import { SharedModule } from '../../../../core/src/shared/shared.module'; import { MonocularChartViewComponent } from './chart-view/monocular.component'; import { CreateReleaseModule } from './create-release/create-release.module'; import { HelmRoutingModule } from './helm.routing'; diff --git a/custom-src/frontend/app/custom/helm/helm.routing.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/helm.routing.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts diff --git a/custom-src/frontend/app/custom/helm/helm.setup.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts similarity index 79% rename from custom-src/frontend/app/custom/helm/helm.setup.module.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts index b116eee7ce..3070b56567 100644 --- a/custom-src/frontend/app/custom/helm/helm.setup.module.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts @@ -2,13 +2,13 @@ import { CommonModule } from '@angular/common'; import { NgModule, Optional, SkipSelf } from '@angular/core'; import { Store } from '@ngrx/store'; +import { CoreModule } from '../../../../core/src/core/core.module'; +import { EndpointsService } from '../../../../core/src/core/endpoints.service'; +import { SharedModule } from '../../../../core/src/shared/shared.module'; import { GetSystemInfo } from '../../../../store/src/actions/system.actions'; import { AppState } from '../../../../store/src/app-state'; import { EntityCatalogModule } from '../../../../store/src/entity-catalog.module'; -import { EndpointHealthCheck } from '../../../endpoints-health-checks'; -import { CoreModule } from '../../core/core.module'; -import { EndpointsService } from '../../core/endpoints.service'; -import { SharedModule } from '../../shared/shared.module'; +import { EndpointHealthCheck } from '../../../../store/src/entity-catalog/entity-catalog.types'; import { HELM_ENDPOINT_TYPE } from './helm-entity-factory'; import { generateHelmEntities } from './helm-entity-generator'; import { HelmStoreModule } from './helm.store.module'; diff --git a/custom-src/frontend/app/custom/helm/helm.store.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.store.module.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/helm.store.module.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/helm.store.module.ts diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.html diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts similarity index 82% rename from custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts index 3d0b2e9903..06aa2fa3cb 100644 --- a/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; -import { CardCell } from '../../../../shared/components/list/list.types'; +import { CardCell } from '../../../../../../core/src/shared/components/list/list.types'; import { MonocularChart } from '../../store/helm.types'; @Component({ diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts similarity index 81% rename from custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts index afefeae64e..45e3929eed 100644 --- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts @@ -1,9 +1,9 @@ import { Store } from '@ngrx/store'; -import { PaginationEntityState } from '../../../../../store/src//types/pagination.types'; +import { ListDataSource } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; +import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types'; import { AppState } from '../../../../../store/src/app-state'; -import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../shared/components/list/list.component.types'; +import { PaginationEntityState } from '../../../../../store/src/types/pagination.types'; import { helmEntityCatalog } from '../helm-entity-catalog'; import { MonocularChart } from '../store/helm.types'; diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts similarity index 90% rename from custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts index 551fff9625..5585990f79 100644 --- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts @@ -4,11 +4,15 @@ import { Store } from '@ngrx/store'; import { BehaviorSubject, Observable, of as observableOf } from 'rxjs'; import { filter, map } from 'rxjs/operators'; +import { EndpointsService } from '../../../../../core/src/core/endpoints.service'; +import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types'; +import { + IListConfig, + IListMultiFilterConfig, + ListViewTypes, +} from '../../../../../core/src/shared/components/list/list.component.types'; import { ListView } from '../../../../../store/src/actions/list.actions'; import { AppState } from '../../../../../store/src/app-state'; -import { EndpointsService } from '../../../core/endpoints.service'; -import { ITableColumn } from '../../../shared/components/list/list-table/table.types'; -import { IListConfig, IListMultiFilterConfig, ListViewTypes } from '../../../shared/components/list/list.component.types'; import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types'; import { MonocularChart } from '../store/helm.types'; import { MonocularChartCardComponent } from './monocular-chart-card/monocular-chart-card.component'; diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts similarity index 81% rename from custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts index c2ff5464a6..879403cb41 100644 --- a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts @@ -5,31 +5,34 @@ import { ActivatedRoute } from '@angular/router'; import { Store } from '@ngrx/store'; import { UnregisterEndpoint } from 'frontend/packages/store/src/actions/endpoint.actions'; import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog'; -import { endpointSchemaKey } from 'frontend/packages/store/src/helpers/entity-factory'; import { selectDeletionInfo } from 'frontend/packages/store/src/selectors/api.selectors'; import { of as observableOf } from 'rxjs'; import { pairwise } from 'rxjs/operators'; +import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service'; +import { StratosCurrentUserPermissions } from '../../../../../core/src/core/permissions/stratos-user-permissions.checker'; +import { environment } from '../../../../../core/src/environments/environment'; +import { ConfirmationDialogConfig } from '../../../../../core/src/shared/components/confirmation-dialog.config'; +import { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service'; +import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types'; +import { + EndpointCardComponent, +} from '../../../../../core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component'; +import { + TableCellEndpointStatusComponent, +} from '../../../../../core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component'; +import { + IListAction, + IListConfig, + ListViewTypes, +} from '../../../../../core/src/shared/components/list/list.component.types'; import { AppState } from '../../../../../store/src/app-state'; +import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils'; +import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../../../../../store/src/helpers/stratos-entity-factory'; import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; import { InternalEventMonitorFactory } from '../../../../../store/src/monitors/internal-event-monitor.factory'; import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; import { EndpointModel } from '../../../../../store/src/types/endpoint.types'; -import { STRATOS_ENDPOINT_TYPE } from '../../../base-entity-schemas'; -import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service'; -import { StratosCurrentUserPermissions } from '../../../core/permissions/stratos-user-permissions.checker'; -import { environment } from '../../../environments/environment'; -import { getFullEndpointApiUrl } from '../../../features/endpoints/endpoint-helpers'; -import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config'; -import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service'; -import { ITableColumn } from '../../../shared/components/list/list-table/table.types'; -import { - EndpointCardComponent, -} from '../../../shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component'; -import { - TableCellEndpointStatusComponent, -} from '../../../shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component'; -import { IListAction, IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types'; import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types'; import { MonocularRepositoryDataSource } from './monocular-repository-list-source'; @@ -84,7 +87,7 @@ export class MonocularRepositoryListConfig implements IListConfig }, ]; - private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey); + private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointEntityType); private listActionSyncRepository: IListAction = { action: (item: EndpointModel) => { diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-source.ts similarity index 84% rename from custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-source.ts index 59148b3d79..fec0503321 100644 --- a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-source.ts @@ -2,19 +2,19 @@ import { NgZone } from '@angular/core'; import { Store } from '@ngrx/store'; import { interval, Observable, of as observableOf, Subscription } from 'rxjs'; +import { safeUnsubscribe } from '../../../../../core/src/core/utils.service'; +import { RowState } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types'; +import { + BaseEndpointsDataSource, + syncPaginationSection, +} from '../../../../../core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source'; +import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types'; import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions'; import { AppState } from '../../../../../store/src/app-state'; import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; import { InternalEventMonitorFactory } from '../../../../../store/src/monitors/internal-event-monitor.factory'; import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; import { EndpointModel } from '../../../../../store/src/types/endpoint.types'; -import { safeUnsubscribe } from '../../../core/utils.service'; -import { RowState } from '../../../shared/components/list/data-sources-controllers/list-data-source-types'; -import { - BaseEndpointsDataSource, - syncPaginationSection, -} from '../../../shared/components/list/list-types/endpoint/base-endpoints-data-source'; -import { IListConfig } from '../../../shared/components/list/list.component.types'; import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory'; export class MonocularRepositoryDataSource extends BaseEndpointsDataSource { diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/app.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/app.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/app.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/app.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts similarity index 94% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts index c8c3aa91cf..d6c91d4a44 100644 --- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts @@ -3,7 +3,7 @@ import { MatIconRegistry } from '@angular/material/icon'; import { MatSnackBar } from '@angular/material/snack-bar'; import { DomSanitizer } from '@angular/platform-browser'; -import { EndpointsService } from '../../../../../core/endpoints.service'; +import { EndpointsService } from '../../../../../../../core/src/core/endpoints.service'; import { Chart } from '../../shared/models/chart'; @Component({ diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/charts/charts.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/charts/charts.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/charts/charts.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/charts/charts.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/loader/loader.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/loader/loader.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/loader/loader.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/loader/loader.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/panel/panel.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.html diff --git a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/panel/panel.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.scss diff --git a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/panel/panel.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/panel/panel.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/models/chart-version.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart-version.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/shared/models/chart-version.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart-version.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/models/chart.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/shared/models/chart.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/models/maintainer.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/maintainer.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/shared/models/maintainer.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/maintainer.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/models/repo.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/repo.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/shared/models/repo.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/repo.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/seo.data.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/seo.data.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/shared/seo.data.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/seo.data.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/chart.service.mock.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/chart.service.mock.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/shared/services/chart.service.mock.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/chart.service.mock.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts similarity index 98% rename from custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts index 28f5045b73..c56a82df08 100644 --- a/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts @@ -1,12 +1,12 @@ +import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable, throwError } from 'rxjs'; import { catchError, map, tap } from 'rxjs/operators'; -import { LoggerService } from '../../../../../core/logger.service'; +import { LoggerService } from '../../../../../../../core/src/core/logger.service'; import { Chart } from '../models/chart'; import { ChartVersion } from '../models/chart-version'; import { ConfigService } from './config.service'; -import { HttpClient } from '@angular/common/http'; diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/config.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/config.service.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/shared/services/config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/config.service.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/menu.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/menu.service.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/monocular/shared/services/menu.service.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/menu.service.ts diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts similarity index 93% rename from custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts index 05c62d4942..9ac9582e7e 100644 --- a/custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts @@ -1,11 +1,11 @@ +import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable, throwError } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; -import { LoggerService } from '../../../../../core/logger.service'; +import { LoggerService } from '../../../../../../../core/src/core/logger.service'; import { RepoAttributes } from '../models/repo'; import { ConfigService } from './config.service'; -import { HttpClient } from '@angular/common/http'; diff --git a/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/store/helm.action-builders.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts similarity index 96% rename from custom-src/frontend/app/custom/helm/store/helm.actions.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts index d0c0db844e..c47e8e47f3 100644 --- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts @@ -1,3 +1,4 @@ +import { PaginatedAction } from '../../../../../store/src/types/pagination.types'; import { EntityRequestAction } from '../../../../../store/src/types/request.types'; import { HELM_ENDPOINT_TYPE, @@ -5,7 +6,6 @@ import { helmVersionsEntityType, monocularChartsEntityType, } from '../helm-entity-factory'; -import { PaginatedAction } from './../../../../../store/src/types/pagination.types'; import { HelmInstallValues } from './helm.types'; export const GET_MONOCULAR_CHARTS = '[Monocular] Get Charts'; diff --git a/custom-src/frontend/app/custom/helm/store/helm.effects.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts similarity index 98% rename from custom-src/frontend/app/custom/helm/store/helm.effects.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts index 5ec555ade5..b938cd119b 100644 --- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts @@ -5,10 +5,12 @@ import { Action, Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { catchError, flatMap, mergeMap } from 'rxjs/operators'; +import { environment } from '../../../../../core/src/environments/environment'; import { GET_ENDPOINTS_SUCCESS, GetAllEndpointsSuccess } from '../../../../../store/src/actions/endpoint.actions'; import { ClearPaginationOfType } from '../../../../../store/src/actions/pagination.actions'; import { AppState } from '../../../../../store/src/app-state'; import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog'; +import { isJetstreamError } from '../../../../../store/src/jetstream'; import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers'; import { NormalizedResponse } from '../../../../../store/src/types/api.types'; import { @@ -17,8 +19,6 @@ import { WrapperRequestActionFailed, WrapperRequestActionSuccess, } from '../../../../../store/src/types/request.types'; -import { environment } from '../../../environments/environment'; -import { isJetstreamError } from '../../../jetstream.helpers'; import { helmEntityCatalog } from '../helm-entity-catalog'; import { getHelmVersionId, getMonocularChartId, HELM_ENDPOINT_TYPE } from '../helm-entity-factory'; import { diff --git a/custom-src/frontend/app/custom/helm/store/helm.types.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/store/helm.types.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts diff --git a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.html diff --git a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.scss diff --git a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.ts similarity index 60% rename from custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.ts index 8df3ae4dad..4628d67ca9 100644 --- a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { MonocularChartsListConfig } from './../../list-types/monocular-charts-list-config.service'; +import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; +import { MonocularChartsListConfig } from '../../list-types/monocular-charts-list-config.service'; @Component({ selector: 'app-catalog-tab', diff --git a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.html similarity index 100% rename from custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.html rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.html diff --git a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.scss diff --git a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts diff --git a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.ts similarity index 80% rename from custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.ts rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.ts index 620c2e36a9..cea4439854 100644 --- a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; -import { ListConfig } from '../../../../shared/components/list/list.component.types'; + +import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { MonocularRepositoryListConfig } from '../../list-types/monocular-repository-list-config.service'; @Component({ diff --git a/custom-src/frontend/app/custom/helm/theme.scss b/src/frontend/packages/suse-extensions/src/custom/helm/theme.scss similarity index 100% rename from custom-src/frontend/app/custom/helm/theme.scss rename to src/frontend/packages/suse-extensions/src/custom/helm/theme.scss diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts similarity index 71% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts index 1291fb9240..2c67e0049c 100644 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts @@ -1,7 +1,9 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { IAuthForm } from '../../../../core/extension/extension-types'; +import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; +import { IAuthForm } from '../../../../../../store/src/extension-types'; + + @Component({ selector: 'app-kubernetes-aws-auth-form', templateUrl: './kubernetes-aws-auth-form.component.html', diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts similarity index 96% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts index 5c0b9042b5..889f8b5a7d 100644 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts @@ -1,7 +1,9 @@ import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../core/extension/extension-types'; +import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../../../store/src/extension-types'; + + @Component({ selector: 'app-kubernetes-certs-auth-form', diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts similarity index 76% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts index f79f554af0..424f0ce2ee 100644 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts @@ -1,7 +1,9 @@ -import { EndpointAuthValues, IEndpointAuthComponent } from './../../../../core/extension/extension-types'; -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; +import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../../../store/src/extension-types'; + + @Component({ selector: 'app-kubernetes-config-auth-form', templateUrl: './kubernetes-config-auth-form.component.html', diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts similarity index 83% rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts index afaeffe204..ef2c74b0ed 100644 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts @@ -1,7 +1,9 @@ -import { EndpointAuthValues, IEndpointAuthComponent } from './../../../../core/extension/extension-types'; import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; +import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../../../store/src/extension-types'; + + @Component({ selector: 'app-kubernetes-gke-auth-form', templateUrl: './kubernetes-gke-auth-form.component.html', diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts similarity index 91% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts index 4f2c119a4c..a179142f57 100644 --- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts @@ -1,11 +1,11 @@ import { ComponentFactoryResolver, Injector } from '@angular/core'; import { FormBuilder } from '@angular/forms'; +import { ConnectEndpointData } from '../../../../../core/src/features/endpoints/connect.service'; +import { RowState } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types'; import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog'; -import { ConnectEndpointData } from '../../../features/endpoints/connect.service'; -import { RowState } from '../../../shared/components/list/data-sources-controllers/list-data-source-types'; +import { EndpointAuthTypeConfig, IAuthForm } from '../../../../../store/src/extension-types'; import { KUBERNETES_ENDPOINT_TYPE } from '../kubernetes-entity-factory'; -import { EndpointAuthTypeConfig, IAuthForm } from './../../../core/extension/extension-types'; import { KubeConfigFileCluster, KubeConfigFileUser } from './kube-config.types'; /** @@ -49,8 +49,8 @@ export class KubeConfigAuthHelper { // Try and parse the authentication metadata public parseAuth(cluster: KubeConfigFileCluster, user: KubeConfigFileUser): RowState { - // Default subtype is generic Kubernetes - cluster._subType = ''; + // Default subtype is generic Kubernetes ('') or previously determined/selected sub type + cluster._subType = cluster._subType || ''; // Certificate authentication first diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts similarity index 80% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts index e5e95dffd5..5717a7da2e 100644 --- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts @@ -4,30 +4,28 @@ import { Store } from '@ngrx/store'; import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs'; import { distinctUntilChanged, filter, first, map, pairwise, startWith, withLatestFrom } from 'rxjs/operators'; -import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog'; -import { safeUnsubscribe } from '../../../../core/utils.service'; -import { ITableColumn } from '../../../../shared/components/list/list-table/table.types'; -import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes-entity-factory'; -import { KubeConfigAuthHelper } from '../kube-config-auth.helper'; -import { KubeConfigFileCluster, KubeConfigImportAction, KubeImportState } from '../kube-config.types'; -import { RegisterEndpoint } from './../../../../../../store/src/actions/endpoint.actions'; -import { AppState } from './../../../../../../store/src/app-state'; -import { EndpointsEffect } from './../../../../../../store/src/effects/endpoint.effects'; -import { endpointSchemaKey } from './../../../../../../store/src/helpers/entity-factory'; -import { ActionState } from './../../../../../../store/src/reducers/api-request-reducer/types'; -import { selectUpdateInfo } from './../../../../../../store/src/selectors/api.selectors'; -import { STRATOS_ENDPOINT_TYPE } from './../../../../base-entity-schemas'; -import { EndpointsService } from './../../../../core/endpoints.service'; +import { EndpointsService } from '../../../../../../core/src/core/endpoints.service'; +import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service'; import { ConnectEndpointConfig, ConnectEndpointData, ConnectEndpointService, -} from './../../../../features/endpoints/connect.service'; +} from '../../../../../../core/src/features/endpoints/connect.service'; +import { + IActionMonitorComponentState, +} from '../../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component'; import { ITableListDataSource, RowState, -} from './../../../../shared/components/list/data-sources-controllers/list-data-source-types'; -import { StepOnNextFunction } from './../../../../shared/components/stepper/step/step.component'; +} from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types'; +import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types'; +import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component'; +import { AppState } from '../../../../../../store/src/app-state'; +import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types'; +import { stratosEntityCatalog } from '../../../../../../store/src/stratos-entity-catalog'; +import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes-entity-factory'; +import { KubeConfigAuthHelper } from '../kube-config-auth.helper'; +import { KubeConfigFileCluster, KubeConfigImportAction, KubeImportState } from '../kube-config.types'; import { KubeConfigTableImportStatusComponent, } from './kube-config-table-import-status/kube-config-table-import-status.component'; @@ -87,7 +85,6 @@ export class KubeConfigImportComponent implements OnDestroy { applyStarted: boolean; private iteration = 0; - private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey); private connectService: ConnectEndpointService; constructor( @@ -121,7 +118,12 @@ export class KubeConfigImportComponent implements OnDestroy { } private doRegister(reg: KubeConfigImportAction, next: KubeConfigImportAction[]) { - const obs$ = this.registerEndpoint(reg.cluster.name, reg.cluster.cluster.server, reg.cluster.cluster['insecure-skip-tls-verify']); + const obs$ = this.registerEndpoint( + reg.cluster.name, + reg.cluster.cluster.server, + reg.cluster.cluster['insecure-skip-tls-verify'], + reg.cluster._subType + ); const mainObs$ = this.getUpdatingState(obs$).pipe( startWith({ busy: true, error: false, completed: false }) ); @@ -169,7 +171,7 @@ export class KubeConfigImportComponent implements OnDestroy { this.subs.push(connect.actionState.pipe(filter(status => status.completed), first()).subscribe(status => { if (status.error) { - connect.state.next({ message: status.errorMessage || status.message, error: true }); + connect.state.next({ message: status.message, error: true }); } this.processAction(next); })); @@ -185,21 +187,27 @@ export class KubeConfigImportComponent implements OnDestroy { } // Register the endpoint - private registerEndpoint(name: string, url: string, skipSslValidation: boolean) { - const action = new RegisterEndpoint(KUBERNETES_ENDPOINT_TYPE, null, name, url, skipSslValidation, '', '', false); - this.store.dispatch(action); - const update$ = this.store.select( - selectUpdateInfo(this.endpointEntityKey, action.guid(), EndpointsEffect.registeringKey) - ).pipe(filter(update => !!update)); - return update$; + private registerEndpoint(name: string, url: string, skipSslValidation: boolean, subType: string) { + return stratosEntityCatalog.endpoint.api.register( + KUBERNETES_ENDPOINT_TYPE, + subType, + name, + url, + skipSslValidation, + '', + '', + false + ).pipe( + filter(update => !!update) + ); } // Connect to an endpoint - private connectEndpoint(action: KubeConfigImportAction, pData: ConnectEndpointData) { + private connectEndpoint(action: KubeConfigImportAction, pData: ConnectEndpointData): Observable { const config: ConnectEndpointConfig = { name: action.cluster.name, guid: action.depends.cluster._guid || action.cluster._guid, - type: null, + type: KUBERNETES_ENDPOINT_TYPE, subType: action.user._authData.subType, ssoAllowed: false }; @@ -207,10 +215,22 @@ export class KubeConfigImportComponent implements OnDestroy { if (this.connectService) { this.connectService.destroy(); } - this.connectService = new ConnectEndpointService(this.store, this.endpointsService, config); + this.connectService = new ConnectEndpointService(this.endpointsService, config); this.connectService.setData(pData); - this.connectService.submit(); - return this.connectService.getConnectingObservable(); + return this.connectService.submit().pipe( + map(updateSection => ({ + busy: false, + error: !updateSection.success, + completed: true, + message: updateSection.errorMessage + })), + startWith({ + message: '', + busy: true, + completed: false, + error: false + }) + ); } // Enter the step - process the list of clusters to import diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts similarity index 65% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts index 08bd785052..ee59c019f8 100644 --- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts @@ -1,7 +1,10 @@ import { Component, Input } from '@angular/core'; import { Observable } from 'rxjs'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { + IActionMonitorComponentState, +} from '../../../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { KubeConfigFileCluster } from '../../kube-config.types'; @Component({ @@ -11,7 +14,7 @@ import { KubeConfigFileCluster } from '../../kube-config.types'; }) export class KubeConfigTableImportStatusComponent extends TableCellCustom { - public state: Observable; + public state: Observable; constructor() { super(); diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts similarity index 90% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts index 4a89f59baf..de5d80f1c7 100644 --- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts @@ -3,18 +3,18 @@ import { Store } from '@ngrx/store'; import { BehaviorSubject, combineLatest, Observable, of as observableOf, of } from 'rxjs'; import { first, map, switchMap } from 'rxjs/operators'; -import { HideSnackBar, ShowSnackBar } from '../../../../../../store/src/actions/snackBar.actions'; -import { AppState } from '../../../../../../store/src/app-state'; +import { + ITableListDataSource, + RowState, +} from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types'; import { TableHeaderSelectComponent, -} from '../../../../shared/components/list/list-table/table-header-select/table-header-select.component'; +} from '../../../../../../core/src/shared/components/list/list-table/table-header-select/table-header-select.component'; +import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types'; +import { SnackBarService } from '../../../../../../core/src/shared/services/snackbar.service'; +import { AppState } from '../../../../../../store/src/app-state'; import { KubeConfigHelper } from '../kube-config.helper'; import { KubeConfigFileCluster } from '../kube-config.types'; -import { - ITableListDataSource, - RowState, -} from './../../../../shared/components/list/data-sources-controllers/list-data-source-types'; -import { ITableColumn } from './../../../../shared/components/list/list-table/table.types'; import { KubeConfigTableCertComponent } from './kube-config-table-cert/kube-config-table-cert.component'; import { KubeConfigTableName } from './kube-config-table-name/kube-config-table-name.component'; import { KubeConfigTableSelectComponent } from './kube-config-table-select/kube-config-table-select.component'; @@ -132,7 +132,8 @@ export class KubeConfigSelectionComponent { constructor( private store: Store, - public helper: KubeConfigHelper + public helper: KubeConfigHelper, + private snackbarService: SnackBarService ) { this.helper.clustersChanged = () => this.clustersChanged() } @@ -147,10 +148,10 @@ export class KubeConfigSelectionComponent { ) clustersParse(cluster: string) { - this.store.dispatch(new HideSnackBar()); + this.snackbarService.hide(); this.helper.parse(cluster).pipe(first()).subscribe(errorString => { if (errorString) { - this.store.dispatch(new ShowSnackBar(`Failed to load Kube Config: ${errorString}`, 'Close')) + this.snackbarService.show(`Failed to load Kube Config: ${errorString}`, 'Close') } }) } diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts similarity index 95% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts index c776a3d0bf..c7deb2270d 100644 --- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts @@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; import { timeout } from 'rxjs/operators'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { KubeConfigHelper } from '../../kube-config.helper'; import { KubeConfigFileCluster } from '../../kube-config.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts similarity index 78% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts index 576f4c19f2..2b5420071c 100644 --- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { KubeConfigFileCluster } from '../../kube-config.types'; @Component({ diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts similarity index 85% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts index b13745ed48..60f93a1ad9 100644 --- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { KubeConfigHelper } from '../../kube-config.helper'; import { KubeConfigFileCluster } from '../../kube-config.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts similarity index 88% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts index f39471a321..3b174fb27a 100644 --- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { KubeConfigHelper } from '../../kube-config.helper'; import { KubeConfigFileCluster } from '../../kube-config.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.helper.ts similarity index 94% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.helper.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.helper.ts index 645505ea91..8a9e474340 100644 --- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.helper.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.helper.ts @@ -3,11 +3,11 @@ import * as yaml from 'js-yaml'; import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs'; import { filter, first, map, tap } from 'rxjs/operators'; +import { EndpointsService } from '../../../../../core/src/core/endpoints.service'; +import { createGuid } from '../../../../../core/src/core/utils.service'; +import { RowState } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types'; +import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils'; import { EndpointModel } from '../../../../../store/src/types/endpoint.types'; -import { EndpointsService } from '../../../core/endpoints.service'; -import { createGuid } from '../../../core/utils.service'; -import { getFullEndpointApiUrl } from '../../../features/endpoints/endpoint-helpers'; -import { RowState } from '../../../shared/components/list/data-sources-controllers/list-data-source-types'; import { KubeConfigAuthHelper } from './kube-config-auth.helper'; import { KubeConfigFile, KubeConfigFileCluster } from './kube-config.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts similarity index 82% rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.types.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts index f2d8b7abde..49bd4dbbf3 100644 --- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.types.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts @@ -1,7 +1,10 @@ import { Observable, Subject } from 'rxjs'; -import { EndpointAuthTypeConfig } from '../../../core/extension/extension-types'; -import { RowState } from '../../../shared/components/list/data-sources-controllers/list-data-source-types'; +import { + IActionMonitorComponentState, +} from '../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component'; +import { RowState } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types'; +import { EndpointAuthTypeConfig } from '../../../../../store/src/extension-types'; import { ActionStatus } from './../../../../../store/src/reducers/api-request-reducer/types'; // Types for a Kubernetes Configuration file @@ -75,8 +78,8 @@ export interface KubeConfigImportAction { user?: KubeConfigFileUser; status?: ActionStatus; state: Subject; - actionState$?: Observable; - actionState: Subject; + actionState$?: Observable; + actionState: Subject; depends?: KubeConfigImportAction; } diff --git a/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.ts similarity index 88% rename from custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.ts index 643fd02271..cb14bef481 100644 --- a/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.ts @@ -1,13 +1,13 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { NEVER, Observable, Subject, Subscription } from 'rxjs'; +import { NEVER, Observable, Subject } from 'rxjs'; import websocketConnect, { normalClosureMessage } from 'rxjs-websockets'; -import { catchError, tap, switchMap, map } from 'rxjs/operators'; +import { catchError, map, switchMap, tap } from 'rxjs/operators'; -import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types'; -import { SshViewerComponent } from '../../../shared/components/ssh-viewer/ssh-viewer.component'; -import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; +import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types'; +import { SshViewerComponent } from '../../../../../core/src/shared/components/ssh-viewer/ssh-viewer.component'; import { BaseKubeGuid } from '../kubernetes-page.types'; +import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; import { KubernetesService } from '../services/kubernetes.service'; diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts similarity index 95% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts index d7ec27b338..5a0d0a1a0a 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts @@ -5,13 +5,13 @@ import { ActivatedRoute } from '@angular/router'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; import { distinctUntilChanged, filter, map } from 'rxjs/operators'; -import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config'; -import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service'; +import { ConfirmationDialogConfig } from '../../../../../../core/src/shared/components/confirmation-dialog.config'; +import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service'; +import { IHeaderBreadcrumb } from '../../../../../../core/src/shared/components/page-header/page-header.types'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; import { KubernetesService } from '../../services/kubernetes.service'; import { KubeDashboardStatus } from '../../store/kubernetes.effects'; -import { IHeaderBreadcrumb } from './../../../../shared/components/page-header/page-header.types'; type MessageUpdater = (msg: string) => void; diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts similarity index 95% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts index 9a2451b237..0655cfae02 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts @@ -4,11 +4,13 @@ import { ActivatedRoute } from '@angular/router'; import { BehaviorSubject, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types'; +import { + EndpointMissingMessageParts, +} from '../../../../../core/src/shared/components/endpoints-missing/endpoints-missing.component'; +import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types'; import { BaseKubeGuid } from '../kubernetes-page.types'; import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; import { KubernetesService } from '../services/kubernetes.service'; -import { EndpointMissingMessageParts } from '../../../shared/components/endpoints-missing/endpoints-missing.component'; @Component({ selector: 'app-kubernetes-dashboard', @@ -100,7 +102,7 @@ export class KubernetesDashboardTabComponent implements OnInit { hasLoaded = true; this.errorMsg$.next({ firstLine: errMsg, - secondLine: { text: ''} + secondLine: { text: '' } }); this.hasError$.next(true); } diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-catalog.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-catalog.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts similarity index 97% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts index a30402dfaa..1fed3c1b20 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts @@ -2,7 +2,7 @@ import { Schema, schema } from 'normalizr'; import { getAPIResourceGuid } from '../../../../cloud-foundry/src/store/selectors/api.selectors'; import { EntitySchema } from '../../../../store/src/helpers/entity-schema'; -import { metricEntityType } from '../../base-entity-schemas'; +import { metricEntityType } from '../../../../store/src/helpers/stratos-entity-factory'; import { getGuidFromKubeDashboardObj, getGuidFromKubeDeploymentObj, diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts similarity index 98% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts index 15e0ea101b..4dad2ba7e2 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts @@ -9,9 +9,9 @@ import { IStratosEntityDefinition, StratosEndpointExtensionDefinition, } from '../../../../store/src/entity-catalog/entity-catalog.types'; +import { EndpointAuthTypeConfig, EndpointType } from '../../../../store/src/extension-types'; +import { metricEntityType } from '../../../../store/src/helpers/stratos-entity-factory'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; -import { metricEntityType } from '../../base-entity-schemas'; -import { EndpointAuthTypeConfig, EndpointType } from '../../core/extension/extension-types'; import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component'; import { KubernetesCertsAuthFormComponent, diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-metrics.helpers.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-metrics.helpers.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-metrics.helpers.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-metrics.helpers.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts similarity index 76% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts index aa5c59a608..812ad3aaa1 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { ListConfig } from '../../../../shared/components/list/list.component.types'; +import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { KubernetesNamespacePodsListConfigService, } from '../../list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service'; @@ -14,4 +14,4 @@ import { useClass: KubernetesNamespacePodsListConfigService, }] }) -export class KubernetesNamespacePodsComponent {} +export class KubernetesNamespacePodsComponent { } diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts similarity index 84% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts index 09a772cfd7..f8a81aa887 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { ListConfig } from '../../../../shared/components/list/list.component.types'; +import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { KubernetesNamespaceServicesListConfig, } from '../../list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service'; diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts similarity index 93% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts index ebe43a1a09..7a878dd6e7 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts @@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types'; +import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types'; import { BaseKubeGuid } from '../kubernetes-page.types'; import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; import { KubernetesNamespaceService } from '../services/kubernetes-namespace.service'; diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts similarity index 84% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts index 5e5f3aab43..bfc3ada39c 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts @@ -1,6 +1,7 @@ -import { Component, Input, OnInit, OnDestroy } from '@angular/core'; -import { Observable, of as observableOf, Subscription, observable } from 'rxjs'; -import { KubernetesNodeService, KubeNodeMetric } from '../../../services/kubernetes-node.service'; +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Observable, Subscription } from 'rxjs'; + +import { KubeNodeMetric, KubernetesNodeService } from '../../../services/kubernetes-node.service'; import { MetricStatistic } from '../../../store/kube.types'; @Component({ @@ -27,7 +28,7 @@ export class KubernetesNodeMetricStatsCardComponent implements OnInit, OnDestroy subscriptions: Subscription[] = []; constructor( public kubeNodeService: KubernetesNodeService - ) {} + ) { } ngOnInit() { const maxMetric = this.kubeNodeService.setupMetricObservable(this.metric, MetricStatistic.MAXIMUM); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts similarity index 83% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts index e48a279224..9be744ec76 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts @@ -1,10 +1,12 @@ import { Component, Input, OnInit } from '@angular/core'; -import { MetricsConfig } from '../../../../../shared/components/metrics-chart/metrics-chart.component'; -import { MetricsLineChartConfig } from '../../../../../shared/components/metrics-chart/metrics-chart.types'; +import { MetricsConfig } from '../../../../../../../core/src/shared/components/metrics-chart/metrics-chart.component'; +import { MetricsLineChartConfig } from '../../../../../../../core/src/shared/components/metrics-chart/metrics-chart.types'; +import { + MetricsChartHelpers, +} from '../../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers'; import { IMetricMatrixResult } from '../../../../../../../store/src/types/base-metric.types'; import { IMetricApplication } from '../../../../../../../store/src/types/metric.types'; -import { MetricsChartHelpers } from '../../../../../shared/components/metrics-chart/metrics.component.helpers'; import { FetchKubernetesMetricsAction } from '../../../store/kubernetes.actions'; @Component({ diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts similarity index 81% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts index 592b5e6a32..f91208e9c1 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts @@ -1,12 +1,16 @@ import { Component, OnInit } from '@angular/core'; -import { KubernetesNodeService, KubeNodeMetric } from '../../services/kubernetes-node.service'; -import { MetricsLineChartConfig } from '../../../../shared/components/metrics-chart/metrics-chart.types'; -import { MetricsConfig } from '../../../../shared/components/metrics-chart/metrics-chart.component'; -import { IMetricMatrixResult, ChartSeries } from '../../../../../../store/src/types/base-metric.types'; + +import { MetricsConfig } from '../../../../../../core/src/shared/components/metrics-chart/metrics-chart.component'; +import { MetricsLineChartConfig } from '../../../../../../core/src/shared/components/metrics-chart/metrics-chart.types'; +import { + ChartDataTypes, + getMetricsChartConfigBuilder, +} from '../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers'; +import { ChartSeries, IMetricMatrixResult } from '../../../../../../store/src/types/base-metric.types'; import { IMetricApplication } from '../../../../../../store/src/types/metric.types'; +import { formatAxisCPUTime, formatCPUTime } from '../../kubernetes-metrics.helpers'; +import { KubeNodeMetric, KubernetesNodeService } from '../../services/kubernetes-node.service'; import { FetchKubernetesChartMetricsAction } from '../../store/kubernetes.actions'; -import { ChartDataTypes, getMetricsChartConfigBuilder } from '../../../../shared/components/metrics-chart/metrics.component.helpers'; -import { formatCPUTime, formatAxisCPUTime } from '../../kubernetes-metrics.helpers'; @Component({ selector: 'app-kubernetes-node-metrics', diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts new file mode 100644 index 0000000000..92d3de996c --- /dev/null +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; + +import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; +import { + KubernetesNodePodsListConfigService, +} from '../../list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service'; + +@Component({ + selector: 'app-kubernetes-node-pods', + templateUrl: './kubernetes-node-pods.component.html', + styleUrls: ['./kubernetes-node-pods.component.scss'], + providers: [{ + provide: ListConfig, + useClass: KubernetesNodePodsListConfigService, + }] +}) +export class KubernetesNodePodsComponent { } diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts similarity index 91% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts index 572a86da86..637ef95cbb 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts @@ -3,8 +3,8 @@ import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs'; import { first, map, tap } from 'rxjs/operators'; -import { EndpointsService } from '../../../core/endpoints.service'; -import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types'; +import { EndpointsService } from '../../../../../core/src/core/endpoints.service'; +import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types'; import { BaseKubeGuid } from '../kubernetes-page.types'; import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; import { KubernetesNodeService } from '../services/kubernetes-node.service'; diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-page.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-page.types.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-page.types.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-page.types.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts similarity index 95% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts index 1fbe76d824..871f4e9a17 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts @@ -3,8 +3,8 @@ import * as moment from 'moment'; import { Observable, of } from 'rxjs'; import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators'; -import { EndpointsService } from '../../../core/endpoints.service'; -import { PreviewableComponent } from '../../../shared/previewable-component'; +import { EndpointsService } from '../../../../../core/src/core/endpoints.service'; +import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component'; import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; import { BasicKubeAPIResource, KubeAPIResource } from '../store/kube.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts similarity index 94% rename from custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts index b61ebc2c76..dc65b7eda1 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts @@ -3,8 +3,8 @@ import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs'; import { first, map, startWith } from 'rxjs/operators'; +import { FavoritesConfigMapper } from '../../../../../store/src/favorite-config-mapper'; import { UserFavoriteEndpoint } from '../../../../../store/src/types/user-favorites.types'; -import { FavoritesConfigMapper } from '../../../shared/components/favorites-meta-card/favorite-config-mapper'; import { BaseKubeGuid } from '../kubernetes-page.types'; import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; import { KubernetesService } from '../services/kubernetes.service'; diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts similarity index 98% rename from custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts index 57a9ff32eb..faa30bd980 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { NgxChartsModule } from '@swimlane/ngx-charts'; -import { CoreModule } from '../../core/core.module'; -import { SharedModule } from '../../shared/shared.module'; +import { CoreModule } from '../../../../core/src/core/core.module'; +import { SharedModule } from '../../../../core/src/shared/shared.module'; import { KubedashConfigurationComponent, } from './kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component'; diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.routing.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.routing.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts similarity index 92% rename from custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts index 03989028b4..88d75af289 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts @@ -1,11 +1,11 @@ import { CommonModule } from '@angular/common'; import { NgModule, Optional, SkipSelf } from '@angular/core'; +import { CoreModule } from '../../../../core/src/core/core.module'; +import { EndpointsService } from '../../../../core/src/core/endpoints.service'; +import { SharedModule } from '../../../../core/src/shared/shared.module'; import { EntityCatalogModule } from '../../../../store/src/entity-catalog.module'; -import { EndpointHealthCheck } from '../../../endpoints-health-checks'; -import { CoreModule } from '../../core/core.module'; -import { EndpointsService } from '../../core/endpoints.service'; -import { SharedModule } from '../../shared/shared.module'; +import { EndpointHealthCheck } from '../../../../store/src/entity-catalog/entity-catalog.types'; import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component'; import { KubernetesCertsAuthFormComponent, diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.store.module.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.store.module.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts similarity index 85% rename from custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts index 9185564ccb..82cb57d3e8 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts @@ -3,13 +3,13 @@ import { NgModule } from '@angular/core'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { generateStratosEntities } from '../../../../core/src/base-entity-types'; +import { CoreModule } from '../../../../core/src/core/core.module'; +import { SharedModule } from '../../../../core/src/shared/shared.module'; +import { AppTestModule } from '../../../../core/test-framework/core-test.helper'; import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module'; import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog'; import { createBasicStoreModule } from '../../../../store/testing/public-api'; -import { AppTestModule } from '../../../test-framework/core-test.helper'; -import { generateStratosEntities } from '../../base-entity-types'; -import { CoreModule } from '../../core/core.module'; -import { SharedModule } from '../../shared/shared.module'; import { HelmReleaseActivatedRouteMock, HelmReleaseGuidMock } from '../helm/helm-testing.module'; import { generateKubernetesEntities } from './kubernetes-entity-generator'; import { BaseKubeGuid } from './kubernetes-page.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.ts similarity index 87% rename from custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.ts index 0931336749..9d0c2975f4 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.ts @@ -3,10 +3,12 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter, first, map } from 'rxjs/operators'; +import { + EndpointListHelper, +} from '../../../../../core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers'; +import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types'; import { RouterNav } from '../../../../../store/src/actions/router.actions'; import { AppState } from '../../../../../store/src/app-state'; -import { EndpointListHelper } from '../../../shared/components/list/list-types/endpoint/endpoint-list.helpers'; -import { ListConfig } from '../../../shared/components/list/list.component.types'; import { KubernetesEndpointsListConfigService, } from '../list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kube-helm-list-types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-helm-list-types.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kube-helm-list-types.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-helm-list-types.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kube-list.helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts similarity index 88% rename from custom-src/frontend/app/custom/kubernetes/list-types/kube-list.helper.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts index f63fbb6ae7..5769d1bbee 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kube-list.helper.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts @@ -1,7 +1,7 @@ import * as moment from 'moment'; -import { DataFunction } from '../../../shared/components/list/data-sources-controllers/list-data-source'; -import { ITableColumn } from '../../../shared/components/list/list-table/table.types'; +import { DataFunction } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; +import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types'; import { BasicKubeAPIResource, ConditionType, KubernetesNode } from '../store/kube.types'; export function getConditionSort(condition: ConditionType): DataFunction { diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts similarity index 87% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts index 5ae3b49a74..b578a4ad05 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts @@ -1,16 +1,16 @@ import { Store } from '@ngrx/store'; +import { + BaseEndpointsDataSource, + syncPaginationSection, +} from '../../../../../../core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source'; +import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions'; import { AppState } from '../../../../../../store/src/app-state'; import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service'; import { InternalEventMonitorFactory } from '../../../../../../store/src/monitors/internal-event-monitor.factory'; import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory'; import { EndpointModel } from '../../../../../../store/src/types/endpoint.types'; -import { - BaseEndpointsDataSource, - syncPaginationSection, -} from '../../../../shared/components/list/list-types/endpoint/base-endpoints-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; export class KubernetesEndpointsDataSource extends BaseEndpointsDataSource { diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts similarity index 76% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts index 39e461d5b5..9115a09569 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts @@ -1,20 +1,22 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; +import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types'; +import { + BaseEndpointsDataSource, +} from '../../../../../../core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source'; +import { + EndpointCardComponent, +} from '../../../../../../core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component'; +import { + EndpointsListConfigService, +} from '../../../../../../core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service'; +import { IListConfig, ListViewTypes } from '../../../../../../core/src/shared/components/list/list.component.types'; import { AppState } from '../../../../../../store/src/app-state'; import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service'; import { InternalEventMonitorFactory } from '../../../../../../store/src/monitors/internal-event-monitor.factory'; import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory'; import { EndpointModel } from '../../../../../../store/src/types/endpoint.types'; -import { ITableColumn } from '../../../../shared/components/list/list-table/table.types'; -import { BaseEndpointsDataSource } from '../../../../shared/components/list/list-types/endpoint/base-endpoints-data-source'; -import { - EndpointCardComponent, -} from '../../../../shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component'; -import { - EndpointsListConfigService, -} from '../../../../shared/components/list/list-types/endpoint/endpoints-list-config.service'; -import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types'; import { KubernetesEndpointsDataSource } from './kubernetes-endpoints-data-source'; @Injectable() diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts similarity index 84% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts index 4c332d1f29..e70ac26fdf 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { KubernetesStatus } from '../../../../../../../../../custom-src/frontend/app/custom/kubernetes/store/kube.types'; -import { BaseTestModules } from '../../../../../test-framework/core-test.helper'; +import { BaseTestModules } from '../../../../../../core/test-framework/core-test.helper'; +import { KubernetesStatus } from '../../store/kube.types'; import { KubernetesLabelsCellComponent } from './kubernetes-labels-cell.component'; describe('KubernetesLabelsCellComponent', () => { diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts similarity index 76% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts index 46a6891b28..a22c8018e7 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; -import { AppChip } from '../../../../shared/components/chips/chips.component'; -import { TableCellCustom } from '../../../../shared/components/list/list.types'; +import { AppChip } from '../../../../../../core/src/shared/components/chips/chips.component'; +import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types'; import { KubeAPIResource } from '../../store/kube.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts similarity index 84% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts index b5c6dbc2aa..17d13b91a9 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts @@ -1,8 +1,8 @@ import { Store } from '@ngrx/store'; +import { ListDataSource } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; +import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { AppState } from '../../../../../../store/src/app-state'; -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory'; import { BaseKubeGuid } from '../../kubernetes-page.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts similarity index 88% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts index beb0626c7e..7ac8f28263 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts @@ -1,7 +1,7 @@ import { Store } from '@ngrx/store'; +import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { AppState } from '../../../../../../store/src/app-state'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubeService } from '../../store/kube.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts similarity index 81% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts index 2d9c5c125f..239363c136 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts @@ -1,9 +1,10 @@ import { Component, OnInit } from '@angular/core'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; +import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; + +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; +import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; import { KubernetesNamespace } from '../../../store/kube.types'; -import { Observable } from 'rxjs'; @Component({ selector: 'app-kube-namespace-pod-count', @@ -22,7 +23,7 @@ export class KubeNamespacePodCountComponent extends TableCellCustom pods.filter(p => p.metadata.namespace === this.row.metadata.name)), + map(pods => pods.filter(p => p.metadata.namespace === this.row.metadata.name)), map(p => p.length) ); } diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts similarity index 87% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts index 56a6ff0900..e39f0e95ce 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; import { KubernetesNamespace } from '../../../store/kube.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts similarity index 82% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts index 2c3a375252..76555c46ee 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts @@ -1,9 +1,9 @@ import { Store } from '@ngrx/store'; +import { ListDataSource } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; +import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions'; import { AppState } from '../../../../../../store/src/app-state'; -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { kubernetesNamespacesEntityType } from '../../kubernetes-entity-factory'; import { BaseKubeGuid } from '../../kubernetes-page.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts similarity index 91% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts index ebcdedd0dc..58b66774a6 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts @@ -3,12 +3,12 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter, first, map, tap } from 'rxjs/operators'; +import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types'; +import { IListConfig, ListViewTypes } from '../../../../../../core/src/shared/components/list/list.component.types'; import { AppState } from '../../../../../../store/src/app-state'; -import { ITableColumn } from '../../../../shared/components/list/list-table/table.types'; -import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types'; -import { KubernetesNamespace } from '../../../kubernetes/store/kube.types'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; +import { KubernetesNamespace } from '../../store/kube.types'; import { defaultHelmKubeListPageSize } from '../kube-helm-list-types'; import { createKubeAgeColumn } from '../kube-list.helper'; import { KubeNamespacePodCountComponent } from './kube-namespace-pod-count/kube-namespace-pod-count.component'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts similarity index 81% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts index f89ae7ae9f..746bf5e95a 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts @@ -1,8 +1,8 @@ import { Store } from '@ngrx/store'; +import { ListDataSource } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; +import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { AppState } from '../../../../../../store/src/app-state'; -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubernetesNodeService } from '../../services/kubernetes-node.service'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts similarity index 89% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts index 55bb13dee8..da889a853f 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { KubernetesNode } from '../../../store/kube.types'; @Component({ diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts similarity index 76% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts index bd000ef84d..8b1738b7d0 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts @@ -1,6 +1,7 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; + +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; @Component({ selector: 'app-kubernetes-node-capacity', diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts similarity index 88% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts index 456cb420cc..d037fbce9e 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { KubernetesAddressExternal, KubernetesAddressInternal, KubernetesNode } from '../../../store/kube.types'; @Component({ diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts similarity index 85% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts index 2ee563db06..07f0f35f7a 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { KubernetesNode } from '../../../store/kube.types'; @Component({ diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts similarity index 87% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts index 21d7d00432..39dc89844f 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; import { KubernetesNode } from '../../../store/kube.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts similarity index 88% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts index 09d1b10b64..1352f25bc6 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { ConditionType, ConditionTypeLabels, KubernetesNode } from '../../../store/kube.types'; @Component({ diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts similarity index 93% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts index c1a911eac3..b0b76ccb65 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts @@ -1,9 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { BaseKubeGuid } from '../../../../kubernetes-page.types'; +import { KubernetesBaseTestModules } from '../../../../kubernetes.testing.module'; import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service'; import { KubernetesNodeService } from '../../../../services/kubernetes-node.service'; -import { KubernetesBaseTestModules } from './../../../../kubernetes.testing.module'; import { KubernetesNodeSummaryCardComponent } from './kubernetes-node-summary-card.component'; describe('KubernetesNodeSummaryCardComponent', () => { diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts similarity index 88% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts index f50366727d..1f18811511 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts @@ -1,9 +1,10 @@ import { Component } from '@angular/core'; import { Observable } from 'rxjs'; -import { KubernetesNode } from '../../../../store/kube.types'; -import { AppChip } from '../../../../../../shared/components/chips/chips.component'; + +import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component'; import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service'; import { KubernetesNodeService } from '../../../../services/kubernetes-node.service'; +import { KubernetesNode } from '../../../../store/kube.types'; @Component({ selector: 'app-kubernetes-node-summary-card', diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts similarity index 81% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts index 4239df39d0..4aa3994061 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts @@ -1,8 +1,9 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { Observable } from 'rxjs'; -import { AppChip } from '../../../../../../shared/components/chips/chips.component'; +import { map } from 'rxjs/operators'; + +import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component'; import { KubernetesNodeService } from '../../../../services/kubernetes-node.service'; -import { map, tap } from 'rxjs/operators'; @Component({ selector: 'app-kubernetes-node-tags-card', diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts similarity index 85% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts index 30678de266..a51fbe5a8d 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts @@ -1,13 +1,13 @@ import { Store } from '@ngrx/store'; -import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions'; -import { AppState } from '../../../../../../store/src/app-state'; import { DataFunction, DataFunctionDefinition, ListDataSource, -} from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; +} from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; +import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; +import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions'; +import { AppState } from '../../../../../../store/src/app-state'; import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { kubernetesNodesEntityType } from '../../kubernetes-entity-factory'; import { BaseKubeGuid } from '../../kubernetes-page.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts similarity index 93% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts index c4dedf94e2..244d2739e7 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts @@ -1,11 +1,15 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; +import { DataFunction } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; +import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types'; +import { + IListConfig, + IListFilter, + ListViewTypes, +} from '../../../../../../core/src/shared/components/list/list.component.types'; import { AppState } from '../../../../../../store/src/app-state'; import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types'; -import { DataFunction } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { ITableColumn } from '../../../../shared/components/list/list-table/table.types'; -import { IListConfig, IListFilter, ListViewTypes } from '../../../../shared/components/list/list.component.types'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { ConditionType, KubernetesAddressExternal, KubernetesAddressInternal, KubernetesNode } from '../../store/kube.types'; import { defaultHelmKubeListPageSize } from '../kube-helm-list-types'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts similarity index 81% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts index 870883c356..75d4b752a8 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; import { KubernetesNode } from '../../../store/kube.types'; @@ -23,7 +23,7 @@ export class NodePodCountComponent extends TableCellCustom imple ngOnInit() { this.podCount$ = this.kubeEndpointService.pods$.pipe( - map(pods => pods.filter(p => p.spec.nodeName === this.row.metadata.name)), + map(pods => pods.filter(p => p.spec.nodeName === this.row.metadata.name)), map(p => `${p.length} / ${this.row.status.capacity.pods}`) ); } diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts similarity index 88% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts index d838567a71..d5b4702542 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts @@ -4,18 +4,22 @@ import * as moment from 'moment'; import { of } from 'rxjs'; import { filter, map } from 'rxjs/operators'; -import { BooleanIndicatorType } from '../../../../../shared/components/boolean-indicator/boolean-indicator.component'; -import { ITableListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source-types'; +import { + BooleanIndicatorType, +} from '../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component'; +import { + ITableListDataSource, +} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types'; import { TableCellBooleanIndicatorComponent, TableCellBooleanIndicatorComponentConfig, -} from '../../../../../shared/components/list/list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component'; +} from '../../../../../../../core/src/shared/components/list/list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component'; import { TableCellIconComponent, TableCellIconComponentConfig, -} from '../../../../../shared/components/list/list-table/table-cell-icon/table-cell-icon.component'; -import { ITableColumn } from '../../../../../shared/components/list/list-table/table.types'; -import { CardCell } from '../../../../../shared/components/list/list.types'; +} from '../../../../../../../core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component'; +import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types'; +import { CardCell } from '../../../../../../../core/src/shared/components/list/list.types'; import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog'; import { Container, ContainerState, ContainerStatus, InitContainer, KubernetesPod } from '../../../store/kube.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts similarity index 93% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts index e4294f09ef..7ba04b0ad1 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { KubernetesPodExpandedStatusTypes } from '../../../services/kubernetes-expanded-state'; import { KubernetesPod } from '../../../store/kube.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts similarity index 73% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts index 7d1eef9952..92dea65c38 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; -import { AppChip } from '../../../../../shared/components/chips/chips.component'; -import { PodLabel, KubeAPIResource } from '../../../store/kube.types'; + +import { AppChip } from '../../../../../../../core/src/shared/components/chips/chips.component'; +import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; +import { KubeAPIResource, PodLabel } from '../../../store/kube.types'; @Component({ selector: 'app-kubernetes-pod-tags', diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts similarity index 79% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts index 57d56cf38a..da0d7f92d2 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts @@ -1,8 +1,8 @@ import { Store } from '@ngrx/store'; +import { ListDataSource } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; +import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { AppState } from '../../../../../../store/src/app-state'; -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubernetesPod } from '../../store/kube.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts similarity index 93% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts index 0ad59ce8be..0c1c5199e7 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts @@ -5,13 +5,13 @@ import { } from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-types'; import { of } from 'rxjs'; -import { AppState } from '../../../../../../store/src/app-state'; import { TableCellSidePanelComponent, TableCellSidePanelConfig, -} from '../../../../shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component'; -import { ITableColumn } from '../../../../shared/components/list/list-table/table.types'; -import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types'; +} from '../../../../../../core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component'; +import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types'; +import { IListConfig, ListViewTypes } from '../../../../../../core/src/shared/components/list/list.component.types'; +import { AppState } from '../../../../../../store/src/app-state'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubernetesResourceViewerComponent, diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts similarity index 70% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts index 5dc2beed7c..2c0cad521b 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; -import { CardCell } from '../../../../shared/components/list/list.types'; -import { KubeService } from '../../../kubernetes/store/kube.types'; +import { CardCell } from '../../../../../../core/src/shared/components/list/list.types'; +import { KubeService } from '../../store/kube.types'; @Component({ selector: 'app-kubernetes-service-ports', diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts similarity index 83% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts index c4ab189296..e8615512b2 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts @@ -1,12 +1,12 @@ import { of } from 'rxjs'; -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; +import { ListDataSource } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; import { TableCellSidePanelComponent, TableCellSidePanelConfig, -} from '../../../../shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component'; -import { ITableColumn } from '../../../../shared/components/list/list-table/table.types'; -import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types'; +} from '../../../../../../core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component'; +import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types'; +import { IListConfig, ListViewTypes } from '../../../../../../core/src/shared/components/list/list.component.types'; import { KubernetesResourceViewerComponent, KubernetesResourceViewerConfig, diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts similarity index 79% rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts index 6b02912c88..89f60d414a 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts @@ -1,10 +1,10 @@ import { Store } from '@ngrx/store'; import { OperatorFunction } from 'rxjs'; +import { ListDataSource } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; +import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { AppState } from '../../../../../../store/src/app-state'; import { PaginatedAction } from '../../../../../../store/src/types/pagination.types'; -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; import { KubeService } from '../../store/kube.types'; export class BaseKubernetesServicesDataSource extends ListDataSource { diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.ts similarity index 92% rename from custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.ts index 0da0a94369..3fe46c7d38 100644 --- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.ts @@ -3,17 +3,17 @@ import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { EntityInfo } from '../../../../../store/src/types/api.types'; -import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types'; -import { IMetricApplication } from '../../../../../store/src/types/metric.types'; -import { getIdFromRoute } from '../../../core/utils.service'; -import { MetricsConfig } from '../../../shared/components/metrics-chart/metrics-chart.component'; -import { MetricsLineChartConfig } from '../../../shared/components/metrics-chart/metrics-chart.types'; +import { getIdFromRoute } from '../../../../../core/src/core/utils.service'; +import { MetricsConfig } from '../../../../../core/src/shared/components/metrics-chart/metrics-chart.component'; +import { MetricsLineChartConfig } from '../../../../../core/src/shared/components/metrics-chart/metrics-chart.types'; import { ChartDataTypes, getMetricsChartConfigBuilder, -} from '../../../shared/components/metrics-chart/metrics.component.helpers'; -import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types'; +} from '../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers'; +import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types'; +import { EntityInfo } from '../../../../../store/src/types/api.types'; +import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types'; +import { IMetricApplication } from '../../../../../store/src/types/metric.types'; import { kubeEntityCatalog } from '../kubernetes-entity-catalog'; import { formatAxisCPUTime, formatCPUTime } from '../kubernetes-metrics.helpers'; import { BaseKubeGuid } from '../kubernetes-page.types'; diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-expanded-state.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-expanded-state.ts diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-namespace.service.ts similarity index 93% rename from custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-namespace.service.ts index c4686cf28b..03f3758a06 100644 --- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-namespace.service.ts @@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs'; import { filter, first, map, publishReplay } from 'rxjs/operators'; -import { getIdFromRoute } from '../../../core/utils.service'; +import { getIdFromRoute } from '../../../../../core/src/core/utils.service'; import { kubeEntityCatalog } from '../kubernetes-entity-catalog'; import { KubernetesNamespace } from '../store/kube.types'; import { KubernetesEndpointService } from './kubernetes-endpoint.service'; diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts similarity index 95% rename from custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts index 096eb86efa..3dd564f2e0 100644 --- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts @@ -4,12 +4,12 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter, first, map, shareReplay } from 'rxjs/operators'; +import { getIdFromRoute } from '../../../../../core/src/core/utils.service'; import { MetricQueryConfig, MetricsAction } from '../../../../../store/src/actions/metrics.actions'; import { AppState } from '../../../../../store/src/app-state'; import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; import { EntityInfo } from '../../../../../store/src/types/api.types'; -import { getIdFromRoute } from '../../../core/utils.service'; -import { MetricQueryType } from '../../../shared/services/metrics-range-selector.types'; +import { MetricQueryType } from '../../../../../store/src/types/metric.types'; import { kubeEntityCatalog } from '../kubernetes-entity-catalog'; import { KubernetesNode, MetricStatistic } from '../store/kube.types'; import { FetchKubernetesMetricsAction } from '../store/kubernetes.actions'; diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts similarity index 83% rename from custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts index 8695c7b9ba..678b9eceed 100644 --- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts @@ -2,11 +2,11 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { map, shareReplay } from 'rxjs/operators'; +import { endpointEntityType, stratosEntityFactory } from '../../../../../store/src/helpers/stratos-entity-factory'; import { PaginationMonitor } from '../../../../../store/src/monitors/pagination-monitor'; import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types'; import { endpointListKey, EndpointModel } from '../../../../../store/src/types/endpoint.types'; -import { endpointEntitySchema } from '../../../base-entity-schemas'; @Injectable() export class KubernetesService { @@ -17,9 +17,10 @@ export class KubernetesService { constructor( private paginationMonitorFactory: PaginationMonitorFactory ) { + // TODO: RC update with stratos entity catalog this.kubeEndpointsMonitor = this.paginationMonitorFactory.create( endpointListKey, - endpointEntitySchema, + stratosEntityFactory(endpointEntityType), true ); diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts similarity index 97% rename from custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts index ef66c673df..f08ff16fb3 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts @@ -1,4 +1,4 @@ -import { environment } from '../../../environments/environment'; +import { environment } from '../../../../../core/src/environments/environment'; import { BasicKubeAPIResource, KubernetesDeployment, diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/store/kube.types.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.actions.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.actions.ts diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts similarity index 98% rename from custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts index 645dc5b91e..5f47b4a890 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts @@ -8,16 +8,16 @@ import { connectedEndpointsOfTypesSelector } from 'frontend/packages/store/src/s import { of } from 'rxjs'; import { catchError, first, flatMap, map, mergeMap, switchMap } from 'rxjs/operators'; +import { environment } from '../../../../../core/src/environments/environment'; import { AppState } from '../../../../../store/src/app-state'; import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog'; +import { isJetstreamError } from '../../../../../store/src/jetstream'; import { NormalizedResponse } from '../../../../../store/src/types/api.types'; import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess, } from '../../../../../store/src/types/request.types'; -import { environment } from '../../../environments/environment'; -import { isJetstreamError } from '../../../jetstream.helpers'; import { KUBERNETES_ENDPOINT_TYPE, kubernetesDashboardEntityType, diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts similarity index 58% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts index 6251e638fb..2611cb9caa 100644 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { KubernetesNamespacesListConfigService } from '../../list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service'; -import { ListConfig } from '../../../../shared/components/list/list.component.types'; +import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; +import { + KubernetesNamespacesListConfigService, +} from '../../list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service'; @Component({ selector: 'app-kubernetes-namespaces-tab', @@ -15,5 +17,5 @@ import { ListConfig } from '../../../../shared/components/list/list.component.ty }) export class KubernetesNamespacesTabComponent { - constructor(private activatedRoute: ActivatedRoute) {} + constructor(private activatedRoute: ActivatedRoute) { } } diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts similarity index 83% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts index 091908c2fe..07b711cc83 100644 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { ListConfig } from '../../../../shared/components/list/list.component.types'; +import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { KubernetesNodesListConfigService } from '../../list-types/kubernetes-nodes/kubernetes-nodes-list-config.service'; @Component({ diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts similarity index 74% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts index e2a64d7e59..e4f52d8eb5 100644 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { ListConfig } from '../../../../shared/components/list/list.component.types'; +import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { KubernetesPodsListConfigService } from '../../list-types/kubernetes-pods/kubernetes-pods-list-config.service'; @Component({ @@ -12,4 +12,4 @@ import { KubernetesPodsListConfigService } from '../../list-types/kubernetes-pod useClass: KubernetesPodsListConfigService, }] }) -export class KubernetesPodsTabComponent {} +export class KubernetesPodsTabComponent { } diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts similarity index 97% rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts index dbd6642698..7548a95d02 100644 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts @@ -6,16 +6,16 @@ import { Store } from '@ngrx/store'; import { combineLatest, interval, Observable, Subscription } from 'rxjs'; import { first, map, startWith } from 'rxjs/operators'; +import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service'; +import { + IChartThresholds, + ISimpleUsageChartData, +} from '../../../../../../core/src/shared/components/simple-usage-chart/simple-usage-chart.types'; import { AppState } from '../../../../../../store/src/app-state'; import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog'; import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory'; import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types'; import { PaginatedAction, PaginationEntityState } from '../../../../../../store/src/types/pagination.types'; -import { safeUnsubscribe } from '../../../../core/utils.service'; -import { - IChartThresholds, - ISimpleUsageChartData, -} from '../../../../shared/components/simple-usage-chart/simple-usage-chart.types'; import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts similarity index 93% rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts index 49eb16ba5b..fff1bab700 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts @@ -1,7 +1,7 @@ import { DatePipe } from '@angular/common'; import { Component, Input } from '@angular/core'; -import { CardCell } from '../../../../../shared/components/list/list.types'; +import { CardCell } from '../../../../../../../core/src/shared/components/list/list.types'; import { HelmRelease } from '../../workload.types'; @Component({ diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts similarity index 93% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts index 3c3721943c..022bb87ddf 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts @@ -5,12 +5,12 @@ import { Observable, Subject, Subscription } from 'rxjs'; import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets'; import { catchError, map, share, switchMap } from 'rxjs/operators'; -import { HideSnackBar, ShowSnackBar } from '../../../../../../../store/src/actions/snackBar.actions'; +import { LoggerService } from '../../../../../../../core/src/core/logger.service'; +import { IPageSideNavTab } from '../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component'; +import { SnackBarService } from '../../../../../../../core/src/shared/services/snackbar.service'; import { AppState } from '../../../../../../../store/src/app-state'; import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog'; import { EntityRequestAction, WrapperRequestActionSuccess } from '../../../../../../../store/src/types/request.types'; -import { LoggerService } from '../../../../../core/logger.service'; -import { IPageSideNavTab } from '../../../../../features/dashboard/page-side-nav/page-side-nav.component'; import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog'; import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state'; import { KubernetesPod, KubeService } from '../../../store/kube.types'; @@ -65,7 +65,8 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { constructor( public helmReleaseHelper: HelmReleaseHelperService, private store: Store, - private logService: LoggerService + private logService: LoggerService, + private snackbarService: SnackBarService ) { this.title = this.helmReleaseHelper.releaseTitle; @@ -145,9 +146,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { this.addResource(releaseResourceAction, resources); } else if (messageObj.kind === 'ManifestErrors') { if (messageObj.data) { - this.store.dispatch( - new ShowSnackBar('Errors were found when parsing this workload. Not all resources may be shown', 'Dismiss') - ); + this.snackbarService.show('Errors were found when parsing this workload. Not all resources may be shown', 'Dismiss') } } } @@ -196,6 +195,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { ngOnDestroy() { this.sub.unsubscribe(); - this.store.dispatch(new HideSnackBar()); + this.snackbarService.hide(); } } diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts similarity index 95% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts index 759e70acda..3ced3774ae 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts @@ -6,11 +6,11 @@ import { ConfirmationDialogConfig } from 'frontend/packages/core/src/shared/comp import { ConfirmationDialogService } from 'frontend/packages/core/src/shared/components/confirmation-dialog.service'; import { ClearPaginationOfType } from 'frontend/packages/store/src/actions/pagination.actions'; import { RouterNav } from 'frontend/packages/store/src/actions/router.actions'; -import { HideSnackBar, ShowSnackBar } from 'frontend/packages/store/src/actions/snackBar.actions'; import { AppState } from 'frontend/packages/store/src/app-state'; import { combineLatest, Observable, ReplaySubject } from 'rxjs'; import { distinctUntilChanged, filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators'; +import { SnackBarService } from '../../../../../../../../core/src/shared/services/snackbar.service'; import { endpointsEntityRequestDataSelector } from '../../../../../../../../store/src/selectors/endpoint.selectors'; import { HelmReleaseChartData, HelmReleaseResource } from '../../../workload.types'; import { workloadsEntityCatalog } from '../../../workloads-entity-catalog'; @@ -95,7 +95,8 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy { private store: Store, private confirmDialog: ConfirmationDialogService, private httpClient: HttpClient, - private logService: LoggerService + private logService: LoggerService, + private snackbarService: SnackBarService ) { this.isBusy$ = combineLatest([ @@ -197,7 +198,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy { this.httpClient.delete(`/pp/v1/helm/releases/${endpointAndName}`).subscribe({ error: (err: any) => { this.endDelete(); - this.store.dispatch(new ShowSnackBar('Failed to delete release', 'Close')); + this.snackbarService.show('Failed to delete release', 'Close'); this.logService.error('Failed to delete release: ', err); }, complete: () => { @@ -212,7 +213,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy { ngOnDestroy() { if (this.deleted) { - this.store.dispatch(new HideSnackBar()); + this.snackbarService.hide(); } } diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.html similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.html diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts similarity index 92% rename from custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts index fd8813dbb9..f86ea01624 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts @@ -5,7 +5,7 @@ import { endpointOfTypeSelector } from 'frontend/packages/store/src/selectors/en import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { ListConfig } from '../../../../shared/components/list/list.component.types'; +import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; import { HELM_ENDPOINT_TYPE } from '../../../helm/helm-entity-factory'; import { HelmReleasesListConfig } from '../list-types/helm-releases-list-config.service'; import { KubernetesNamespacesFilterService } from '../list-types/kube-namespaces-filter-config.service'; diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workload-action-builders.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workload-action-builders.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.actions.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.actions.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.reducers.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.reducers.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.store.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.store.module.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.store.module.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.store.module.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts similarity index 92% rename from custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts index 6514ee1c00..a9ff97b006 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts +++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { NgxGraphModule } from '@swimlane/ngx-graph'; -import { CoreModule } from '../../../core/core.module'; -import { SharedModule } from '../../../shared/shared.module'; +import { CoreModule } from '../../../../../core/src/core/core.module'; +import { SharedModule } from '../../../../../core/src/shared/shared.module'; import { KubernetesModule } from '../kubernetes.module'; import { HelmReleaseCardComponent } from './list-types/helm-release-card/helm-release-card.component'; import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component'; diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.routing.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts similarity index 100% rename from custom-src/frontend/app/custom/kubernetes/workloads/workloads.routing.ts rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts diff --git a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.html b/src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.html similarity index 100% rename from custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.html rename to src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.html diff --git a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.scss similarity index 100% rename from custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.scss rename to src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.scss diff --git a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.ts b/src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.ts similarity index 92% rename from custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.ts rename to src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.ts index d332fed1be..b67379c282 100644 --- a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.ts @@ -5,7 +5,7 @@ import { filter, map } from 'rxjs/operators'; import { AppState } from '../../../../store/src/app-state'; import { AuthState } from '../../../../store/src/reducers/auth.reducer'; -import { SessionData } from './../../../../store/src/types/auth.types'; +import { SessionData } from '../../../../store/src/types/auth.types'; @Component({ selector: 'app-suse-about-info', diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.html b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html similarity index 100% rename from custom-src/frontend/app/custom/suse-login/suse-login.component.html rename to src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss similarity index 98% rename from custom-src/frontend/app/custom/suse-login/suse-login.component.scss rename to src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss index f08c6bd2be..8ea9135bb9 100644 --- a/custom-src/frontend/app/custom/suse-login/suse-login.component.scss +++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss @@ -1,4 +1,5 @@ -@import '../../../sass/custom/suse-colors'; +@import '../../../../suse-theme/sass/custom/suse-colors'; + .suse-login { align-items: center; background-color: $suse-blue; diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/suse-login/suse-login.component.spec.ts rename to src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.spec.ts diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.ts b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.ts similarity index 72% rename from custom-src/frontend/app/custom/suse-login/suse-login.component.ts rename to src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.ts index 8e308820c1..1376343844 100644 --- a/custom-src/frontend/app/custom/suse-login/suse-login.component.ts +++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.ts @@ -1,10 +1,10 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { Store } from '@ngrx/store'; +import { CustomizationService, CustomizationsMetadata } from '../../../../core/src/core/customizations.types'; +import { StratosLoginComponent } from '../../../../core/src/core/extension/extension-service'; +import { LoginPageComponent } from '../../../../core/src/features/login/login-page/login-page.component'; import { AppState } from '../../../../store/src/app-state'; -import { CustomizationService, CustomizationsMetadata } from '../../core/customizations.types'; -import { StratosLoginComponent } from '../../core/extension/extension-service'; -import { LoginPageComponent } from '../../features/login/login-page/login-page.component'; @StratosLoginComponent() @Component({ diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/src/frontend/packages/suse-extensions/src/custom/suse-routing.module.ts similarity index 97% rename from custom-src/frontend/app/custom/custom-routing.module.ts rename to src/frontend/packages/suse-extensions/src/custom/suse-routing.module.ts index 59ddebd3b8..efabd4582e 100644 --- a/custom-src/frontend/app/custom/custom-routing.module.ts +++ b/src/frontend/packages/suse-extensions/src/custom/suse-routing.module.ts @@ -54,4 +54,4 @@ const customRoutes: Routes = [ ], declarations: [] }) -export class CustomRoutingModule { } +export class SuseRoutingModule { } diff --git a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.html similarity index 100% rename from custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html rename to src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.html diff --git a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss similarity index 91% rename from custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.scss rename to src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss index ee42a17333..21b16098cb 100644 --- a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.scss +++ b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss @@ -1,4 +1,4 @@ -@import '../../../sass/custom/suse-colors'; +@import '../../../../suse-theme/sass/custom/suse-colors'; .no-endpoints-message { color: $suse-button-gray; diff --git a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.ts b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.ts similarity index 100% rename from custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.ts rename to src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.ts diff --git a/custom-src/frontend/app/custom/custom.module.ts b/src/frontend/packages/suse-extensions/src/custom/suse.module.ts similarity index 84% rename from custom-src/frontend/app/custom/custom.module.ts rename to src/frontend/packages/suse-extensions/src/custom/suse.module.ts index 9c3292afa2..09e8c82911 100644 --- a/custom-src/frontend/app/custom/custom.module.ts +++ b/src/frontend/packages/suse-extensions/src/custom/suse.module.ts @@ -1,10 +1,10 @@ import { NgModule } from '@angular/core'; import { Router } from '@angular/router'; -import { CoreModule } from '../core/core.module'; -import { CustomizationService, CustomizationsMetadata } from '../core/customizations.types'; -import { MDAppModule } from '../core/md.module'; -import { SharedModule } from '../shared/shared.module'; +import { CoreModule } from '../../../core/src/core/core.module'; +import { CustomizationService, CustomizationsMetadata } from '../../../core/src/core/customizations.types'; +import { MDAppModule } from '../../../core/src/core/md.module'; +import { SharedModule } from '../../../core/src/shared/shared.module'; import { DemoHelperComponent } from './demo/demo-helper/demo-helper.component'; import { HelmSetupModule } from './helm/helm.setup.module'; import { KubernetesSetupModule } from './kubernetes/kubernetes.setup.module'; @@ -42,7 +42,7 @@ const SuseCustomizations: CustomizationsMetadata = { DemoHelperComponent, ] }) -export class CustomModule { +export class SuseModule { static init = false; @@ -50,13 +50,13 @@ export class CustomModule { cs.set(SuseCustomizations); // Only update the routes once - if (!CustomModule.init) { + if (!SuseModule.init) { // Override the component used for the login route const routeConfig = [...router.config]; const loginRoute = routeConfig.find(r => r.path === 'login') || {}; loginRoute.component = SuseLoginComponent; router.resetConfig(routeConfig); - CustomModule.init = true; + SuseModule.init = true; } } } diff --git a/src/frontend/packages/suse-extensions/src/public-api.ts b/src/frontend/packages/suse-extensions/src/public-api.ts new file mode 100644 index 0000000000..82ee7d4da7 --- /dev/null +++ b/src/frontend/packages/suse-extensions/src/public-api.ts @@ -0,0 +1,4 @@ +// Custom Extensions + +export * from './custom/suse.module' +export * from './custom/suse-routing.module' \ No newline at end of file diff --git a/src/frontend/packages/suse-theme/_index.scss b/src/frontend/packages/suse-theme/_index.scss new file mode 100644 index 0000000000..a8d3f300e1 --- /dev/null +++ b/src/frontend/packages/suse-theme/_index.scss @@ -0,0 +1,9 @@ +@import '~@stratosui/theme/helper'; + +// Custom Theme +@import './sass/custom'; + +@function stratos-theme() { + $theme: stratos-theme-helper($stratos-theme); + @return $theme +} \ No newline at end of file diff --git a/custom-src/frontend/assets/custom/aks.svg b/src/frontend/packages/suse-theme/assets/core/custom/aks.svg similarity index 100% rename from custom-src/frontend/assets/custom/aks.svg rename to src/frontend/packages/suse-theme/assets/core/custom/aks.svg diff --git a/custom-src/frontend/assets/custom/app_placeholder.svg b/src/frontend/packages/suse-theme/assets/core/custom/app_placeholder.svg similarity index 100% rename from custom-src/frontend/assets/custom/app_placeholder.svg rename to src/frontend/packages/suse-theme/assets/core/custom/app_placeholder.svg diff --git a/custom-src/frontend/assets/custom/caasp.png b/src/frontend/packages/suse-theme/assets/core/custom/caasp.png similarity index 100% rename from custom-src/frontend/assets/custom/caasp.png rename to src/frontend/packages/suse-theme/assets/core/custom/caasp.png diff --git a/custom-src/frontend/assets/custom/eks.svg b/src/frontend/packages/suse-theme/assets/core/custom/eks.svg similarity index 100% rename from custom-src/frontend/assets/custom/eks.svg rename to src/frontend/packages/suse-theme/assets/core/custom/eks.svg diff --git a/custom-src/frontend/assets/custom/gke.svg b/src/frontend/packages/suse-theme/assets/core/custom/gke.svg similarity index 100% rename from custom-src/frontend/assets/custom/gke.svg rename to src/frontend/packages/suse-theme/assets/core/custom/gke.svg diff --git a/custom-src/frontend/assets/custom/helm.svg b/src/frontend/packages/suse-theme/assets/core/custom/helm.svg similarity index 100% rename from custom-src/frontend/assets/custom/helm.svg rename to src/frontend/packages/suse-theme/assets/core/custom/helm.svg diff --git a/custom-src/frontend/assets/custom/help/en/connecting_gke.md b/src/frontend/packages/suse-theme/assets/core/custom/help/en/connecting_gke.md similarity index 100% rename from custom-src/frontend/assets/custom/help/en/connecting_gke.md rename to src/frontend/packages/suse-theme/assets/core/custom/help/en/connecting_gke.md diff --git a/custom-src/frontend/assets/custom/kube_import.png b/src/frontend/packages/suse-theme/assets/core/custom/kube_import.png similarity index 100% rename from custom-src/frontend/assets/custom/kube_import.png rename to src/frontend/packages/suse-theme/assets/core/custom/kube_import.png diff --git a/custom-src/frontend/assets/custom/kubernetes.svg b/src/frontend/packages/suse-theme/assets/core/custom/kubernetes.svg similarity index 100% rename from custom-src/frontend/assets/custom/kubernetes.svg rename to src/frontend/packages/suse-theme/assets/core/custom/kubernetes.svg diff --git a/custom-src/frontend/assets/custom/placeholder.png b/src/frontend/packages/suse-theme/assets/core/custom/placeholder.png similarity index 100% rename from custom-src/frontend/assets/custom/placeholder.png rename to src/frontend/packages/suse-theme/assets/core/custom/placeholder.png diff --git a/custom-src/frontend/assets/custom/suse_logo.png b/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.png similarity index 100% rename from custom-src/frontend/assets/custom/suse_logo.png rename to src/frontend/packages/suse-theme/assets/core/custom/suse_logo.png diff --git a/custom-src/frontend/assets/custom/susecon-logo.svg b/src/frontend/packages/suse-theme/assets/core/custom/susecon-logo.svg similarity index 100% rename from custom-src/frontend/assets/custom/susecon-logo.svg rename to src/frontend/packages/suse-theme/assets/core/custom/susecon-logo.svg diff --git a/custom-src/frontend/assets/eula.html b/src/frontend/packages/suse-theme/assets/core/eula.html similarity index 100% rename from custom-src/frontend/assets/eula.html rename to src/frontend/packages/suse-theme/assets/core/eula.html diff --git a/custom-src/frontend/assets/logo.png b/src/frontend/packages/suse-theme/assets/core/logo.png similarity index 100% rename from custom-src/frontend/assets/logo.png rename to src/frontend/packages/suse-theme/assets/core/logo.png diff --git a/custom-src/frontend/assets/nav-logo-icon.png b/src/frontend/packages/suse-theme/assets/core/nav-logo-icon.png similarity index 100% rename from custom-src/frontend/assets/nav-logo-icon.png rename to src/frontend/packages/suse-theme/assets/core/nav-logo-icon.png diff --git a/custom-src/frontend/assets/nav-logo.png b/src/frontend/packages/suse-theme/assets/core/nav-logo.png similarity index 100% rename from custom-src/frontend/assets/nav-logo.png rename to src/frontend/packages/suse-theme/assets/core/nav-logo.png diff --git a/custom-src/frontend/favicon.ico b/src/frontend/packages/suse-theme/assets/favicon.ico similarity index 100% rename from custom-src/frontend/favicon.ico rename to src/frontend/packages/suse-theme/assets/favicon.ico diff --git a/custom-src/frontend/loading.css b/src/frontend/packages/suse-theme/loader/loading.css similarity index 100% rename from custom-src/frontend/loading.css rename to src/frontend/packages/suse-theme/loader/loading.css diff --git a/custom-src/frontend/loading.html b/src/frontend/packages/suse-theme/loader/loading.html similarity index 100% rename from custom-src/frontend/loading.html rename to src/frontend/packages/suse-theme/loader/loading.html diff --git a/src/frontend/packages/suse-theme/package.json b/src/frontend/packages/suse-theme/package.json new file mode 100644 index 0000000000..76385dc742 --- /dev/null +++ b/src/frontend/packages/suse-theme/package.json @@ -0,0 +1,18 @@ +{ + "name": "@suse/theme", + "version": "0.0.1", + "stratos": { + "assets": { + "assets/core": "core/assets", + "assets/favicon.ico": "favicon.ico" + }, + "theme": { + "loadingCss": "loader/loading.css", + "loadingHtml": "loader/loading.html" + } + }, + "peerDependencies": {}, + "scripts": { + "build": "rm -rf ../../../../dist/theme && mkdir -p ../../../../dist/theme && cp -R * ../../../../dist/theme" + } +} diff --git a/custom-src/frontend/sass/custom.scss b/src/frontend/packages/suse-theme/sass/custom.scss similarity index 100% rename from custom-src/frontend/sass/custom.scss rename to src/frontend/packages/suse-theme/sass/custom.scss diff --git a/custom-src/frontend/sass/custom/suse-colors.scss b/src/frontend/packages/suse-theme/sass/custom/suse-colors.scss similarity index 100% rename from custom-src/frontend/sass/custom/suse-colors.scss rename to src/frontend/packages/suse-theme/sass/custom/suse-colors.scss diff --git a/custom-src/frontend/sass/custom/suse.scss b/src/frontend/packages/suse-theme/sass/custom/suse.scss similarity index 100% rename from custom-src/frontend/sass/custom/suse.scss rename to src/frontend/packages/suse-theme/sass/custom/suse.scss diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum index 0e5bb28dde..f2675b2c00 100644 --- a/src/jetstream/go.sum +++ b/src/jetstream/go.sum @@ -344,6 +344,8 @@ github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY= +github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY= @@ -796,6 +798,8 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81 helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw= helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/src/test-e2e/e2e.ts b/src/test-e2e/e2e.ts index a4215aaa53..4a8cd7802f 100644 --- a/src/test-e2e/e2e.ts +++ b/src/test-e2e/e2e.ts @@ -20,7 +20,7 @@ export class E2E { * Temporary location for customization, we should in future look to fetch this a better way from client side code */ public static customization: CustomizationsMetadata = { - alwaysShowNavForEndpointTypes: (epType) => true + alwaysShowNavForEndpointTypes: (epType) => false } // General helpers diff --git a/src/tsconfig.json b/src/tsconfig.json index e1e22ea606..a6be48f071 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -33,7 +33,8 @@ "@stratosui/core": ["frontend/packages/core/src/public-api.ts"], "@stratosui/store": ["frontend/packages/store/src/public-api.ts"], "@stratosui/store/testing": ["frontend/packages/store/testing/public-api.ts"], - "@example/extensions": ["frontend/packages/example-extensions/src/public-api.ts"] + "@example/extensions": ["frontend/packages/example-extensions/src/public-api.ts"], + "@suse/extensions": ["frontend/packages/suse-extensions/src/public-api.ts"], } } } diff --git a/custom-src/stratos.yaml b/stratos.yaml similarity index 100% rename from custom-src/stratos.yaml rename to stratos.yaml