@rancher/shell 0.3.16 → 0.3.18

package/types/userPreferences.d.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line no-unused-vars
-interface UserPreferences {
+export interface UserPreferences {
   'after-login-route': string,
   cluster: string,
   'group-by': string,

package/utils/__mocks__/socket.js

@@ -0,0 +1,21 @@
+export const addEventListener = jest.fn();
+export const connect = jest.fn();
+export const disconnect = jest.fn();
+export const send = jest.fn();
+
+export const EVENT_CONNECTED = 'connected';
+export const EVENT_CONNECTING = 'connecting';
+export const EVENT_DISCONNECTED = 'disconnected';
+export const EVENT_MESSAGE = 'message';
+export const EVENT_CONNECT_ERROR = 'connect_error';
+
+const mock = jest.fn().mockImplementation(() => {
+  return {
+    addEventListener,
+    connect,
+    disconnect,
+    send
+  };
+});
+
+export default mock;

package/utils/grafana.js

@@ -32,14 +32,19 @@ export function computeDashboardUrl(monitoringVersion, embedUrl, clusterId, para
   return newUrl;
 }
 
-export async function dashboardExists(monitoringVersion, store, clusterId, embedUrl, storeName = 'cluster') {
+export async function dashboardExists(monitoringVersion, store, clusterId, embedUrl, storeName = 'cluster', projectId = null) {
   if ( !haveV2Monitoring(store.getters) ) {
     return false;
   }
 
   const url = parseUrl(embedUrl);
-  const prefix = `${ getClusterPrefix(monitoringVersion, clusterId) }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/`;
-  const delimiter = 'http:rancher-monitoring-grafana:80/proxy/';
+  let prefix = `${ getClusterPrefix(monitoringVersion, clusterId) }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/`;
+  let delimiter = 'http:rancher-monitoring-grafana:80/proxy/';
+
+  if (projectId) {
+    prefix = `${ getClusterPrefix(monitoringVersion, clusterId) }/api/v1/namespaces/cattle-project-${ projectId }-monitoring/services/http:cattle-project-${ projectId }-monitoring-grafana:80/proxy/`;
+    delimiter = `http:cattle-project-${ projectId }-monitoring-grafana:80/proxy/`;
+  }
   const path = url.path.split(delimiter)[1];
   const uid = path.split('/')[1];
   const newUrl = `${ prefix }api/dashboards/uid/${ uid }`;
@@ -53,18 +58,25 @@ export async function dashboardExists(monitoringVersion, store, clusterId, embed
   }
 }
 
-export async function allDashboardsExist(store, clusterId, embeddedUrls, storeName = 'cluster') {
+export async function allDashboardsExist(store, clusterId, embeddedUrls, storeName = 'cluster', projectId = null) {
   let res;
 
-  try {
-    res = await store.dispatch(`${ storeName }/find`, { type: CATALOG.APP, id: 'cattle-monitoring-system/rancher-monitoring' });
-  } catch (err) {
-    return false;
-  }
+  let monitoringVersion = '';
+
+  if (!projectId) {
+    try {
+      res = await store.dispatch(`${ storeName }/find`, {
+        type: CATALOG.APP,
+        id:   'cattle-monitoring-system/rancher-monitoring'
+      });
+    } catch (err) {
+      return false;
+    }
 
-  const monitoringVersion = res?.currentVersion;
+    monitoringVersion = res?.currentVersion;
+  }
 
-  const existPromises = embeddedUrls.map((url) => dashboardExists(monitoringVersion, store, clusterId, url, storeName));
+  const existPromises = embeddedUrls.map((url) => dashboardExists(monitoringVersion, store, clusterId, url, storeName, projectId));
 
   return (await Promise.all(existPromises)).every((exists) => exists);
 }

package/utils/kube.js

@@ -0,0 +1,9 @@
+export function normalizeName(str) {
+  return (str || '')
+    .trim()
+    .toLowerCase()
+    .replace(/\s+/g, '-')
+    .replace(/-+/g, '-')
+    .replace(/^-+/, '')
+    .replace(/-+$/, '');
+}

package/utils/object.js

@@ -218,6 +218,33 @@ export function diff(from, to) {
   return out;
 }
 
+/**
+ * Super simple lodash isEqual equivalent.
+ *
+ * Only checks root properties for strict equality
+ */
+function isEqualBasic(from, to) {
+  const fromKeys = Object.keys(from || {});
+  const toKeys = Object.keys(to || {});
+
+  if (fromKeys.length !== toKeys.length) {
+    return false;
+  }
+
+  for (let i = 0; i < fromKeys.length; i++) {
+    const fromValue = from[fromKeys[i]];
+    const toValue = to[fromKeys[i]];
+
+    if (fromValue !== toValue) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+export { isEqualBasic as isEqual };
+
 export function changeset(from, to, parentPath = []) {
   let out = {};
 

package/utils/selector.js

@@ -198,7 +198,8 @@ export function matches(obj, selector, labelKey = 'metadata.labels') {
       }
       break;
     case 'In':
-      if ( !value || !rule.values.length || !rule.values.includes(value) ) {
+      // we need to cater empty strings because when creating a label with value = null it's translated into a empty string value ''
+      if ( !rule.values.length || !rule.values.includes(value) ) {
         return false;
       }
       break;

package/utils/settings.ts

@@ -1,7 +1,7 @@
 import { MANAGEMENT } from '@shell/config/types';
 import { Store } from 'vuex';
 import { DEFAULT_PERF_SETTING, SETTING } from '@shell/config/settings';
-import { GC_PREFERENCES } from 'utils/gc/gc-types';
+import { GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 
 export const fetchOrCreateSetting = async(store: Store<any>, id: string, val: string, save = true): Promise<any> => {
   let setting;
@@ -56,7 +56,7 @@ export const getPerformanceSetting = (rootGetters: Record<string, (arg0: string,
   manualRefresh: {};
   disableWebsocketNotification: boolean;
   garbageCollection: GC_PREFERENCES;
-  forceNsFilterV2: {};
+  forceNsFilterV2: any;
   advancedWorker: {};
 } => {
   const perfSettingResource = rootGetters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_PERFORMANCE);

package/utils/validators/formRules/index.ts

@@ -7,7 +7,7 @@ import cronstrue from 'cronstrue';
 import { Translation } from '@shell/types/t';
 
 // import uniq from 'lodash/uniq';
-export type Validator = (val: any, arg?: any) => undefined | string;
+export type Validator<T = undefined | string> = (val: any, arg?: any) => T;
 
 export type ValidatorFactory = (arg1: any, arg2?: any) => Validator
 
@@ -53,7 +53,7 @@ export interface ValidationOptions {
 }
 
 // "t" is the function name we use for getting a translated string
-export default function(t: Translation, { key = 'Value' }: ValidationOptions): unknown {
+export default function(t: Translation, { key = 'Value' }: ValidationOptions): { [key:string]: Validator<any> | ValidatorFactory } {
   // utility validators these validators only get used by other validators
   const startDot: ValidatorFactory = (label: string): Validator => (val: string) => val?.slice(0, 1) === '.' ? t(`validation.dns.${ label }.startDot`, { key }) : undefined;
 
@@ -257,7 +257,7 @@ export default function(t: Translation, { key = 'Value' }: ValidationOptions): u
 
   const clusterName: ValidatorFactory = (isRke2: boolean): Validator => (val: string | undefined) => isRke2 && (val || '')?.match(/^(c-.{5}|local)$/i) ? t('validation.cluster.name') : undefined;
 
-  const servicePort = (val: ServicePort) => {
+  const servicePort: Validator<string | Port | undefined> = (val: ServicePort) => {
     const {
       name,
       idx

package/vue.config.js

@@ -4,6 +4,7 @@ const serveStatic = require('serve-static');
 const webpack = require('webpack');
 const { generateDynamicTypeImport } = require('./pkg/auto-import');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
+const serverMiddlewares = require('./server/server-middleware.js');
 
 // Suppress info level logging messages from http-proxy-middleware
 // This hides all of the "[HPM Proxy created] ..." messages
@@ -218,8 +219,6 @@ module.exports = function(dir, _appConfig) {
   serverMiddleware.push({ path: `/pkg/`, handler: serveStatic(`${ dir }/dist-pkg/`) });
   // Endpoint to download and unpack a tgz from the local verdaccio rgistry (dev)
   serverMiddleware.push(path.resolve(dir, SHELL, 'server', 'verdaccio-middleware'));
-  // Add the standard dashboard server middleware after the middleware added to serve up UI packages
-  serverMiddleware.push(path.resolve(dir, SHELL, 'server', 'server-middleware'));
 
   // ===============================================================================================
   // Dashboard nuxt configuration
@@ -319,6 +318,8 @@ module.exports = function(dir, _appConfig) {
           process.exit(1);
         });
 
+        app.use(serverMiddlewares);
+
         Object.keys(proxy).forEach((p) => {
           const px = createProxyMiddleware({
             ...proxy[p],

package/creators/pkg/package-lock.json

@@ -1,37 +0,0 @@
-{
-  "name": "@rancher/create-pkg",
-  "version": "0.1.37",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
-    },
-    "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
-    },
-    "universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
-    }
-  }
-}

package/pages/safeMode.vue

@@ -1,17 +0,0 @@
-<script>
-export default {
-  middleware({ redirect, store } ) {
-    const dashboardHome = { name: 'home' };
-    const t = store.getters['i18n/t'];
-
-    setTimeout(() => {
-      store.dispatch('growl/success', {
-        title:   t('plugins.safeMode.title'),
-        message: t('plugins.safeMode.message')
-      }, { root: true });
-    }, 1000);
-
-    return redirect(dashboardHome);
-  }
-};
-</script>

package/plugins/steve/urloptions.js

@@ -1,47 +0,0 @@
-import { isArray } from '@shell/utils/array';
-
-export default function urlOptions(url, opt) {
-  opt = opt || {};
-
-  // Filter
-  if ( opt.filter ) {
-    const keys = Object.keys(opt.filter);
-
-    keys.forEach((key) => {
-      let vals = opt.filter[key];
-
-      if ( !isArray(vals) ) {
-        vals = [vals];
-      }
-
-      vals.forEach((val) => {
-        url += `${ (url.includes('?') ? '&' : '?') + encodeURIComponent(key) }=${ encodeURIComponent(val) }`;
-      });
-    });
-  }
-  // End: Filter
-
-  // Limit
-  const limit = opt.limit;
-
-  if ( limit ) {
-    url += `${ url.includes('?') ? '&' : '?' }limit=${ limit }`;
-  }
-  // End: Limit
-
-  // Sort
-  const sortBy = opt.sortBy;
-
-  if ( sortBy ) {
-    url += `${ url.includes('?') ? '&' : '?' }sort=${ encodeURIComponent(sortBy) }`;
-  }
-
-  const orderBy = opt.sortOrder;
-
-  if ( orderBy ) {
-    url += `${ url.includes('?') ? '&' : '?' }order=${ encodeURIComponent(orderBy) }`;
-  }
-  // End: Sort
-
-  return url;
-}

package/yarn-error.log

@@ -1,196 +0,0 @@
-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