Rc migrate2

.github/workflows/storybook.yaml

@@ -3,7 +3,7 @@ on:
   push:
     paths:
       - 'storybook/**/*'
-      - 'pkg/rancher-components/**/*'
+      - 'shell/rc/**/*'
       - 'shell/components/**/*'
       - 'shell/assets/**/*'
       - 'shell/utils/**/*'
@@ -15,7 +15,7 @@ on:
   pull_request:
     paths:
       - 'storybook/**/*'
-      - 'pkg/rancher-components/**/*'
+      - 'shell/rc/**/*'
       - 'shell/components/**/*'
       - 'shell/assets/**/*'
       - 'shell/utils/**/*'

.github/workflows/test.yaml

@@ -83,7 +83,7 @@ jobs:
           ['@generic', '@globalSettings'],
           ['@manager'],
           ['@userMenu', '@usersAndAuths'],
-          ['@components'],
+          ['@rc'],
           ['@noVai']
         ]
     runs-on: ubuntu-latest

.gitignore

@@ -104,7 +104,6 @@ tmp
 .todo
 
 # Plugins - temporary
-shell/rancher-components
 shell/types/shell
 
 # standalone script

.vscode/settings.json

@@ -12,7 +12,7 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
   },
-  "eslint.workingDirectories": ["./", "./pkg/rancher-components/"],
+  "eslint.workingDirectories": ["./"],
   "javascript.preferences.importModuleSpecifier": "non-relative",
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "cSpell.words": [

codecov.yml

@@ -22,6 +22,3 @@ flags:
   epinio:
     paths: 
     - pkg/epinio
-  rancher-components:
-    paths: 
-    - pkg/rancher-components

creators/extension/pkg/files/tsconfig.json

@@ -36,7 +36,7 @@
       "@shell/*": [
         "../../node_modules/@rancher/shell/*"
       ],
-      "@components/*": [
+      "@rc/*": [
         "@rancher/components/*"
       ]
     }

cypress.config.ts

@@ -86,7 +86,7 @@ export default defineConfig({
       ],
       include: [
         'shell/**/*.{vue,ts,js}',
-        'pkg/rancher-components/src/components/**/*.{vue,ts,js}',
+        'shell/rc/**/*.{vue,ts,js}',
       ]
     },
     api:                 apiUrl,

cypress/e2e/tests/components/yaml-editor.spec.ts

@@ -21,7 +21,7 @@ describe('Yaml Editor', () => {
   });
 
   describe('Edit mode', () => {
-    it('Check if body and footer are visible to human eye', { tags: ['@components', '@adminUser'] }, () => {
+    it('Check if body and footer are visible to human eye', { tags: ['@rc', '@adminUser'] }, () => {
       deploymentsListPage.goTo();
       deploymentsListPage.listElementWithName(name).should('exist');
       deploymentsListPage.goToEditYamlPage(name);

cypress/e2e/tests/setup/rancher-setup.spec.ts

@@ -6,7 +6,7 @@ import { serverUrlLocalhostCases, urlWithTrailingForwardSlash, httpUrl, nonUrlCa
 
 // Cypress or the GrepTags avoid to run multiples times the same test for each tag used.
 // This is a temporary solution till initialization is not handled as a test
-describe('Rancher setup', { tags: ['@adminUserSetup', '@standardUserSetup', '@setup', '@components', '@navigation', '@charts', '@explorer', '@explorer2', '@extensions', '@fleet', '@generic', '@globalSettings', '@manager', '@userMenu', '@usersAndAuths', '@elemental', '@noVai', '@virtualizationMgmt', '@accessibility'] }, () => {
+describe('Rancher setup', { tags: ['@adminUserSetup', '@standardUserSetup', '@setup', '@rc', '@navigation', '@charts', '@explorer', '@explorer2', '@extensions', '@fleet', '@generic', '@globalSettings', '@manager', '@userMenu', '@usersAndAuths', '@elemental', '@noVai', '@virtualizationMgmt', '@accessibility'] }, () => {
   const rancherSetupLoginPage = new RancherSetupLoginPagePo();
   const rancherSetupConfigurePage = new RancherSetupConfigurePage();
   const homePage = new HomePagePo();

docusaurus/docs/internal/testing/e2e-test.md

@@ -384,7 +384,7 @@ More info about cypress-grep plugin can be found [here](https://www.npmjs.com/pa
 ### E2E with feature tags
 
 As part of parallelization process and identification of features, tags have been added following the file tree structure of `cypress/e2e/tests/pages`.
-These are the added specs tags for each category: `@components`, `@navigation`, `@charts`, `@explorer`, `@extensions`, `@fleet`, `@generic`, `@globalSettings`, `@manager`, `@userMenu`, `@usersAndAuths`.
+These are the added specs tags for each category: `@rc`, `@navigation`, `@charts`, `@explorer`, `@extensions`, `@fleet`, `@generic`, `@globalSettings`, `@manager`, `@userMenu`, `@usersAndAuths`.
 
 ### E2E tests parallelization in CI
 
@@ -407,7 +407,7 @@ matrix:
     ['@generic', '@globalSettings'],
     ['@manager'],
     ['@userMenu', '@usersAndAuths'],
-    ['@components'],
+    ['@rc'],
   ]
 ```
 

env.template

@@ -4,7 +4,7 @@ CATTLE_BOOTSTRAP_PASSWORD=                        # (optional) Rancher password
 CATTLE_PASSWORD_MIN_LENGTH=                       # (optional) (default: 12) Minimum length of the Rancher initialization password
 
 # Packages to exclude. Running `yarn clean` may be required in order for changes to take affect.
-EXCLUDES_PKG="rancher-components"
+EXCLUDES_PKG=""
 
 # E2E
 TEST_USERNAME=admin                               # Rancher user, initial one is always 'admin'

jest.config.js

@@ -19,7 +19,7 @@ module.exports = {
     '^@/(.*)$':                                                                      '<rootDir>/$1',
     '@shell/(.*)':                                                                   '<rootDir>/shell/$1',
     '@pkg/(.*)':                                                                     '<rootDir>/pkg/$1',
-    '@components/(.*)':                                                              '<rootDir>/pkg/rancher-components/src/components/$1',
+    '@rc/(.*)':                                                                      '<rootDir>/shell/rc/$1',
     '\\.(jpe?g|png|gif|webp|svg|mp4|webm|ogg|mp3|wav|flac|aac|woff2?|eot|ttf|otf)$': '<rootDir>/svgTransform.js',
   },
   modulePathIgnorePatterns: [
@@ -55,7 +55,7 @@ module.exports = {
   collectCoverage:     false,
   collectCoverageFrom: [
     '<rootDir>/shell/**/*.{vue,ts,js}',
-    '<rootDir>/pkg/rancher-components/src/components/**/*.{vue,ts,js}',
+    '<rootDir>/shell/rc/**/*.{vue,ts,js}',
     '!<rootDir>/shell/scripts/',
   ],
   coveragePathIgnorePatterns: [

package.json

@@ -9,17 +9,13 @@
   "engines": {
     "node": ">=20.0.0"
   },
-  "workspaces": [
-    "pkg/rancher-components"
-  ],
   "scripts": {
     "build-pkg": "yarn lint && ./shell/scripts/build-pkg.sh",
     "publish-pkg": "./shell/scripts/publish-pkg.sh",
     "serve-pkgs": "./shell/scripts/serve-pkgs",
     "publish-shell-reset-reg": "cd shell && npm publish",
     "clean": "./shell/scripts/clean",
     "lint": "./node_modules/.bin/eslint --max-warnings 0 --ext .js,.ts,.vue .",
-    "lint:lib": "cd pkg/rancher-components && yarn lint",
     "lint-l10n": "./node_modules/.bin/yamllint ./shell/assets/translations",
     "test": "NODE_OPTIONS=--max_old_space_size=8192 jest --watch",
     "test:ci": "NODE_OPTIONS=--max_old_space_size=8192 jest --collectCoverage --silent",
@@ -32,7 +28,6 @@
     "k3s:local:start": "./scripts/e2e-k3s-start $RANCHER_VERSION_E2E",
     "k3s:local:logs": "E2E_RANCHER_LOG=$E2E_RANCHER_LOG ./scripts/e2e-k3s-logs",
     "build": "NODE_OPTIONS=--max_old_space_size=4096 ./node_modules/.bin/vue-cli-service build",
-    "build:lib": "cd pkg/rancher-components && yarn build:lib",
     "analyze": "./node_modules/.bin/vue-cli-service build --report",
     "start": "./node_modules/.bin/vue-cli-service serve",
     "start:dev": "NODE_ENV=dev yarn start",
@@ -57,8 +52,7 @@
     "docs:build": "cd docusaurus/ && yarn build",
     "docs:start": "cd docusaurus/ && yarn start",
     "docs:serve": "cd docusaurus/ && yarn serve",
-    "migrate": "node ./shell/scripts/vue-migrate.js",
-    "publish:lib": "cd pkg/rancher-components && npm publish"
+    "migrate": "node ./shell/scripts/vue-migrate.js"
   },
   "dependencies": {
     "@aws-sdk/client-ec2": "3.863.0",
@@ -142,7 +136,8 @@
     "xterm-addon-web-links": "0.9.0",
     "xterm-addon-webgl": "0.16.0",
     "yaml": "2.8.1",
-    "zod": "3.24.3"
+    "zod": "3.24.3",
+    "lodash.debounce": "4.0.8"
   },
   "devDependencies": {
     "@babel/plugin-proposal-optional-chaining": "7.21.0",
@@ -216,7 +211,22 @@
     "worker-loader": "3.0.8",
     "ws": "8.18.0",
     "yaml-lint": "1.7.0",
-    "yarn": "1.22.18"
+    "yarn": "1.22.18",
+    "cron-validator": "1.4.0",
+    "cronstrue": "2.53.0",
+    "eslint-plugin-promise": "7.2.1",
+    "eslint-plugin-standard": "5.0.0",
+    "jsonpath-plus": "10.3.0",
+    "sass": "1.90.0",
+    "sass-loader": "12.6.0",
+    "vee-validate": "4.15.0",
+    "@vue/eslint-config-typescript": "9.1.0",
+    "@vue/cli-plugin-eslint": "5.0.8",
+    "@babel/core": "^7.12.16",
+    "@types/webpack-env": "^1.15.2",
+    "@vue/cli-shared-utils": "^5.0.8",
+
+    "ts-loader": "^9.2.5"
   },
   "resolutions": {
     "html-webpack-plugin": "5.0.0"

pkg/aks/components/AksNodePool.vue

@@ -4,14 +4,14 @@ import { mapGetters } from 'vuex';
 
 import { _CREATE, _VIEW } from '@shell/config/query-params';
 import type { AKSDiskType, AKSNodePool, AKSPoolMode } from '../types/index';
-import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
+import LabeledInput from '@rc/Form/LabeledInput/LabeledInput.vue';
 import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
 import Taint from '@pkg/aks/components/Taint.vue';
 import UnitInput from '@shell/components/form/UnitInput.vue';
-import RadioGroup from '@components/Form/Radio/RadioGroup.vue';
-import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
+import RadioGroup from '@rc/Form/Radio/RadioGroup.vue';
+import Checkbox from '@rc/Form/Checkbox/Checkbox.vue';
 import KeyValue from '@shell/components/form/KeyValue.vue';
-import Banner from '@components/Banner/Banner.vue';
+import Banner from '@rc/Banner/Banner.vue';
 
 import { randomStr } from '@shell/utils/string';
 

pkg/aks/components/Config.vue

@@ -15,16 +15,16 @@ import { parseAzureError } from '@shell/utils/azure';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import FormValidation from '@shell/mixins/form-validation';
 import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
-import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
-import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
+import LabeledInput from '@rc/Form/LabeledInput/LabeledInput.vue';
+import Checkbox from '@rc/Form/Checkbox/Checkbox.vue';
 import FileSelector from '@shell/components/form/FileSelector.vue';
 import KeyValue from '@shell/components/form/KeyValue.vue';
 import ArrayList from '@shell/components/form/ArrayList.vue';
 import Tab from '@shell/components/Tabbed/Tab.vue';
 import Tabbed from '@shell/components/Tabbed/index.vue';
-import Accordion from '@components/Accordion/Accordion.vue';
-import Banner from '@components/Banner/Banner.vue';
-import { RadioGroup } from '@components/Form/Radio';
+import Accordion from '@rc/Accordion/Accordion.vue';
+import Banner from '@rc/Banner/Banner.vue';
+import { RadioGroup } from '@rc/Form/Radio';
 
 import AksNodePool from '@pkg/aks/components/AksNodePool.vue';
 import type { AKSNodePool, AKSPoolMode, AKSConfig } from '../types/index';

pkg/aks/components/CruAks.vue

@@ -14,10 +14,10 @@ import FormValidation from '@shell/mixins/form-validation';
 import SelectCredential from '@shell/edit/provisioning.cattle.io.cluster/SelectCredential.vue';
 import CruResource from '@shell/components/CruResource.vue';
 import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
-import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
+import LabeledInput from '@rc/Form/LabeledInput/LabeledInput.vue';
 import Labels from '@shell/components/form/Labels.vue';
-import Accordion from '@components/Accordion/Accordion.vue';
-import Banner from '@components/Banner/Banner.vue';
+import Accordion from '@rc/Accordion/Accordion.vue';
+import Banner from '@rc/Banner/Banner.vue';
 import Loading from '@shell/components/Loading.vue';
 import Config from './Config.vue';
 import Import from './Import.vue';

pkg/aks/components/Import.vue

@@ -3,8 +3,8 @@ import { defineComponent } from 'vue';
 import { _CREATE } from '@shell/config/query-params';
 import { getAKSClusters } from '../util/aks';
 import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
-import Banner from '@components/Banner/Banner.vue';
-import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
+import Banner from '@rc/Banner/Banner.vue';
+import Checkbox from '@rc/Form/Checkbox/Checkbox.vue';
 
 export default defineComponent({
   name: 'AKSImport',

pkg/aks/components/Taint.vue

@@ -1,7 +1,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import Select from '@shell/components/form/Select.vue';
-import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
+import LabeledInput from '@rc/Form/LabeledInput/LabeledInput.vue';
 
 import { _CREATE, _VIEW } from '@shell/config/query-params';
 import { mapGetters } from 'vuex';

pkg/aks/tsconfig.json

@@ -37,8 +37,8 @@
       "@shell/*": [
         "../../shell/*"
       ],
-      "@components/*": [
-        "../../pkg/rancher-components/src/components/*"
+      "@rc/*": [
+        "../../shell/rc/*"
       ],
       "@pkg/*": [
         "../../pkg/*"

pkg/eks/components/Config.vue

@@ -9,13 +9,13 @@ import { sortBy } from '@shell/utils/sort';
 
 import { MANAGEMENT } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
-import RadioGroup from '@components/Form/Radio/RadioGroup.vue';
-import Banner from '@components/Banner/Banner.vue';
+import RadioGroup from '@rc/Form/Radio/RadioGroup.vue';
+import Banner from '@rc/Banner/Banner.vue';
 
 import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
 import KeyValue from '@shell/components/form/KeyValue.vue';
-import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
-import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
+import Checkbox from '@rc/Form/Checkbox/Checkbox.vue';
+import LabeledInput from '@rc/Form/LabeledInput/LabeledInput.vue';
 import eksVersions from '../assets/data/eks-versions';
 
 export default defineComponent({