recreate PR 22 - migration observability to be compliant with vue3

StackVista · Nov 6, 2024 · 3f815b9 · 3f815b9
1 parent 1dbe33f
commit 3f815b9
Show file tree

Hide file tree

Showing 6 changed files with 3,973 additions and 7,057 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -9,7 +9,6 @@ module.exports = {
     'standard',
     'eslint:recommended',
     '@nuxtjs/eslint-config-typescript',
-    'plugin:cypress/recommended'
   ],
   // add your custom rules here
   rules: {
@@ -31,6 +30,7 @@ module.exports = {
     'vue/html-self-closing':    'off',
     'vue/no-unused-components': 'warn',
     'vue/no-v-html':            'error',
+    'vue/no-v-model-argument':  'off',
     'wrap-iife':                'off',
 
     'array-bracket-spacing':             'warn',

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16
+20
diff --git a/package.json b/package.json
@@ -4,20 +4,18 @@
   "license": "Apache-2.0",
   "private": true,
   "engines": {
-    "node": ">=12"
+    "node": ">=20"
   },
   "workspaces": [
     "pkg/*"
   ],
   "dependencies": {
     "@rancher/components": "0.2.1-alpha.0",
-    "@rancher/shell": "^2.0.1",
-    "@types/lodash": "4.14.184",
-    "core-js": "3.21.1"
+    "@rancher/shell": "^3.0.0-rc.9"
   },
-  "resolutions": {
-    "**/webpack": "4",
-    "@types/node": "^16"
+  "devDependencies": {
+    "@nuxtjs/eslint-config-typescript": "6.0.1",
+    "@types/lodash": "4.14.184"
   },
   "scripts": {
     "lint": "eslint --ext .ts,.js,.vue",

diff --git a/pkg/observability/components/Dashboard/ConfigurationView.vue b/pkg/observability/components/Dashboard/ConfigurationView.vue
@@ -31,7 +31,6 @@ export default {
         this.urlError = false;
       }
     },
-
   },
   computed: {
     isCreateMode() {
@@ -146,7 +145,7 @@ export default {
           <div class="banner-info">
             <p>{{ t("observability.dashboard.connected") }}</p>
             <!-- reserve a line when the url is an empty string so UI won't jump on change -->
-            <a :href="`https://${suseObservabilityURL}/`">{{ suseObservabilityURL || '&nbsp;' }}</a>
+            <a :href="`https://${suseObservabilityURL}/`">{{ suseObservabilityURL || "&nbsp;" }}</a>
           </div>
         </Banner>
 
@@ -170,22 +169,22 @@ export default {
           class="configuration-inputs"
         >
           <LabeledInput
-            v-model="suseObservabilityURL"
+            v-model:value="suseObservabilityURL"
             :label="t('observability.configuration.url')"
             class="url-input"
-            :class="{'error': urlError }"
+            :class="{ error: urlError }"
             required
           />
           <div class="pt-10 pb-10">
             <p
               v-show="urlError"
               class="url-error mb-10"
             >
-              {{ t('observability.configuration.urlError') }}
+              {{ t("observability.configuration.urlError") }}
             </p>
           </div>
           <LabeledInput
-            v-model="suseObservabilityServiceToken"
+            v-model:value="suseObservabilityServiceToken"
             class="mb-20"
             type="password"
             :label="t('observability.configuration.serviceToken')"

diff --git a/pkg/observability/package.json b/pkg/observability/package.json
@@ -8,8 +8,8 @@
   "rancher": {
     "annotations": {
       "catalog.cattle.io/kube-version": ">= 1.16.0-0",
-      "catalog.cattle.io/rancher-version": ">= 2.9.0 < 2.10.0",
-      "catalog.cattle.io/ui-extensions-version": ">= 2.0.1"
+      "catalog.cattle.io/rancher-version": ">= 2.10.0",
+      "catalog.cattle.io/ui-extensions-version": ">= 3.0.0"
     }
   },
   "icon": "https://raw.githubusercontent.com/stackvista/rancher-extension-stackstate/main/pkg/observability/rancher-observability.svg",
@@ -18,12 +18,12 @@
     "nuxt": "./node_modules/.bin/nuxt"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=20.0.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "4.5.18",
-    "@vue/cli-plugin-typescript": "4.5.18",
-    "@vue/cli-service": "4.5.18"
+    "@vue/cli-plugin-babel": "~5.0.0",
+    "@vue/cli-plugin-typescript": "~5.0.0",
+    "@vue/cli-service": "~5.0.0"
   },
   "browserslist": [
     "> 1%",