@rancher/shell 3.0.2-rc.5 → 3.0.2

package/utils/pagination-utils.ts

@@ -1,4 +1,4 @@
-import { PaginationSettings } from '@shell/types/resources/settings';
+import { PaginationSettings, PaginationSettingsStore } from '@shell/types/resources/settings';
 import {
   NAMESPACE_FILTER_ALL_USER as ALL_USER,
   NAMESPACE_FILTER_ALL as ALL,
@@ -14,6 +14,7 @@ import { sameArrayObjects } from '@shell/utils/array';
 import { isEqual } from '@shell/utils/object';
 import { STEVE_CACHE } from '@shell/store/features';
 import { getPerformanceSetting } from '@shell/utils/settings';
+import { PAGINATION_SETTINGS_STORE_DEFAULTS } from '@shell/plugins/steve/steve-pagination-utils';
 
 /**
  * Helper functions for server side pagination
@@ -32,6 +33,18 @@ class PaginationUtils {
     return perf.serverPagination;
   }
 
+  public getStoreSettings(ctx: any): PaginationSettingsStore
+  public getStoreSettings(serverPagination: PaginationSettings): PaginationSettingsStore
+  public getStoreSettings(arg: any | PaginationSettings): PaginationSettingsStore {
+    const serverPagination: PaginationSettings = arg?.rootGetters !== undefined ? this.getSettings(arg) : arg;
+
+    return serverPagination?.useDefaultStores ? this.getStoreDefault() : serverPagination?.stores || this.getStoreDefault();
+  }
+
+  public getStoreDefault(): PaginationSettingsStore {
+    return PAGINATION_SETTINGS_STORE_DEFAULTS;
+  }
+
   isSteveCacheEnabled({ rootGetters }: any): boolean {
     // We always get Feature flags as part of start up (see `dispatch('features/loadServer')` in loadManagement)
     return rootGetters['features/get']?.(STEVE_CACHE);
@@ -58,7 +71,7 @@ class PaginationUtils {
       return false;
     }
 
-    const storeSettings = settings.stores?.[enabledFor.store];
+    const storeSettings = this.getStoreSettings(settings)?.[enabledFor.store];
 
     // No pagination setting for target store, not enabled
     if (!storeSettings) {

package/utils/string.js

@@ -151,16 +151,36 @@ export function pluralize(str) {
   }
 }
 
-export function resourceNames(names, plusMore, t) {
+export function resourceNames(names, t, options = {}) {
+  const MAX_NAMES_COUNT = 5;
+
+  let { plusMore, endString } = options;
+
+  // plusMore default value
+  if (!plusMore) {
+    plusMore = t('promptRemove.andOthers', { count: names.length > MAX_NAMES_COUNT ? names.length - MAX_NAMES_COUNT : 0 });
+  }
+
+  // endString default value
+  if (!endString) {
+    endString = endString === false ? ' ' : '.';
+  }
+
   return names.reduce((res, name, i) => {
-    if (i >= 5) {
-      return res;
+    if (i < MAX_NAMES_COUNT) {
+      res += `<b>${ escapeHtml( name ) }</b>`;
+
+      if (i === names.length - 1) {
+        res += endString;
+      } else if (i === names.length - 2) {
+        res += names.length <= 5 ? t('generic.and') : '';
+      } else {
+        res += i < MAX_NAMES_COUNT - 1 ? t('generic.comma') : '';
+      }
     }
-    res += `<b>${ escapeHtml( name ) }</b>`;
-    if (i === names.length - 1) {
+
+    if (i === MAX_NAMES_COUNT) {
       res += plusMore;
-    } else {
-      res += i === names.length - 2 ? t('generic.and') : t('generic.comma');
     }
 
     return res;
@@ -336,3 +356,7 @@ export function isBase64(value) {
 
   return base64regex.test(value);
 }
+
+export function generateRandomAlphaString(length) {
+  return Array.from({ length }, () => String.fromCharCode(97 + Math.random() * 26 | 0)).join('');
+}

package/utils/validators/formRules/__tests__/index.test.ts

@@ -244,6 +244,33 @@ describe('formRules', () => {
     expect(formRuleResult).toStrictEqual(expectedResult);
   });
 
+  describe('"registryUrl": has the expected output for each input', () => {
+    const expectedTranslation = JSON.stringify({ message: 'cluster.privateRegistry.privateRegistryUrlError' });
+    const testCases = [
+      // Empty
+      [undefined, undefined],
+
+      // Word
+      ['registry', expectedTranslation],
+
+      // Without schema
+      ['registry.io', undefined],
+
+      // With schemas
+      ['http://registry.io', undefined],
+      ['https://registry.io', undefined],
+    ];
+
+    it.each(testCases)(
+      'should return undefined or correct message based on the provided url',
+      (url, expected) => {
+        const formRuleResult = formRules.registryUrl(url);
+
+        expect(formRuleResult).toStrictEqual(expected);
+      }
+    );
+  });
+
   it('"ruleGroups" : returns undefined when rulegroups are supplied', () => {
     const testValue = { groups: ['group1'] };
     const formRuleResult = formRules.ruleGroups(testValue);

package/utils/validators/formRules/index.ts

@@ -176,6 +176,21 @@ export default function(t: Translation, { key = 'Value' }: ValidationOptions): {
     return containers.map((container: any) => containerImage(container)).find((containerError: string) => containerError);
   };
 
+  const registryUrl = (privateRegistryURL: string) => {
+    if (!privateRegistryURL) {
+      return;
+    }
+
+    const pattern = new RegExp('^([a-z\\-0-9]+:\\/\\/?)?' + // scheme (optional, https://, http://, file:/, admin:/)
+        '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
+        '((\\d{1,3}\\.){3}\\d{1,3}))' + // ip address
+        '(\\:\\d+)?'); // port
+
+    const isValid = pattern.test(privateRegistryURL);
+
+    return isValid ? undefined : t('cluster.privateRegistry.privateRegistryUrlError');
+  };
+
   const dnsLabel: Validator = (val: string) => {
     const validators = [
       dnsChars,
@@ -504,6 +519,7 @@ export default function(t: Translation, { key = 'Value' }: ValidationOptions): {
     minValue,
     noUpperCase,
     portNumber,
+    registryUrl,
     required,
     requiredInt,
     isInteger,

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

@@ -1,198 +0,0 @@
-<script>
-import CreateEditView from '@shell/mixins/create-edit-view';
-
-import CruResource from '@shell/components/CruResource';
-import Loading from '@shell/components/Loading';
-import NameNsDescription from '@shell/components/form/NameNsDescription';
-import Tab from '@shell/components/Tabbed/Tab';
-import Tabbed from '@shell/components/Tabbed';
-import { CAPI, HCI } from '@shell/config/types';
-import ClusterMembershipEditor, { canViewClusterMembershipEditor } from '@shell/components/form/Members/ClusterMembershipEditor';
-import { Banner } from '@components/Banner';
-
-import { NAME as HARVESTER_MANAGER } from '@shell/config/harvester-manager-types';
-import { HARVESTER as HARVESTER_FEATURE, mapFeature } from '@shell/store/features';
-import { addObject } from '@shell/utils/array';
-import { HIDE_DESC, mapPref } from '@shell/store/prefs';
-import Labels from '@shell/edit/provisioning.cattle.io.cluster/Labels';
-import AgentEnv from '@shell/edit/provisioning.cattle.io.cluster/AgentEnv';
-
-const HARVESTER_HIDE_KEY = 'cm-harvester-import';
-
-export default {
-  emits: ['input'],
-
-  components: {
-    Banner,
-    ClusterMembershipEditor,
-    Loading,
-    NameNsDescription,
-    CruResource,
-    Tab,
-    Tabbed,
-    Labels,
-    AgentEnv
-  },
-
-  mixins: [CreateEditView],
-
-  inheritAttrs: false,
-
-  props: {
-    mode: {
-      type:     String,
-      required: true,
-    },
-
-    value: {
-      type:     Object,
-      required: true,
-    },
-
-    provider: {
-      type:     String,
-      required: true,
-    },
-  },
-
-  fetch() {
-    // if ( !this.value.spec.rkeConfig ) {
-    // set(this.value.spec, 'rkeConfig', {});
-    // }
-  },
-
-  data() {
-    return { membershipUpdate: {} };
-  },
-
-  computed: {
-    canManageMembers() {
-      return canViewClusterMembershipEditor(this.$store);
-    },
-
-    hideDescriptions: mapPref(HIDE_DESC),
-
-    harvesterEnabled: mapFeature(HARVESTER_FEATURE),
-
-    harvesterLocation() {
-      return this.isCreate && !this.hideDescriptions.includes(HARVESTER_HIDE_KEY) && this.harvesterEnabled ? {
-        name:   `c-cluster-product-resource`,
-        params: {
-          product:  HARVESTER_MANAGER,
-          resource: HCI.CLUSTER,
-        }
-      } : null;
-    }
-  },
-
-  created() {
-    this.registerAfterHook(this.saveRoleBindings, 'save-role-bindings');
-  },
-
-  methods: {
-    done() {
-      return this.$router.replace({
-        name:   'c-cluster-product-resource-namespace-id',
-        params: {
-          resource:  CAPI.RANCHER_CLUSTER,
-          namespace: this.value.metadata.namespace,
-          id:        this.value.metadata.name,
-        },
-      });
-    },
-
-    async saveRoleBindings() {
-      await this.value.waitForMgmt();
-
-      if (this.membershipUpdate.save) {
-        await this.membershipUpdate.save(this.value.mgmt.id);
-      }
-    },
-
-    async saveOverride(btnCb) {
-      await this.save(btnCb);
-    },
-
-    onMembershipUpdate(update) {
-      this['membershipUpdate'] = update;
-    },
-
-    hideHarvesterNotice() {
-      const neu = this.hideDescriptions.slice();
-
-      addObject(neu, HARVESTER_HIDE_KEY);
-
-      this.hideDescriptions = neu;
-    },
-  },
-};
-</script>
-
-<template>
-  <Loading v-if="$fetchState.pending" />
-  <CruResource
-    v-else
-    :mode="mode"
-    :resource="value"
-    :errors="errors"
-    component-testid="cluster-manager-import"
-    @finish="saveOverride"
-    @error="e=>errors = e"
-  >
-    <Banner
-      v-if="harvesterLocation"
-      color="info"
-      :closable="true"
-      class="mb-20"
-      @close="hideHarvesterNotice"
-    >
-      {{ t('cluster.harvester.importNotice') }}
-      <router-link :to="harvesterLocation">
-        {{ t('product.harvesterManager') }}
-      </router-link>
-    </Banner>
-
-    <NameNsDescription
-      v-if="!isView"
-      :value="value"
-      :mode="mode"
-      :namespaced="false"
-      name-label="cluster.name.label"
-      name-placeholder="cluster.name.placeholder"
-      description-label="cluster.description.label"
-      description-placeholder="cluster.description.placeholder"
-      @update:value="$emit('input', $event)"
-    />
-
-    <Tabbed :side-tabs="true">
-      <Tab
-        v-if="canManageMembers"
-        name="memberRoles"
-        label-key="cluster.tabs.memberRoles"
-        :weight="3"
-      >
-        <Banner
-          v-if="isEdit"
-          color="info"
-        >
-          {{ t('cluster.memberRoles.removeMessage') }}
-        </Banner>
-        <ClusterMembershipEditor
-          :mode="mode"
-          :parent-id="value.mgmt ? value.mgmt.id : null"
-          @membership-update="onMembershipUpdate"
-        />
-      </Tab>
-      <AgentEnv
-        :value="value"
-        :mode="mode"
-        @update:value="$emit('input', $event)"
-      />
-      <Labels
-        :value="value"
-        :mode="mode"
-        @update:value="$emit('input', $event)"
-      />
-    </Tabbed>
-  </CruResource>
-</template>