@rancher/shell 0.1.3 → 0.1.21

package/store/type-map.js

@@ -122,7 +122,7 @@
 // )
 import { AGE, NAME, NAMESPACE as NAMESPACE_COL, STATE } from '@shell/config/table-headers';
 import { COUNT, SCHEMA, MANAGEMENT, NAMESPACE } from '@shell/config/types';
-import { DEV, EXPANDED_GROUPS, FAVORITE_TYPES } from '@shell/store/prefs';
+import { VIEW_IN_API, EXPANDED_GROUPS, FAVORITE_TYPES } from '@shell/store/prefs';
 import {
   addObject, findBy, insertAt, isArray, removeObject, filterBy
 } from '@shell/utils/array';
@@ -131,7 +131,7 @@ import {
   ensureRegex, escapeHtml, escapeRegex, ucFirst, pluralize
 } from '@shell/utils/string';
 import {
-  importList, importDetail, importEdit, listProducts, loadProduct, importCustomPromptRemove, resolveList, resolveEdit, resolveWindowComponent, importWindowComponent, resolveDetail, importDialog
+  importChart, importList, importDetail, importEdit, listProducts, loadProduct, importCustomPromptRemove, resolveList, resolveEdit, resolveWindowComponent, importWindowComponent, resolveChart, resolveDetail, importDialog
 } from '@shell/utils/dynamic-importer';
 
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
@@ -168,6 +168,7 @@ export const IF_HAVE = {
   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') {
@@ -360,6 +361,7 @@ export const state = function() {
       groupLabel:       {},
       ignore:           {},
       list:             {},
+      chart:            {},
       detail:           {},
       edit:             {},
       componentFor:     {},
@@ -802,7 +804,7 @@ export const getters = {
       const module = findBy(state.products, 'name', product).inStore;
       const schemas = rootGetters[`${ module }/all`](SCHEMA);
       const counts = rootGetters[`${ module }/all`](COUNT)?.[0]?.counts || {};
-      const isDev = rootGetters['prefs/get'](DEV);
+      const isDev = rootGetters['prefs/get'](VIEW_IN_API);
       const isBasic = mode === BASIC;
 
       const out = {};
@@ -1055,6 +1057,14 @@ export const getters = {
     };
   },
 
+  hasCustomChart(state, getters, rootState) {
+    return (rawType) => {
+      const key = getters.componentFor(rawType);
+
+      return hasCustom(state, rootState, 'chart', key, key => resolveChart(key));
+    };
+  },
+
   hasCustomDetail(state, getters, rootState) {
     return (rawType, subType) => {
       const key = getters.componentFor(rawType, subType);
@@ -1123,6 +1133,12 @@ export const getters = {
     };
   },
 
+  importChart(state, getters, rootState) {
+    return (rawType) => {
+      return loadExtension(rootState, 'chart', getters.componentFor(rawType), importChart);
+    };
+  },
+
   importDetail(state, getters, rootState) {
     return (rawType, subType) => {
       return loadExtension(rootState, 'detail', getters.componentFor(rawType, subType), importDetail);
@@ -1215,7 +1231,7 @@ export const getters = {
   activeProducts(state, getters, rootState, rootGetters) {
     const knownTypes = {};
     const knownGroups = {};
-    const isDev = rootGetters['prefs/get'](DEV);
+    const isDev = rootGetters['prefs/get'](VIEW_IN_API);
 
     if ( state.schemaGeneration < 0 ) {
       // This does nothing, but makes activeProducts depend on schemaGeneration
@@ -1544,7 +1560,7 @@ export const mutations = {
     let obj = { ...options, match };
 
     if ( idx >= 0 ) {
-      obj = Object.assign(obj, state.typeOptions[idx]);
+      obj = Object.assign(state.typeOptions[idx], obj);
       state.typeOptions.splice(idx, 1, obj);
     } else {
       const obj = Object.assign({}, options, { match });
@@ -1732,11 +1748,22 @@ function ifHave(getters, option) {
   case IF_HAVE.NEUVECTOR_NAMESPACE: {
     return getters[`cluster/all`](NAMESPACE).find(n => n.metadata.name === NEU_VECTOR_NAMESPACE);
   }
+  case IF_HAVE.ADMIN: {
+    return isAdminUser(getters);
+  }
   default:
     return false;
   }
 }
 
+// Could list a larger set of resources that typically only an admin user would have
+export function isAdminUser(getters) {
+  const canEditSettings = (getters['management/schemaFor'](MANAGEMENT.SETTING)?.resourceMethods || []).includes('PUT');
+  const canEditFeatureFlags = (getters['management/schemaFor'](MANAGEMENT.FEATURE)?.resourceMethods || []).includes('PUT');
+
+  return canEditSettings && canEditFeatureFlags;
+}
+
 // Is V1 Istio installed?
 function isV1Istio(getters) {
   const cluster = getters['currentCluster'];

package/store/uiplugins.ts

@@ -3,20 +3,22 @@
 
 // import { addObject, removeObject } from '@shell/utils/array';
 
-import { allHash } from '@shell/utils/promise';
 import { Plugin } from '@shell/core/plugin';
 
 interface UIPluginState {
   plugins: Plugin[],
-  catalog: any[],
-  catalogs: string[],
+  errors: any,
+}
+
+interface LoadError {
+  name: string,
+  error: boolean,
 }
 
 export const state = function(): UIPluginState {
   return {
     plugins:    [],
-    catalog:    [],
-    catalogs:   [''],
+    errors:     {},
   };
 };
 
@@ -25,16 +27,16 @@ export const getters = {
     return state.plugins;
   },
 
-  catalog: (state: any) => {
-    return state.catalog;
-  },
-
-  catalogs: (state: any) => {
-    return state.catalogs;
+  errors: (state: any) => {
+    return state.errors;
   },
 };
 
 export const mutations = {
+  setError(state: UIPluginState, error: LoadError) {
+    state.errors[error.name] = error.error;
+  },
+
   addPlugin(state: UIPluginState, plugin: Plugin) {
     // TODO: Duplicates?
     state.plugins.push(plugin);
@@ -47,59 +49,11 @@ export const mutations = {
       state.plugins.splice(index, 1);
     }
   },
-
-  setCatalog(state: UIPluginState, catalog: any) {
-    state.catalog = catalog;
-  },
-
-  addCatalog(state: UIPluginState, catalog: string) {
-    state.catalogs.push(catalog);
-  }
 };
 
 export const actions = {
-  addCatalog( { commit, dispatch }: any, url: string ) {
-    commit('addCatalog', url);
-  },
-
-  // This is just for PoC - we wouldn't get the catalog from Verdaccio
-  // This fetches the catalog each time
-  async loadCatalogs( { getters, commit, dispatch }: any) {
-    const packages: any[] = [];
-    const catalogHash = {} as any;
-    const catalogs = getters['catalogs'];
-
-    catalogs.forEach((url: string) => {
-      const base = url;
-
-      if (!url) {
-        url = '/verdaccio/data/packages';
-      } else {
-        url = `/uiplugins-catalog/?${ url }`;
-      }
-
-      try {
-        catalogHash[base] = dispatch('rancher/request', { url }, { root: true });
-      } catch (err) {
-        // Ignore errors... or all plugins fail
-        console.warn('Unable to fetch catalog: ', url, err); // eslint-disable-line no-console
-      }
-    });
-
-    const res = await allHash(catalogHash);
-
-    Object.keys(res as any).forEach((r: string) => {
-      const v: any = (res as any)[r];
-
-      v.forEach((p: any) => {
-        p.location = r;
-        packages.push(p);
-      });
-    });
-
-    const uiPackages = packages.filter((pkg: any) => pkg.rancher);
-
-    commit('setCatalog', uiPackages);
+  setError( { commit }: any, error: LoadError ) {
+    commit('setError', error);
   },
 
   addPlugin({ commit }: any, plugin: Plugin) {