@rancher/shell 3.0.2-rc.2 → 3.0.2-rc.3

package/detail/networking.k8s.io.ingress.vue

@@ -1,12 +1,10 @@
 <script>
 import { allHash } from '@shell/utils/promise';
-import { SECRET, SERVICE } from '@shell/config/types';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import Rules from '@shell/edit/networking.k8s.io.ingress/Rules';
 import ResourceTabs from '@shell/components/form/ResourceTabs';
 import Tab from '@shell/components/Tabbed/Tab';
-import { SECRET_TYPES as TYPES } from '@shell/config/secret';
-import { FilterArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import IngressDetailEditHelper from '@shell/utils/ingress';
 
 export default {
   name:       'CRUIngress',
@@ -18,76 +16,38 @@ export default {
   },
   mixins: [CreateEditView],
   async fetch() {
+    this.ingressHelper = new IngressDetailEditHelper({
+      $store:    this.$store,
+      namespace: this.value.metadata.namespace
+    });
     const promises = {
-      services:       this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+      services:       this.ingressHelper.fetchServices(),
+      secrets:        this.ingressHelper.fetchSecrets(),
       resourceFields: this.schema.fetchResourceFields(),
     };
 
-    if (this.$store.getters[`cluster/paginationEnabled`](SECRET)) {
-      const findPageArgs = { // Of type ActionFindPageArgs
-        namespaced: this.value.metadata.namespace,
-        pagination: new FilterArgs({
-          filters: PaginationParamFilter.createSingleField({
-            field: 'metadata.fields.1',
-            value: TYPES.TLS
-          })
-        }),
-      };
-
-      promises.filteredSecrets = this.$store.dispatch(`cluster/findPage`, { type: SECRET, opt: findPageArgs });
-    } else {
-      promises.secrets = this.$store.dispatch('cluster/findAll', { type: SECRET });
-    }
     const hash = await allHash(promises);
 
-    this.allServices = hash.services;
-    this.allSecrets = hash.secrets;
-    this.filteredSecrets = hash.filteredSecrets;
+    this.services = hash.services;
+    this.secrets = hash.secrets;
   },
   data() {
     return {
-      allSecrets:      null,
-      filteredSecrets: null,
-      allServices:     [],
+      secrets:  [],
+      services: [],
     };
   },
   computed: {
     serviceTargets() {
-      return this.filterByCurrentResourceNamespace(this.allServices)
-        .map((service) => ({
-          label: service.metadata.name,
-          value: service.metadata.name,
-          ports: service.spec.ports?.map((p) => p.port)
-        }));
+      return this.ingressHelper.findAndMapServiceTargets(this.services);
     },
     firstTabLabel() {
       return this.isView ? this.t('ingress.rulesAndCertificates.title') : this.t('ingress.rules.title');
     },
     certificates() {
-      let filteredSecrets;
-
-      if (this.filteredSecrets) {
-        filteredSecrets = this.filteredSecrets;
-      } else if (this.allSecrets ) {
-        filteredSecrets = this.filterByCurrentResourceNamespace(this.allSecrets.filter((secret) => secret._type === TYPES.TLS));
-      } else {
-        return [];
-      }
-
-      return filteredSecrets.map((secret) => {
-        const { id } = secret;
-
-        return id.slice(id.indexOf('/') + 1);
-      });
+      return this.ingressHelper.findAndMapCerts(this.secrets);
     },
   },
-  methods: {
-    filterByCurrentResourceNamespace(resources) {
-      return resources.filter((resource) => {
-        return resource.metadata.namespace === this.value.metadata.namespace;
-      });
-    }
-  }
 };
 </script>
 <template>

package/detail/provisioning.cattle.io.cluster.vue

@@ -84,6 +84,7 @@ export default {
   async fetch() {
     await this.value.waitForProvisioner();
 
+    // Support for the 'provisioner' extension
     const extClass = this.$plugin.getDynamic('provisioner', this.value.machineProvider);
 
     if (extClass) {
@@ -94,6 +95,7 @@ export default {
         $plugin:  this.$store.app.$plugin,
         $t:       this.t
       });
+
       this.extDetailTabs = {
         ...this.extDetailTabs,
         ...this.extProvider.detailTabs
@@ -101,6 +103,15 @@ export default {
       this.extCustomParams = { provider: this.value.machineProvider };
     }
 
+    // Support for a model extension
+    if (this.value.customProvisionerHelper) {
+      this.extDetailTabs = {
+        ...this.extDetailTabs,
+        ...this.value.customProvisionerHelper.detailTabs
+      };
+      this.extCustomParams = { provider: this.value.machineProvider };
+    }
+
     const schema = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
     const fetchOne = { schemaDefinitions: schema.fetchResourceFields() };
 
@@ -379,7 +390,7 @@ export default {
     },
 
     showNodes() {
-      return !this.showMachines && this.haveNodes && !!this.nodes.length;
+      return !this.showMachines && this.haveNodes && !!this.nodes.length && this.extDetailTabs.machines;
     },
 
     showSnapshots() {

package/detail/workload/index.vue

@@ -47,8 +47,9 @@ export default {
     } catch {}
 
     const hash = {
-      // See https://github.com/rancher/dashboard/issues/10417, all pods bad, come from a locally applied selector in the workload model
+      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       allPods:      this.$store.dispatch('cluster/findAll', { type: POD }),
+      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       allServices:  this.$store.dispatch('cluster/findAll', { type: SERVICE }),
       allIngresses: this.$store.dispatch('cluster/findAll', { type: INGRESS }),
       // Nodes should be fetched because they may be referenced in the target
@@ -57,7 +58,7 @@ export default {
     };
 
     if (this.value.type === WORKLOAD_TYPES.CRON_JOB) {
-      hash.allJobs = this.$store.dispatch('cluster/findAll', { type: WORKLOAD_TYPES.JOB });
+      hash.jobs = this.value.matchingJobs();
     }
     const res = await allHash(hash);
 
@@ -91,7 +92,6 @@ export default {
       allIngresses:                    [],
       matchingServices:                [],
       matchingIngresses:               [],
-      allJobs:                         [],
       allNodes:                        [],
       WORKLOAD_METRICS_DETAIL_URL,
       WORKLOAD_METRICS_SUMMARY_URL,

package/dialog/AddCustomBadgeDialog.vue

@@ -213,6 +213,7 @@ export default {
   <Card
     class="prompt-badge"
     :show-highlight-border="false"
+    :trigger-focus-trap="true"
   >
     <template #title>
       <h4 class="text-default-text">
@@ -258,7 +259,6 @@ export default {
             <Checkbox
               v-model:value="badgeAsIcon"
               :label="t('clusterBadge.modal.badgeAsIcon')"
-
               :tooltip="t('clusterBadge.modal.maxCharsTooltip')"
             />
 
@@ -312,7 +312,9 @@ export default {
         />
         <div class="buttons">
           <button
+            role="button"
             class="btn role-secondary mr-10"
+            :aria-label="t('generic.cancel')"
             @click="close"
           >
             {{ t('generic.cancel') }}
@@ -320,6 +322,8 @@ export default {
           <AsyncButton
             :action-label="t('clusterBadge.modal.buttonAction')"
             :disabled="!canSubmit"
+            role="button"
+            :aria-label="t('generic.cancel')"
             @click="apply"
           />
         </div>

package/edit/auth/ldap/__tests__/config.test.ts

@@ -0,0 +1,18 @@
+import { mount } from '@vue/test-utils';
+import LDAPConfig from '@shell/edit/auth/ldap/config.vue';
+
+describe('lDAP config', () => {
+  it.each([
+    'openldap', 'freeipa'
+  ])('should display searchUsingServiceAccount checkbox if type %p', (type) => {
+    const wrapper = mount(LDAPConfig, {
+      propsData: {
+        value: {},
+        type,
+      }
+    });
+    const checkbox = wrapper.find('[data-testid="searchUsingServiceAccount"]');
+
+    expect(checkbox).toBeDefined();
+  });
+});

package/edit/auth/ldap/config.vue

@@ -11,6 +11,8 @@ const DEFAULT_TLS_PORT = 636;
 
 export const SHIBBOLETH = 'shibboleth';
 export const OKTA = 'okta';
+export const OPEN_LDAP = 'openldap';
+export const FREE_IPA = 'freeipa';
 
 export default {
   emits: ['update:value'],
@@ -64,6 +66,11 @@ export default {
     // Does the auth provider support LDAP for search in addition to SAML?
     isSamlProvider() {
       return this.type === SHIBBOLETH || this.type === OKTA;
+    },
+
+    // Allow to enable user search just for these providers
+    isSearchAllowed() {
+      return this.type === OPEN_LDAP || this.type === FREE_IPA;
     }
   },
 
@@ -226,6 +233,23 @@ export default {
         />
       </div>
     </div>
+
+    <div
+      v-if="isSearchAllowed"
+      class="row mb-20"
+    >
+      <div class="col">
+        <Checkbox
+          v-model:value="model.searchUsingServiceAccount"
+          :mode="mode"
+          data-testid="searchUsingServiceAccount"
+          class="full-height"
+          :label="t('authConfig.ldap.searchUsingServiceAccount.label')"
+          :tooltip="t('authConfig.ldap.searchUsingServiceAccount.tip')"
+        />
+      </div>
+    </div>
+
     <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput

package/edit/auth/saml.vue

@@ -211,12 +211,14 @@ export default {
             </Banner>
 
             <table v-if="showLdapDetails && model.openLdapConfig">
-              <tr><td>{{ t('authConfig.ldap.hostname.label') }}:</td><td>{{ ldapHosts }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.port') }}:</td><td>{{ model.openLdapConfig.port }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.protocol') }}:</td><td>{{ ldapProtocol }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.serviceAccountDN') }}:</td><td>{{ model.openLdapConfig.serviceAccountDistinguishedName }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.userSearchBase.label') }}:</td><td>{{ model.openLdapConfig.userSearchBase }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.groupSearchBase.label') }}:</td><td>{{ model.openLdapConfig.groupSearchBase }}</td></tr>
+              <tbody>
+                <tr><td>{{ t('authConfig.ldap.hostname.label') }}:</td><td>{{ ldapHosts }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.port') }}:</td><td>{{ model.openLdapConfig.port }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.protocol') }}:</td><td>{{ ldapProtocol }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.serviceAccountDN') }}:</td><td>{{ model.openLdapConfig.serviceAccountDistinguishedName }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.userSearchBase.label') }}:</td><td>{{ model.openLdapConfig.userSearchBase }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.groupSearchBase.label') }}:</td><td>{{ model.openLdapConfig.groupSearchBase }}</td></tr>
+              </tbody>
             </table>
           </template>
         </AuthBanner>

package/edit/fleet.cattle.io.gitrepo.vue

@@ -153,7 +153,13 @@ export default {
       stepRepoInfo,
       stepTargetInfo,
       displayHelmRepoURLRegex: false,
-      fvFormRuleSets:          [{ path: 'spec.repo', rules: ['required'] }]
+      fvFormRuleSets:          [{
+        path:  'spec.repo',
+        rules: [
+          'required',
+          'gitRepository'
+        ],
+      }]
     };
   },
 

package/edit/logging-flow/index.vue

@@ -6,14 +6,12 @@ import Loading from '@shell/components/Loading';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
-import {
-  LOGGING, NAMESPACE, NODE, POD, SCHEMA
-} from '@shell/config/types';
+import { LOGGING, NAMESPACE, NODE, SCHEMA } from '@shell/config/types';
 import jsyaml from 'js-yaml';
 import { createYaml } from '@shell/utils/create-yaml';
 import YamlEditor, { EDITOR_MODES } from '@shell/components/YamlEditor';
 import { allHash } from '@shell/utils/promise';
-import { isArray, uniq } from '@shell/utils/array';
+import { isArray } from '@shell/utils/array';
 import { matchRuleIsPopulated } from '@shell/models/logging.banzaicloud.io.flow';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { clone } from '@shell/utils/object';
@@ -67,7 +65,6 @@ export default {
     const hasAccessToOutputs = this.$store.getters[`${ inStore }/schemaFor`](LOGGING.OUTPUT);
     const hasAccessToNamespaces = this.$store.getters[`cluster/schemaFor`](NAMESPACE);
     const hasAccessToNodes = this.$store.getters[`${ inStore }/schemaFor`](NODE);
-    const hasAccessToPods = this.$store.getters[`${ inStore }/schemaFor`](POD);
     const isFlow = this.value.type === LOGGING.FLOW;
 
     const getAllOrDefault = (type, hasAccess) => {
@@ -77,9 +74,10 @@ export default {
     const hash = await allHash({
       allOutputs:        getAllOrDefault(LOGGING.OUTPUT, isFlow && hasAccessToOutputs),
       allClusterOutputs: getAllOrDefault(LOGGING.CLUSTER_OUTPUT, hasAccessToClusterOutputs),
+      // Can't remove allNamespaces yet given https://github.com/harvester/harvester/issues/7342 and
+      // https://github.com/harvester/harvester-ui-extension/blob/main/pkg/harvester/edit/harvesterhci.io.logging.clusteroutput.vue
       allNamespaces:     getAllOrDefault(NAMESPACE, hasAccessToNamespaces),
       allNodes:          getAllOrDefault(NODE, hasAccessToNodes),
-      allPods:           getAllOrDefault(POD, hasAccessToPods),
     });
 
     for ( const k of Object.keys(hash) ) {
@@ -134,7 +132,6 @@ export default {
       allClusterOutputs:  null,
       allNamespaces:      null,
       allNodes:           null,
-      allPods:            null,
       filtersYaml,
       initialFiltersYaml: filtersYaml,
       globalOutputRefs,
@@ -239,18 +236,6 @@ export default {
       return out;
     },
 
-    containerChoices() {
-      const out = [];
-
-      for ( const pod of this.allPods ) {
-        for ( const c of (pod.spec?.containers || []) ) {
-          out.push(c.name);
-        }
-      }
-
-      return uniq(out).sort();
-    },
-
     isHarvester() {
       return this.$store.getters['currentProduct'].inStore === VIRTUAL;
     },

package/edit/networking.k8s.io.ingress/index.vue

@@ -1,6 +1,6 @@
 <script>
 import { allHash } from '@shell/utils/promise';
-import { SECRET, SERVICE, INGRESS_CLASS } from '@shell/config/types';
+import { INGRESS_CLASS } from '@shell/config/types';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import FormValidation from '@shell/mixins/form-validation';
@@ -10,13 +10,12 @@ import Labels from '@shell/components/form/Labels';
 import Error from '@shell/components/form/Error';
 import Tabbed from '@shell/components/Tabbed';
 import { get, set } from '@shell/utils/object';
-import { SECRET_TYPES as TYPES } from '@shell/config/secret';
 import DefaultBackend from './DefaultBackend';
 import Certificates from './Certificates';
 import Rules from './Rules';
 import IngressClass from './IngressClass';
 import Loading from '@shell/components/Loading';
-import { FilterArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import IngressDetailEditHelper from '@shell/utils/ingress';
 
 export default {
   name:         'CRUIngress',
@@ -50,36 +49,32 @@ export default {
   },
 
   async fetch() {
+    this.ingressHelper = new IngressDetailEditHelper({
+      $store:    this.$store,
+      namespace: this.value.metadata.namespace
+    });
+
     this.ingressClassSchema = this.$store.getters[`cluster/schemaFor`](INGRESS_CLASS);
 
     const promises = {
-      services:              this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+      secrets:               this.ingressHelper.fetchSecrets(),
+      services:              this.ingressHelper.fetchServices(),
       ingressClasses:        this.ingressClassSchema ? this.$store.dispatch('cluster/findAll', { type: INGRESS_CLASS }) : Promise.resolve([]),
       ingressResourceFields: this.schema.fetchResourceFields(),
     };
 
-    this.filterByApi = this.$store.getters[`cluster/paginationEnabled`](SECRET);
-
-    if (this.filterByApi) {
-      promises.filteredSecrets = this.filterSecretsByApi();
-    } else {
-      promises.secrets = this.$store.dispatch('cluster/findAll', { type: SECRET });
-    }
-
     const hash = await allHash(promises);
 
-    this.allServices = hash.services;
-    this.allSecrets = hash.secrets;
-    this.filteredSecrets = hash.filteredSecrets;
+    this.secrets = hash.secrets;
+    this.services = hash.services;
     this.allIngressClasses = hash.ingressClasses;
   },
   data() {
     return {
       filterByApi:        null,
       ingressClassSchema: null,
-      allSecrets:         null,
-      filteredSecrets:    null,
-      allServices:        [],
+      secrets:            [],
+      services:           [],
       allIngressClasses:  [],
       fvFormRuleSets:     [
         {
@@ -111,10 +106,9 @@ export default {
   },
 
   watch: {
-    async 'value.metadata.namespace'() {
-      if (this.filterByApi) {
-        this.filteredSecrets = await this.filterSecretsByApi();
-      }
+    async 'value.metadata.namespace'(neu) {
+      this.services = await this.ingressHelper.fetchServices({ namespace: neu });
+      this.secrets = await this.ingressHelper.fetchSecrets({ namespace: neu });
     }
   },
 
@@ -162,32 +156,13 @@ export default {
       return { name: [], port: [] };
     },
     serviceTargets() {
-      return this.filterByCurrentResourceNamespace(this.allServices)
-        .map((service) => ({
-          label: service.metadata.name,
-          value: service.metadata.name,
-          ports: service.spec.ports?.map((p) => p.port)
-        }));
+      return this.ingressHelper.findAndMapServiceTargets(this.services);
     },
     firstTabLabel() {
       return this.isView ? this.t('ingress.rulesAndCertificates.title') : this.t('ingress.rules.title');
     },
     certificates() {
-      let filteredSecrets;
-
-      if (this.filteredSecrets) {
-        filteredSecrets = this.filteredSecrets;
-      } else if (this.allSecrets ) {
-        filteredSecrets = this.filterByCurrentResourceNamespace(this.allSecrets.filter((secret) => secret._type === TYPES.TLS));
-      } else {
-        return [];
-      }
-
-      return filteredSecrets.map((secret) => {
-        const { id } = secret;
-
-        return id.slice(id.indexOf('/') + 1);
-      });
+      return this.ingressHelper.findAndMapCerts(this.secrets);
     },
     ingressClasses() {
       return this.allIngressClasses.map((ingressClass) => ({
@@ -210,28 +185,6 @@ export default {
   },
 
   methods: {
-    filterSecretsByApi() {
-      const findPageArgs = { // Of type ActionFindPageArgs
-        namespaced: this.value.metadata.namespace,
-        pagination: new FilterArgs({
-          filters: PaginationParamFilter.createSingleField({
-            field: 'metadata.fields.1',
-            value: TYPES.TLS
-          })
-        }),
-      };
-
-      return this.$store.dispatch(`cluster/findPage`, { type: SECRET, opt: findPageArgs });
-    },
-
-    filterByCurrentResourceNamespace(resources) {
-      // When configuring an Ingress, the options for Secrets and
-      // default backend Services are limited to the namespace of the Ingress.
-      return resources.filter((resource) => {
-        return resource.metadata.namespace === this.value.metadata.namespace;
-      });
-    },
-
     willSave() {
       const backend = get(this.value.spec, this.value.defaultBackendPath);
       const serviceName = get(backend, this.value.serviceNamePath);

package/edit/networking.k8s.io.networkpolicy/index.vue

@@ -43,12 +43,12 @@ export default {
 
   async fetch() {
     const hash = await allHash({
-      allPods:       this.$store.dispatch('cluster/findAll', { type: POD }),
-      allNamespaces: this.$store.dispatch('cluster/findAll', { type: NAMESPACE }),
+      allPods:       this.$store.dispatch('cluster/findAll', { type: POD }), // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
+      allNamespaces: this.$store.dispatch('cluster/findAll', { type: NAMESPACE }), // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
     });
 
-    this.allPods = hash.allPods;
-    this.allNamespaces = hash.allNamespaces;
+    this.allPods = hash.allPods; // Used in matchingPods, and PolicyRules --> PolicyRule --> PolicyRuleTarget
+    this.allNamespaces = hash.allNamespaces; // Used in PolicyRules --> PolicyRule --> PolicyRuleTarget
 
     this.updateMatchingPods();
   },
@@ -147,7 +147,6 @@ export default {
 
   methods: {
     updateMatchingPods: throttle(function() {
-      // See https://github.com/rancher/dashboard/issues/10417, all pods bad, need to replace local selector somehow
       const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value.metadata.namespace);
       const match = matching(allInNamespace, this.podSelectorExpressions);
       const matched = match.length || 0;

package/edit/provisioning.cattle.io.cluster/index.vue

@@ -35,6 +35,8 @@ const SORT_GROUPS = {
 
 // uSed to proxy stylesheets for custom drivers that provide custom UI (RKE1)
 const PROXY_ENDPOINT = '/meta/proxy';
+const IMPORTED = 'imported';
+const LOCAL = 'local';
 
 export default {
   name: 'CruCluster',
@@ -171,7 +173,17 @@ export default {
   },
 
   data() {
-    const subType = this.$route.query[SUB_TYPE] || null;
+    let subType = null;
+
+    subType = this.$route.query[SUB_TYPE] || null;
+
+    if ( this.$route.query[SUB_TYPE]) {
+      subType = this.$route.query[SUB_TYPE];
+    } else if (this.value.isImported) {
+      subType = IMPORTED;
+    } else if (this.value.isLocal) {
+      subType = LOCAL;
+    }
     const rkeType = this.$route.query[RKE_TYPE] || null;
     const chart = this.$route.query[CHART] || null;
     const isImport = this.realMode === _IMPORT;