@rancher/shell 0.3.17 → 0.3.19

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/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/socket.js

@@ -11,6 +11,7 @@ const SECURE = 'wss://';
 
 const STATE_DISCONNECTED = 'disconnected';
 
+export const addEventListener = EventTarget.addEventListener;
 export const STATE_CONNECTING = 'connecting';
 export const STATE_CONNECTED = 'connected';
 const STATE_CLOSING = 'closing';

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/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;
-}