@rancher/shell 0.2.5 → 0.3.1

package/store/type-map.js

@@ -42,6 +42,7 @@
 //   category,                -- Group to show the product in for the nav hamburger menu
 //   typeStoreMap,            -- An object mapping types to the store that should be used to retrieve information about the type
 //   hideSystemResources      -- Hide resources in namespaces where namespace.isSystem === true, or a namespace managed by fleet (per its annotation) and hide those namespaces from ns/project list and nsfilter (default false)
+//   hideNamespaceLocation    -- Hide the namespace link in the ResourceDetail masthead of namespaced resources and hide the ExplorerProjectsNamespaces namespace link (default false)
 // })
 //
 // externalLink(stringOrFn)  The product has an external page (function gets context object
@@ -137,7 +138,7 @@ import {
   ensureRegex, escapeHtml, escapeRegex, ucFirst, pluralize
 } from '@shell/utils/string';
 import {
-  importChart, importList, importDetail, importEdit, listProducts, loadProduct, importCustomPromptRemove, resolveList, resolveEdit, resolveWindowComponent, importWindowComponent, resolveChart, resolveDetail, importDialog
+  importChart, importList, importDetail, importEdit, listProducts, loadProduct, importCustomPromptRemove, resolveList, resolveEdit, resolveWindowComponent, importWindowComponent, resolveChart, resolveDetail, importDialog, importMachineConfig, resolveMachineConfigComponent, resolveCloudCredentialComponent, importCloudCredential
 } from '@shell/utils/dynamic-importer';
 
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
@@ -167,14 +168,14 @@ const graphConfigMap = {};
 const FIELD_REGEX = /^\$\.metadata\.fields\[([0-9]*)\]/;
 
 export const IF_HAVE = {
-  V1_MONITORING:            'v1-monitoring',
-  V2_MONITORING:            'v2-monitoring',
-  PROJECT:                  'project',
-  NO_PROJECT:               'no-project',
-  NOT_V1_ISTIO:             'not-v1-istio',
-  MULTI_CLUSTER:            'multi-cluster',
-  NEUVECTOR_NAMESPACE:      'neuvector-namespace',
-  ADMIN:                    'admin-user',
+  V1_MONITORING:       'v1-monitoring',
+  V2_MONITORING:       'v2-monitoring',
+  PROJECT:             'project',
+  NO_PROJECT:          'no-project',
+  NOT_V1_ISTIO:        'not-v1-istio',
+  MULTI_CLUSTER:       'multi-cluster',
+  NEUVECTOR_NAMESPACE: 'neuvector-namespace',
+  ADMIN:               'admin-user',
 };
 
 export function DSL(store, product, module = 'type-map') {
@@ -365,16 +366,19 @@ export const state = function() {
     hideBulkActions:         {},
     schemaGeneration:        1,
     cache:                   {
-      typeMove:         {},
-      groupLabel:       {},
-      ignore:           {},
-      list:             {},
-      chart:            {},
-      detail:           {},
-      edit:             {},
-      componentFor:     {},
-      promptRemove:     {},
-      windowComponents: {},
+      typeMove:           {},
+      groupLabel:         {},
+      ignore:             {},
+      list:               {},
+      chart:              {},
+      detail:             {},
+      edit:               {},
+      componentFor:       {},
+      promptRemove:       {},
+      windowComponents:   {},
+      'machine-config':   {},
+      'cloud-credential': {}
+
     },
   };
 };
@@ -914,7 +918,15 @@ export const getters = {
 
           item.mode = mode;
           item.weight = weight;
-          item.label = item.label || item.name;
+
+          // Ensure labelKey is taken into account... with a mock count
+          // This is harmless if the translation doesn't require count
+          if (item.labelKey && rootGetters['i18n/exists'](item.labelKey)) {
+            item.label = rootGetters['i18n/t'](item.labelKey, { count: 2 }).trim();
+            delete item.labelKey; // Label should really take precedence over labelKey, but it doesn't, so remove it
+          } else {
+            item.label = item.label || item.name;
+          }
 
           out[id] = item;
         }
