@rancher/shell 0.3.3 → 0.3.4

package/components/ExplorerProjectsNamespaces.vue

@@ -403,7 +403,7 @@ export default {
       <template #cell:name="{row}">
         <div class="namespace-name">
           <n-link
-            v-if="row.detailLocation"
+            v-if="row.detailLocation && !row.hideDetailLocation"
             :to="row.detailLocation"
           >
             {{ row.name }}

package/core/plugin-helpers.js

@@ -94,78 +94,81 @@ function checkExtensionRouteBinding($route, locationConfig) {
 export function getApplicableExtensionEnhancements(pluginCtx, actionType, uiArea, currRoute, translationCtx = pluginCtx) {
   const extensionEnhancements = [];
 
-  const actions = pluginCtx.$plugin.getUIConfig(actionType, uiArea);
-
-  actions.forEach((action, i) => {
-    if (checkExtensionRouteBinding(currRoute, action.locationConfig)) {
-      // ADD CARD PLUGIN UI ENHANCEMENT
-      if (actionType === ExtensionPoint.CARD) {
-        // intercept to apply translation
-        if (uiArea === CardLocation.CLUSTER_DASHBOARD_CARD && action.labelKey) {
-          actions[i].label = translationCtx.t(action.labelKey);
-        }
-
-      // ADD ACTION PLUGIN UI ENHANCEMENT
-      } else if (actionType === ExtensionPoint.ACTION) {
-        // TABLE ACTION
-        if (uiArea === ActionLocation.TABLE) {
+  // gate it so that we prevent errors on older versions of dashboard
+  if (pluginCtx.$plugin?.getUIConfig) {
+    const actions = pluginCtx.$plugin.getUIConfig(actionType, uiArea);
+
+    actions.forEach((action, i) => {
+      if (checkExtensionRouteBinding(currRoute, action.locationConfig)) {
+        // ADD CARD PLUGIN UI ENHANCEMENT
+        if (actionType === ExtensionPoint.CARD) {
           // intercept to apply translation
-          if (action.labelKey) {
+          if (uiArea === CardLocation.CLUSTER_DASHBOARD_CARD && action.labelKey) {
             actions[i].label = translationCtx.t(action.labelKey);
           }
 
-          // sets the enabled flag to true if omitted on the config
-          if (!Object.keys(action).includes('enabled')) {
-            actions[i].enabled = true;
-          }
-
-          // bulkable flag
-          actions[i].bulkable = actions[i].multiple || actions[i].bulkable;
-
-          // populate action identifier to prevent errors
-          if (!actions[i].action) {
-            actions[i].action = `custom-table-action-${ randomStr(10).toLowerCase() }`;
+        // ADD ACTION PLUGIN UI ENHANCEMENT
+        } else if (actionType === ExtensionPoint.ACTION) {
+          // TABLE ACTION
+          if (uiArea === ActionLocation.TABLE) {
+            // intercept to apply translation
+            if (action.labelKey) {
+              actions[i].label = translationCtx.t(action.labelKey);
+            }
+
+            // sets the enabled flag to true if omitted on the config
+            if (!Object.keys(action).includes('enabled')) {
+              actions[i].enabled = true;
+            }
+
+            // bulkable flag
+            actions[i].bulkable = actions[i].multiple || actions[i].bulkable;
+
+            // populate action identifier to prevent errors
+            if (!actions[i].action) {
+              actions[i].action = `custom-table-action-${ randomStr(10).toLowerCase() }`;
+            }
           }
-        }
 
-        // extract simplified shortcut definition on plugin - HEADER ACTION
-        if (uiArea === ActionLocation.HEADER && action.shortcut) {
-          // if it's a string, then assume CTRL for windows and META for mac
-          if (typeof action.shortcut === 'string') {
-            actions[i].shortcutLabel = () => {
-              return isMac ? `(\u2318-${ action.shortcut.toUpperCase() })` : `(Ctrl-${ action.shortcut.toUpperCase() })`;
-            };
-            actions[i].shortcutKey = { windows: ['ctrl', action.shortcut], mac: ['meta', action.shortcut] };
-          // correct check for an Object type in JS... handle the object passed
-          } else if (typeof action.shortcut === 'object' && !Array.isArray(action.shortcut) && action.shortcut !== null) {
-            actions[i].shortcutKey = action.shortcut;
-            const keyboardCombo = isMac ? actions[i].shortcut.mac : actions[i].shortcut.windows ? actions[i].shortcut.windows : [];
-            let scLabel = '';
-
-            keyboardCombo.forEach((key, i) => {
-              if (i < keyboardCombo.length - 1) {
-                if (key === 'meta') {
-                  key = '\u2318';
+          // extract simplified shortcut definition on plugin - HEADER ACTION
+          if (uiArea === ActionLocation.HEADER && action.shortcut) {
+            // if it's a string, then assume CTRL for windows and META for mac
+            if (typeof action.shortcut === 'string') {
+              actions[i].shortcutLabel = () => {
+                return isMac ? `(\u2318-${ action.shortcut.toUpperCase() })` : `(Ctrl-${ action.shortcut.toUpperCase() })`;
+              };
+              actions[i].shortcutKey = { windows: ['ctrl', action.shortcut], mac: ['meta', action.shortcut] };
+            // correct check for an Object type in JS... handle the object passed
+            } else if (typeof action.shortcut === 'object' && !Array.isArray(action.shortcut) && action.shortcut !== null) {
+              actions[i].shortcutKey = action.shortcut;
+              const keyboardCombo = isMac ? actions[i].shortcut.mac : actions[i].shortcut.windows ? actions[i].shortcut.windows : [];
+              let scLabel = '';
+
+              keyboardCombo.forEach((key, i) => {
+                if (i < keyboardCombo.length - 1) {
+                  if (key === 'meta') {
+                    key = '\u2318';
+                  } else {
+                    key = ucFirst(key);
+                  }
+                  scLabel += `${ key }`;
+                  scLabel += '-';
                 } else {
-                  key = ucFirst(key);
+                  scLabel += `${ key.toUpperCase() }`;
                 }
-                scLabel += `${ key }`;
-                scLabel += '-';
-              } else {
-                scLabel += `${ key.toUpperCase() }`;
-              }
-            });
-
-            actions[i].shortcutLabel = () => {
-              return `(${ scLabel })`;
-            };
+              });
+
+              actions[i].shortcutLabel = () => {
+                return `(${ scLabel })`;
+              };
+            }
           }
         }
-      }
 
-      extensionEnhancements.push(actions[i]);
-    }
-  });
+        extensionEnhancements.push(actions[i]);
+      }
+    });
+  }
 
   return extensionEnhancements;
 }

package/models/namespace.js

@@ -187,11 +187,7 @@ export default class Namespace extends SteveModel {
   }
 
   get _detailLocation() {
-    let _detailLocation = super._detailLocation;
-
-    if (this.$rootGetters['currentProduct'].hideNamespaceLocation) {
-      _detailLocation = false;
-    }
+    const _detailLocation = super._detailLocation;
 
     return _detailLocation;
   }
@@ -260,4 +256,8 @@ export default class Namespace extends SteveModel {
       this.metadata.labels[PROJECT] = project;
     }
   }
+
+  get hideDetailLocation() {
+    return !!this.$rootGetters['currentProduct'].hideNamespaceLocation;
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/store/type-map.js

@@ -224,29 +224,32 @@ export function DSL(store, product, module = 'type-map') {
     },
 
     headers(type, headers) {
-      const extensionCols = store.$plugin.getUIConfig(ExtensionPoint.TABLE_COL, TableColumnLocation.RESOURCE);
+      // gate it so that we prevent errors on older versions of dashboard
+      if (store.$plugin?.getUIConfig) {
+        const extensionCols = store.$plugin.getUIConfig(ExtensionPoint.TABLE_COL, TableColumnLocation.RESOURCE);
 
-      // Try and insert the columns before the Age column, if that is the last column
-      let insertPosition = headers.length;
+        // Try and insert the columns before the Age column, if that is the last column
+        let insertPosition = headers.length;
 
-      if (headers.length > 0) {
-        const lastColumn = headers[headers.length - 1];
+        if (headers.length > 0) {
+          const lastColumn = headers[headers.length - 1];
 
-        if (lastColumn?.name === AGE.name) {
-          insertPosition--;
+          if (lastColumn?.name === AGE.name) {
+            insertPosition--;
+          }
         }
-      }
 
-      // adding extension defined cols to the correct header config
-      extensionCols.forEach((col) => {
-        if (col.locationConfig.resource) {
-          col.locationConfig.resource.forEach((resource) => {
-            if (resource && type === resource) {
-              headers.splice(insertPosition, 0, col);
-            }
-          });
-        }
-      });
+        // adding extension defined cols to the correct header config
+        extensionCols.forEach((col) => {
+          if (col.locationConfig.resource) {
+            col.locationConfig.resource.forEach((resource) => {
+              if (resource && type === resource) {
+                headers.splice(insertPosition, 0, col);
+              }
+            });
+          }
+        });
+      }
 
       headers.forEach((header) => {
         // If on the client, then use the value getter if there is one

package/yarn-error.log

@@ -0,0 +1,196 @@
+Arguments: 
+  /Users/aalves/.nvm/versions/node/v16.16.0/bin/node /Users/aalves/.nvm/versions/node/v16.16.0/bin/yarn publish . --new-version 0.3.3 --no-git-tag-version --access public
+
+PATH: 
+  /Users/aalves/.nvm/versions/node/v16.16.0/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
+
+Yarn version: 
+  1.22.19
+
+Node version: 
+  16.16.0
+
+Platform: 
+  darwin arm64
+
+Trace: 
+  Error: https://registry.yarnpkg.com/-/user/org.couchdb.user:aalves08: failed to authenticate: Could not authenticate aalves08: bad password
+      at Request.params.callback [as _callback] (/Users/aalves/.nvm/versions/node/v16.16.0/lib/node_modules/yarn/lib/cli.js:66145:18)
+      at Request.self.callback (/Users/aalves/.nvm/versions/node/v16.16.0/lib/node_modules/yarn/lib/cli.js:140890:22)
+      at Request.emit (node:events:527:28)
+      at Request.<anonymous> (/Users/aalves/.nvm/versions/node/v16.16.0/lib/node_modules/yarn/lib/cli.js:141862:10)
+      at Request.emit (node:events:527:28)
+      at IncomingMessage.<anonymous> (/Users/aalves/.nvm/versions/node/v16.16.0/lib/node_modules/yarn/lib/cli.js:141784:12)
+      at Object.onceWrapper (node:events:641:28)
+      at IncomingMessage.emit (node:events:539:35)
+      at endReadableNT (node:internal/streams/readable:1345:12)
+      at processTicksAndRejections (node:internal/process/task_queues:83:21)
+
+npm manifest: 
+  {
+    "name": "@rancher/shell",
+    "version": "0.3.3",
+    "description": "Rancher Dashboard Shell",
+    "repository": "https://github.com/rancherlabs/dashboard",
+    "license": "Apache-2.0",
+    "author": "SUSE",
+    "private": false,
+    "engines": {
+      "node": ">=12"
+    },
+    "files": [
+      "**/*"
+    ],
+    "scripts": {
+      "clean": "./scripts/clean",
+      "lint": "./node_modules/.bin/eslint --max-warnings 0 --ext .ts,.js,.vue .",
+      "test": "./node_modules/.bin/nyc ava --serial --verbose",
+      "nuxt": "./node_modules/.bin/nuxt",
+      "dev": "./node_modules/.bin/nuxt dev",
+      "mem-dev": "node --max-old-space-size=8192 ./node_modules/.bin/nuxt dev",
+      "docker-dev": "docker run --rm --name dashboard-dev -p 8005:8005 -e API=$API -v $(pwd):/src -v dashboard_node:/src/node_modules rancher/dashboard:dev",
+      "build": "./node_modules/.bin/nuxt build --devtools",
+      "analyze": "./node_modules/.bin/nuxt build --analyze",
+      "start": "./node_modules/.bin/nuxt start",
+      "generate": "./node_modules/.bin/nuxt generate",
+      "dev-debug": "node --inspect ./node_modules/.bin/nuxt",
+      "cy:run": "cypress run",
+      "cy:open": "cypress open",
+      "e2e:pre": "NODE_ENV=dev yarn build",
+      "e2e:run": "NODE_ENV=dev START_SERVER_AND_TEST_INSECURE=1 start-server-and-test start  https://localhost:8005/ cy:run",
+      "e2e:dev": "start-server-and-test dev https://localhost:8005 cy:open"
+    },
+    "dependencies": {
+      "@aws-sdk/client-ec2": "3.1.0",
+      "@aws-sdk/client-eks": "3.1.0",
+      "@aws-sdk/client-kms": "3.8.1",
+      "@babel/plugin-proposal-optional-chaining": "7.14.5",
+      "@babel/plugin-proposal-private-property-in-object": "7.14.5",
+      "@babel/preset-typescript": "7.16.7",
+      "@innologica/vue-dropdown-menu": "0.1.3",
+      "@novnc/novnc": "1.2.0",
+      "@nuxt/types": "2.14.6",
+      "@nuxt/typescript-build": "2.1.0",
+      "@nuxtjs/axios": "5.12.0",
+      "@nuxtjs/eslint-config-typescript": "6.0.1",
+      "@nuxtjs/eslint-module": "1.2.0",
+      "@nuxtjs/proxy": "1.3.3",
+      "@nuxtjs/style-resources": "1.2.1",
+      "@nuxtjs/webpack-profile": "0.1.0",
+      "@popperjs/core": "2.4.4",
+      "@types/node": "16.4.3",
+      "@typescript-eslint/eslint-plugin": "4.33.0",
+      "@typescript-eslint/parser": "4.33.0",
+      "@vue/cli-plugin-babel": "4.5.15",
+      "@vue/cli-plugin-typescript": "4.5.15",
+      "@vue/cli-service": "4.5.15",
+      "@vue/test-utils": "1.2.1",
+      "@vue/vue2-jest": "27.0.0",
+      "add": "2.0.6",
+      "ansi_up": "5.0.0",
+      "babel-eslint": "10.1.0",
+      "babel-plugin-module-resolver": "4.0.0",
+      "babel-preset-vue": "2.0.2",
+      "browser-env": "3.3.0",
+      "cookie": "0.5.0",
+      "cookie-universal-nuxt": "2.1.4",
+      "core-js": "3.21.1",
+      "cron-validator": "1.2.0",
+      "cronstrue": "1.95.0",
+      "cross-env": "6.0.3",
+      "css-loader": "4.3.0",
+      "csv-loader": "3.0.3",
+      "cypress": "10.3.1",
+      "d3": "7.3.0",
+      "d3-selection": "1.4.1",
+      "dagre-d3": "0.6.4",
+      "dayjs": "1.8.29",
+      "diff2html": "2.11.2",
+      "dompurify": "2.0.12",
+      "eslint": "7.32.0",
+      "eslint-config-standard": "16.0.3",
+      "eslint-import-resolver-node": "0.3.4",
+      "eslint-module-utils": "2.6.1",
+      "eslint-plugin-cypress": "2.12.1",
+      "eslint-plugin-import": "2.23.4",
+      "eslint-plugin-jest": "24.4.0",
+      "eslint-plugin-n": "15.2.0",
+      "eslint-plugin-vue": "7.14.0",
+      "event-target-shim": "5.0.1",
+      "express": "4.17.1",
+      "file-saver": "2.0.2",
+      "frontmatter-markdown-loader": "3.7.0",
+      "identicon.js": "2.3.3",
+      "intl-messageformat": "7.8.4",
+      "is-url": "1.2.4",
+      "jest": "27.5.1",
+      "jest-serializer-vue": "2.0.2",
+      "jexl": "2.2.2",
+      "jquery": "3.5.1",
+      "js-cookie": "2.2.1",
+      "js-yaml": "4.1.0",
+      "js-yaml-loader": "1.2.2",
+      "jsdiff": "1.1.1",
+      "jsdom-global": "3.0.2",
+      "jsonpath-plus": "6.0.1",
+      "jsrsasign": "10.2.0",
+      "jszip": "3.7.0",
+      "lodash": "4.17.21",
+      "marked": "4.0.17",
+      "nodemon": "2.0.4",
+      "nuxt": "2.15.8",
+      "nyc": "15.1.0",
+      "papaparse": "5.3.0",
+      "portal-vue": "2.1.7",
+      "rancher-icons": "rancher/icons#v2.0.13",
+      "require-extension-hooks": "0.3.3",
+      "require-extension-hooks-babel": "1.0.0",
+      "require-extension-hooks-vue": "3.0.0",
+      "sass": "1.51.0",
+      "sass-loader": "10.2.1",
+      "serve-static": "1.14.1",
+      "set-cookie-parser": "2.4.6",
+      "shell-quote": "1.7.3",
+      "sinon": "8.1.1",
+      "start-server-and-test": "1.13.1",
+      "style-loader": "1.2.1",
+      "ts-node": "8.10.2",
+      "typescript": "4.1.6",
+      "url-parse": "1.5.10",
+      "v-tooltip": "2.0.3",
+      "vue": "2.6.14",
+      "vue-clipboard2": "0.3.1",
+      "vue-codemirror": "4.0.6",
+      "vue-js-modal": "1.3.35",
+      "vue-resize": "0.4.5",
+      "vue-select": "3.18.3",
+      "vue-server-renderer": "2.6.14",
+      "vue-shortkey": "3.1.7",
+      "vue-template-compiler": "2.6.14",
+      "vue-virtual-scroll-list": "^2.3.4",
+      "vue2-transitions": "0.3.0",
+      "vuedraggable": "2.24.3",
+      "vuex": "3.6.2",
+      "webpack-bundle-analyzer": "4.5.0",
+      "webpack-virtual-modules": "0.4.3",
+      "xterm": "5.0.0",
+      "xterm-addon-fit": "0.6.0",
+      "xterm-addon-search": "0.10.0",
+      "xterm-addon-web-links": "0.7.0",
+      "xterm-addon-webgl": "0.13.0",
+      "worker-loader": "3.0.8",
+      "yarn": "1.22.18"
+    },
+    "nyc": {
+      "extension": [
+        ".js",
+        ".vue"
+      ]
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile