@rancher/shell 3.0.5-rc.5 → 3.0.5-rc.6

package/utils/pagination-utils.ts

@@ -23,7 +23,7 @@ class PaginationUtils {
   /**
    * In places where we're using paginated features but not in a page... this is what the max results should be
    */
-  readonly defaultPageSize = 10000;
+  readonly defaultPageSize = 100000;
   /**
    * When a ns filter isn't one or more projects/namespaces... what are the valid values?
    *

package/utils/release-notes.ts

@@ -0,0 +1,48 @@
+import { getVersionData } from '@shell/config/version';
+import { READ_WHATS_NEW } from '@shell/store/prefs';
+import { NotificationLevel } from '@shell/types/notifications';
+
+export async function addReleaseNotesNotification(dispatch: any, getters: any) {
+  const rancherVersion = getVersionData().Version.split('-')[0];
+  const prefix = 'release-notes-';
+  const id = `${ prefix }${ rancherVersion }`;
+  let found = false;
+  const all = getters['notifications/all'];
+  const lastReadVersion = getters['prefs/get'](READ_WHATS_NEW) || '';
+  const t = getters['i18n/t'];
+  const releaseNotesUrl = getters['releaseNotesUrl'];
+
+  // Delete notification(s) for old release notes
+  for (let i = 0; i < all.length; i++) {
+    const notification = all[i];
+
+    if (notification.id.startsWith(prefix)) {
+      if (notification.id === id) {
+        found = true;
+      } else {
+        await dispatch('notifications/delete', notification.id);
+      }
+    }
+  }
+
+  // Also use pref, so if we expired it, we don't add it back
+  if (!found && lastReadVersion !== rancherVersion) {
+    // Register notification
+    const notification = {
+      id,
+      level:      NotificationLevel.Info,
+      title:      t('landing.whatsNew.title', { version: rancherVersion }),
+      message:    t('landing.whatsNew.message'),
+      preference: {
+        key:   READ_WHATS_NEW,
+        value: rancherVersion
+      },
+      primaryAction: {
+        label:  t('landing.whatsNew.link'),
+        target: releaseNotesUrl
+      }
+    };
+
+    await dispatch('notifications/add', notification);
+  }
+}

package/utils/selector-typed.ts

@@ -34,7 +34,7 @@ export async function matching({
   $store,
   inScopeCount = undefined,
   namespace = undefined,
-  transient = false,
+  transient = true,
 }: {
   /**
    * Standard kube label selector object.
@@ -101,7 +101,12 @@ export async function matching({
   const filterByNamespaceButNoNamespace = isNamespaced && !!namespace && (!safeNamespaces || safeNamespaces.length === 0);
   const explicityNullLabelSelector = labelSelector === null || (labelSelector?.matchLabels === null && !labelSelector.matchExpressions === null);
 
-  if (noCandidates || filterByNamespaceButNoNamespace || explicityNullLabelSelector) {
+  // If we have matchLabels or matchExpression entries they must have a key
+  const matchLabelKeys = Object.keys(labelSelector.matchLabels || {});
+  const invalidMatchLabelKeys = matchLabelKeys.length && matchLabelKeys.filter((k) => !k).length;
+  const invalidMatchExpressionKeys = labelSelector?.matchExpressions?.length && labelSelector.matchExpressions.filter((me) => !me.key).length;
+
+  if (noCandidates || filterByNamespaceButNoNamespace || explicityNullLabelSelector || invalidMatchLabelKeys || invalidMatchExpressionKeys) {
     return generateMatchingResponse([], inScopeCount || 0);
   }
 

package/utils/string.js

@@ -358,3 +358,27 @@ export function isBase64(value) {
 export function generateRandomAlphaString(length) {
   return Array.from({ length }, () => String.fromCharCode(97 + Math.random() * 26 | 0)).join('');
 }
+
+/**
+ * Generate a key-value nested object from a list of paths that represents a directory tree.
+ *
+ * Each key is a subpath
+ * Each value contains the children of the subpath
+ */
+export function pathArrayToTree(paths) {
+  const result = [];
+  const level = { result };
+
+  paths.forEach((path) => {
+    path?.split('/').reduce((r, name) => {
+      if (!r[name]) {
+        r[name] = { result: [] };
+        r.result.push({ name, children: r[name].result });
+      }
+
+      return r[name];
+    }, level);
+  });
+
+  return result;
+}

package/utils/{time.js → time.ts}

@@ -1,4 +1,7 @@
 import day from 'dayjs';
+import { escapeHtml } from '@shell/utils/string';
+import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
+import { type Store } from 'vuex';
 
 const FACTORS = [60, 60, 24];
 const LABELS = ['sec', 'min', 'hour', 'day'];
@@ -6,7 +9,7 @@ const LABELS = ['sec', 'min', 'hour', 'day'];
 // Diff two dates and return an object with values for presentation
 // If 't' is also passed, 'string' property is set on the return object with the diff formatted as a string
 // e.g. formats a date difference to return '1 day', '20 hours' etc
-export function diffFrom(value, from, t) {
+export function diffFrom(value: any, from: any, t: any) {
   const now = day();
 
   from = from || now;
@@ -15,7 +18,7 @@ export function diffFrom(value, from, t) {
   let absDiff = Math.abs(diff);
 
   let next = 1;
-  let label = '?';
+  let label: any = '?';
 
   let i = 0;
 
@@ -30,7 +33,7 @@ export function diffFrom(value, from, t) {
   } else {
     label = Math.floor(absDiff);
   }
-  const ret = {
+  const ret: any = {
     diff,
     absDiff,
     label,
@@ -47,7 +50,7 @@ export function diffFrom(value, from, t) {
   return ret;
 }
 
-export function safeSetTimeout(timeout, callback, that) {
+export function safeSetTimeout(timeout: any, callback: any, that: any) {
   if (timeout <= 2147483647) {
     // Max value setTimeout can take is max 32 bit int (about 24.9 days)
     return setTimeout(() => {
@@ -56,7 +59,7 @@ export function safeSetTimeout(timeout, callback, that) {
   }
 }
 
-export function getSecondsDiff(startDate, endDate) {
+export function getSecondsDiff(startDate: any, endDate: any) {
   return Math.round(
     Math.abs(Date.parse(endDate) - Date.parse(startDate)) / 1000
   );
@@ -68,7 +71,7 @@ export function getSecondsDiff(startDate, endDate) {
  * diff:  update frequency in seconds
  * label: content of the cell's column
  */
-export function elapsedTime(seconds) {
+export function elapsedTime(seconds: any) {
   if (!seconds) {
     return {};
   }
@@ -119,3 +122,19 @@ export function elapsedTime(seconds) {
     label: `${ hours }h${ minutes - (hours * 60) }m`,
   };
 }
+
+/**
+   * Format date and time using user preferences
+   * @param value Date string to format
+   * @returns Formatted date string
+   */
+export const dateTimeFormat = (value: string | undefined, store: Store<any>): string => {
+  if (!value) return '';
+
+  const dateFormat = escapeHtml( store.getters['prefs/get'](DATE_FORMAT));
+  const timeFormat = escapeHtml( store.getters['prefs/get'](TIME_FORMAT));
+
+  const format = `${ dateFormat } ${ timeFormat }`;
+
+  return day(value).format(format);
+};

package/utils/uiplugins.ts

@@ -321,3 +321,25 @@ export async function getHelmChart(store: any, repository: any, chartName: strin
     await new Promise((resolve) => setTimeout(resolve, RETRY_WAIT));
   }
 }
+
+export async function onExtensionsReady(store: any) {
+  const alreadyReady = store.getters['uiplugins/ready'];
+
+  if (alreadyReady) {
+    return;
+  }
+
+  const extensions = store.getters['uiplugins/plugins'] || [];
+
+  for (let i = 0; i < extensions.length; i++) {
+    const ext = extensions[i];
+
+    try {
+      await ext.onLogIn(store);
+    } catch (e) {
+      console.error(`Exception caught in onReady for extension ${ ext.name }`, e); // eslint-disable-line no-console
+    }
+  }
+
+  await store.dispatch('uiplugins/setReady', true);
+}

package/utils/validators/formRules/index.ts

@@ -170,6 +170,8 @@ export default function(
 
   const url: Validator = (val: string) => val && !isUrl(val) ? t('validation.setting.serverUrl.url') : undefined;
 
+  const genericUrl: Validator = (val: string) => val && !isUrl(val) ? t('validation.genericUrl') : undefined;
+
   const urlRepository: Validator = (url: string) => {
     const regexPart1 = /^((http|git|ssh|http(s)|file|\/?)|(git@[\w\.]+))(:(\/\/)?)/gm;
     const regexPart2 = /^([\w\.@\:\/\-]+)([\d\/\w.-]+?)(.git){0,1}(\/)?$/gm;
@@ -542,6 +544,7 @@ export default function(
     localhost,
     trailingForwardSlash,
     url,
+    genericUrl,
     matching,
     maxLength,
     maxValue,

package/components/Resource/Detail/TitleBar/composable.ts

@@ -1,31 +0,0 @@
-import { TitleBarProps } from '@shell/components/Resource/Detail/TitleBar/index.vue';
-import { computed, Ref, toValue } from 'vue';
-import { useRoute } from 'vue-router';
-import { useStore } from 'vuex';
-
-export const useDefaultTitleBarData = (resource: any): Ref<TitleBarProps> => {
-  const route = useRoute();
-  const store = useStore();
-
-  const resourceValue = toValue(resource);
-
-  return computed(() => ({
-    resourceTypeLabel: store.getters['type-map/labelFor']({ id: resourceValue.type }),
-    resourceTo:        {
-      name:   'c-cluster-product-resource',
-      params: {
-        product:   'explorer',
-        cluster:   route.params.cluster,
-        namespace: resourceValue.namespace,
-        resource:  resourceValue.type
-      }
-    },
-    resourceName:       resourceValue.nameDisplay,
-    actionMenuResource: resourceValue,
-    badge:              {
-      color: resourceValue.stateBackground,
-      label: resourceValue.stateDisplay
-    },
-    onShowConfiguration: () => resourceValue.goToEdit()
-  }));
-};

package/config/product/legacy.js

@@ -1,62 +0,0 @@
-import { LEGACY } from '@shell/store/features';
-import { DSL, IF_HAVE } from '@shell/store/type-map';
-
-export const NAME = 'legacy';
-
-export function init(store) {
-  const {
-    product,
-    basicType,
-    virtualType,
-    setGroupDefaultType,
-  } = DSL(store, NAME);
-
-  product({
-    weight:              80,
-    ifFeature:           LEGACY,
-    showNamespaceFilter: true,
-  });
-
-  virtualType({
-    ifHave:     IF_HAVE.NO_PROJECT,
-    labelKey:   'legacy.project.label',
-    namespaced: true,
-    name:       'v1-project-overview',
-    weight:     105,
-    route:      { name: 'c-cluster-legacy-project' },
-    exact:      true,
-    overview:   false,
-  });
-
-  basicType(['v1-project-overview']);
-
-  // Project Pages
-
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.secrets',
-    namespaced: true,
-    name:       'project-secrets',
-    weight:     104,
-    route:      { name: 'c-cluster-legacy-project-page', params: { page: 'secrets' } },
-    exact:      true,
-    overview:   false,
-  });
-
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.configMaps',
-    namespaced: true,
-    name:       'project-config-maps',
-    weight:     104,
-    route:      { name: 'c-cluster-legacy-project-page', params: { page: 'config-maps' } },
-    exact:      true,
-    overview:   false,
-  });
-
-  basicType([
-    'project-config-maps',
-    'project-secrets',
-  ], 'Project');
-  setGroupDefaultType('project-config-maps', 'Project');
-}

package/pages/c/_cluster/legacy/pages/_page.vue

@@ -1,29 +0,0 @@
-<script>
-import EmberPage from '@shell/components/EmberPage';
-
-const PAGES = {
-  monitoring: 'monitoring/cluster-setting',
-  cis:        'cis/scan',
-  istio:      'istio/cluster-setting',
-  snapshots:  'backups',
-};
-
-export default {
-  components: { EmberPage },
-
-  data() {
-    const cluster = this.$store.getters['currentCluster'];
-    const page = this.$route.params.page;
-    const p = PAGES[page] || page;
-
-    return { src: `/k/${ cluster.id }/${ p }` };
-  }
-};
-</script>
-
-<template>
-  <EmberPage
-    v-if="src"
-    :src="src"
-  />
-</template>

package/pages/c/_cluster/legacy/project/_page.vue

@@ -1,57 +0,0 @@
-<script>
-import EmberPage from '@shell/components/EmberPage';
-import { project } from '@shell/store/type-map';
-
-const PAGES = {
-  istio:          'istio/project-istio/metrics',
-  monitoring:     'monitoring/project-setting',
-  pipelineConfig: 'pipeline',
-  pipelines:      'pipeline/pipelines'
-};
-
-export default {
-  components: { EmberPage },
-
-  data() {
-    const page = this.$route.params.page;
-    const p = PAGES[page] || page;
-
-    return { page: p };
-  },
-
-  computed: {
-    project() {
-      return project(this.$store.getters);
-    },
-
-    src() {
-      const prj = project(this.$store.getters);
-
-      if (!!prj) {
-        const id = prj.id.replace('/', ':');
-
-        return `/p/${ id }/${ this.page }`;
-      }
-
-      return null;
-    }
-  },
-
-  watch: {
-    // User changed project while on this page
-    project(a, b) {
-      // Changed to no project, so redirect
-      if (!a && b) {
-        this.$router.replace({ name: 'c-cluster-legacy-project' } );
-      }
-    }
-  }
-};
-</script>
-
-<template>
-  <EmberPage
-    v-if="src"
-    :src="src"
-  />
-</template>

package/pages/c/_cluster/legacy/project/index.vue

@@ -1,32 +0,0 @@
-<script>
-import IconMessage from '@shell/components/IconMessage';
-import { project } from '@shell/store/type-map';
-
-export default {
-  components: { IconMessage },
-
-  computed: {
-    project() {
-      const prj = project(this.$store.getters);
-
-      return prj;
-    }
-  },
-
-  watch: {
-    project(nue, old) {
-      if (nue && !old) {
-        // User selected a project while on this page, so redirect to the projects view now that we have a project
-        this.$router.replace({ name: 'c-cluster-legacy-project-page', params: { page: 'config-maps' } });
-      }
-    }
-  }
-};
-</script>
-
-<template>
-  <IconMessage
-    icon="icon-monitoring"
-    message-key="legacy.project.select"
-  />
-</template>

package/pages/c/_cluster/legacy/project/pipelines.vue

@@ -1,96 +0,0 @@
-<script>
-import EmberPage from '@shell/components/EmberPage';
-import Tabbed from '@shell/components/Tabbed';
-import Tab from '@shell/components/Tabbed/Tab';
-import { project } from '@shell/store/type-map';
-
-const PAGES = {
-  pipelines:     'pipeline/pipelines',
-  configuration: 'pipeline',
-};
-
-export default {
-  components: {
-    EmberPage,
-    Tabbed,
-    Tab
-  },
-
-  data() {
-    return { activeTab: null };
-  },
-
-  computed: {
-    pipelinesPage() {
-      const prj = project(this.$store.getters);
-
-      if (!!prj && this.activeTab) {
-        const id = prj.id.replace('/', ':');
-        const suffix = PAGES[this.activeTab];
-
-        return `/p/${ id }/${ suffix }`;
-      }
-
-      return '';
-    }
-  },
-
-  methods: {
-    tabChanged(tab) {
-      this.activeTab = tab.tab.name;
-    },
-
-    intercept(target) {
-      if (target === 'authenticated.project.pipeline.settings') {
-        // User went to the config page from the pipelines page, so change the active tab
-        this.$refs.tabs.select('configuration');
-      }
-    }
-  }
-
-};
-</script>
-
-<template>
-  <div class="pipelines">
-    <Tabbed
-      ref="tabs"
-      :use-hash="false"
-      :no-content="true"
-      @changed="tabChanged"
-    >
-      <Tab
-        name="pipelines"
-        label-key="legacy.pipelines"
-        :weight="3"
-      />
-      <Tab
-        name="configuration"
-        label-key="legacy.configuration"
-        :weight="2"
-      />
-    </Tabbed>
-    <div
-      id="legacy-pipelines"
-      class="embed-pipelines"
-    >
-      <EmberPage
-        v-if="pipelinesPage"
-        inline="legacy-pipelines"
-        :src="pipelinesPage"
-        :force-inline-reuse="true"
-        @before-nav="intercept"
-      />
-    </div>
-  </div>
-</template>
-
-<style scoped lang='scss'>
-  .pipelines {
-    display: flex;
-
-    .embed-pipelines {
-      flex: 1;
-    }
-  }
-</style>