@@ -993,10 +1005,6 @@ export const getters = {
 
       return out;
 
-      function rowValueGetter(index) {
-        return row => row.metadata?.fields?.[index];
-      }
-
       function fromSchema(col, rootGetters) {
         let formatter, width, formatterOpts;
 
@@ -1014,32 +1022,19 @@ export const getters = {
           formatter = 'Number';
         }
 
+        const colName = col.name.includes(' ') ? col.name.split(' ').map(word => word.charAt(0).toUpperCase() + word.substring(1) ).join('') : col.name;
+
         const exists = rootGetters['i18n/exists'];
         const t = rootGetters['i18n/t'];
-        const labelKey = `tableHeaders.${ col.name }`;
+        const labelKey = `tableHeaders.${ colName.charAt(0).toLowerCase() + colName.slice(1) }`;
         const description = col.description || '';
         const tooltip = description && description[description.length - 1] === '.' ? description.slice(0, -1) : description;
 
-        // 'field' comes from the schema - typically it is of the form $.metadata.field[N]
-        // We will use JsonPath to look up this value, which is costly - so if we can detect this format
-        // Use a more efficient function to get the value
-        let value = col.field.startsWith('.') ? `$${ col.field }` : col.field;
-
-        if (process.client) {
-          const found = value.match(FIELD_REGEX);
-
-          if (found && found.length === 2) {
-            const fieldIndex = parseInt(found[1], 10);
-
-            value = rowValueGetter(fieldIndex);
-          }
-        }
-
         return {
-          name:    col.name.toLowerCase(),
-          label:   exists(labelKey) ? t(labelKey) : col.name,
-          value,
-          sort:    [col.field],
+          name:  col.name.toLowerCase(),
+          label: exists(labelKey) ? t(labelKey) : col.name,
+          value: _rowValueGetter(col),
+          sort:  [col.field],
           formatter,
           formatterOpts,
           width,
@@ -1123,6 +1118,22 @@ export const getters = {
     };
   },
 
+  hasCustomMachineConfigComponent(state, getters, rootState) {
+    return (rawType, subType) => {
+      const key = getters.componentFor(rawType, subType);
+
+      return hasCustom(state, rootState, 'machine-config', key, key => resolveMachineConfigComponent(key));
+    };
+  },
+
+  hasCustomCloudCredentialComponent(state, getters, rootState) {
+    return (rawType, subType) => {
+      const key = getters.componentFor(rawType, subType);
+
+      return hasCustom(state, rootState, 'machine-config', key, key => resolveCloudCredentialComponent(key));
+    };
+  },
+
   importComponent(state, getters) {
     return (path) => {
       return importEdit(path);
@@ -1171,6 +1182,18 @@ export const getters = {
     };
   },
 
+  importMachineConfig(state, getters, rootState) {
+    return (rawType, subType) => {
+      return loadExtension(rootState, 'machine-config', getters.componentFor(rawType, subType), importMachineConfig);
+    };
+  },
+
+  importCloudCredential(state, getters, rootState) {
+    return (rawType, subType) => {
+      return loadExtension(rootState, 'cloud-credential', getters.componentFor(rawType, subType), importCloudCredential);
+    };
+  },
+
   componentFor(state, getters) {
     return (type, subType) => {
       let key = type;
@@ -1316,6 +1339,14 @@ export const getters = {
       return false;
     };
   },
+
+  rowValueGetter(state) {
+    return (schema, colName) => {
+      const col = _findColumnByName(schema, colName);
+
+      return _rowValueGetter(col);
+    };
+  },
 };
 
 export const mutations = {
@@ -1775,6 +1806,32 @@ export function isAdminUser(getters) {
   return canEditSettings && canEditFeatureFlags && canInstallApps && canAddRepos && canPutHelmOperations;
 }
 
+function _findColumnByName(schema, colName) {
+  const attributes = schema.attributes || {};
+  const columns = attributes.columns || [];
+
+  return findBy(columns, 'name', colName);
+}
+
+function _rowValueGetter(col) {
+  // 'field' comes from the schema - typically it is of the form $.metadata.field[N]
+  // We will use JsonPath to look up this value, which is costly - so if we can detect this format
+  // Use a more efficient function to get the value
+  const value = col.field.startsWith('.') ? `$${ col.field }` : col.field;
+
+  if (process.client) {
+    const found = value.match(FIELD_REGEX);
+
+    if (found && found.length === 2) {
+      const fieldIndex = parseInt(found[1], 10);
+
+      return row => row.metadata?.fields?.[fieldIndex];
+    }
+  }
+
+  return value;
+}
+
 // Is V1 Istio installed?
 function isV1Istio(getters) {
   const cluster = getters['currentCluster'];

package/store/uiplugins.ts

@@ -17,8 +17,8 @@ interface LoadError {
 
 export const state = function(): UIPluginState {
   return {
-    plugins:    [],
-    errors:     {},
+    plugins: [],
+    errors:  {},
   };
 };
 

package/store/wm.js

@@ -6,6 +6,8 @@ export const state = function() {
     active:     null,
     open:       false,
     userHeight: null,
+    userWidth:  null,
+    userPin:    null,
   };
 };
 
@@ -41,6 +43,14 @@ export const mutations = {
 
   setUserHeight(state, height) {
     state.userHeight = height;
+  },
+
+  setUserWidth(state, width) {
+    state.userWidth = width;
+  },
+
+  setUserPin(state, pin) {
+    state.userPin = pin;
   }
 };
 

package/types/pod-security-admission.ts

@@ -0,0 +1,36 @@
+/**
+ * Mode Description
+ * - 'enforce': Policy violations will cause the pod to be rejected.
+ * - 'audit':   Policy violations will trigger the addition of an audit annotation to the event recorded in the audit log, but are otherwise allowed.
+ * - 'warn':    Policy violations will trigger a user-facing warning, but are otherwise allowed.
+ */
+export type PSAMode = 'enforce' | 'audit' | 'warn';
+
+/**
+ * Pod Security admission places requirements on a Pod's Security Context and other related fields according to the three levels defined by the Pod Security Standards:
+ * privileged, baseline, and restricted.
+ * Refer to the Pod Security Standards page for an in-depth look at those requirements.
+ */
+export type PSALevel = 'privileged' | 'baseline' | 'restricted';
+
+/**
+ * Usernames:         requests from users with an exempt authenticated (or impersonated) username are ignored.
+ * RuntimeClassNames: pods and workload resources specifying an exempt runtime class name are ignored.
+ * Namespaces:        pods and workload resources in an exempt namespace are ignored.
+ */
+export type PSADimension = 'usernames' | 'runtimeClasses' | 'namespaces'
+
+export type PSADefaults = Record<PSAMode, PSALevel>
+export type PSAExemptions = Record<PSADimension, string[]>
+
+export interface PSAConfig {
+  defaults: PSADefaults,
+  exemptions: PSAExemptions
+}
+
+export interface PSA {
+  configuration: PSAConfig,
+  metadata: {
+    labels: Record<string, string>
+  }
+}