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

package/pages/c/_cluster/fleet/settings/index.vue

@@ -0,0 +1,229 @@
+<script lang="ts">
+import ConfigMapSettings, { Group, Setting } from '@shell/components/ConfigMapSettings/index.vue';
+
+export default {
+
+  name: 'FleetSettings',
+
+  components: { ConfigMapSettings },
+
+  computed: {
+    settings(): Record<string, Setting> {
+      return {
+        // 'general' group
+        nodeSelector: {
+          weight:  0,
+          type:    'object',
+          handler: 'KeyValue',
+          path:    'nodeSelector',
+          default: {},
+          class:   'span-8',
+        },
+        tolerations: {
+          weight:  1,
+          type:    'object',
+          handler: 'Taints',
+          path:    'tolerations',
+          default: [],
+          class:   'span-8',
+        },
+        garbageCollectionInterval: {
+          weight:  2,
+          type:    'number',
+          handler: 'UnitInput',
+          path:    'garbageCollectionInterval',
+          default: '15m',
+        },
+        priorityClassName: {
+          weight:  3,
+          type:    'string',
+          path:    'priorityClassName',
+          default: '',
+        },
+        gitClientTimeout: {
+          weight:  4,
+          type:    'number',
+          handler: 'UnitInput',
+          path:    'gitClientTimeout',
+          default: '30s',
+        },
+        proxy: {
+          weight:      5,
+          type:        'string',
+          path:        'proxy',
+          default:     '',
+          placeholder: true,
+          class:       'span-8',
+        },
+        noProxy: {
+          weight:  6,
+          type:    'string',
+          path:    'noProxy',
+          default: '127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,.svc,.cluster.local',
+          class:   'span-8',
+        },
+        clusterEnqueueDelay: {
+          weight:  7,
+          type:    'number',
+          handler: 'UnitInput',
+          path:    'clusterEnqueueDelay',
+          default: '120s',
+        },
+
+        // 'replicas' group
+        controllerReplicas: {
+          weight:  0,
+          type:    'number',
+          path:    'controller.replicas',
+          default: 1,
+        },
+        agentReplicas: {
+          weight:  1,
+          type:    'number',
+          path:    'agent.replicas',
+          default: 1,
+        },
+        gitjobReplicas: {
+          weight:  2,
+          type:    'number',
+          path:    'gitjob.replicas',
+          default: 1,
+        },
+        helmopsReplicas: {
+          weight:  3,
+          type:    'number',
+          path:    'helmops.replicas',
+          default: 1,
+        },
+
+        // 'agent' group
+        agentTLSMode: {
+          weight: 1,
+          type:   'string',
+          items:  [{
+            type:  'string',
+            value: 'strict'
+          }, {
+            type:  'string',
+            value: 'system-store'
+          }],
+          path:    'agentTLSMode',
+          default: 'system-store',
+        },
+        agentCheckinInterval: {
+          weight:  2,
+          type:    'number',
+          handler: 'UnitInput',
+          path:    'agentCheckinInterval',
+          default: '15m',
+        },
+
+        // 'annotations' group
+        controllerAnnotations: {
+          weight:  0,
+          type:    'object',
+          handler: 'KeyValue',
+          path:    'extraAnnotations.fleetController',
+          default: {},
+          class:   'span-8',
+        },
+        gitjobAnnotations: {
+          weight:  1,
+          type:    'object',
+          handler: 'KeyValue',
+          path:    'extraAnnotations.gitjob',
+          default: {},
+          class:   'span-8',
+        },
+        helmopsAnnotations: {
+          weight:  2,
+          type:    'object',
+          handler: 'KeyValue',
+          path:    'extraAnnotations.helmops',
+          default: {},
+          class:   'span-8',
+        },
+
+        // 'developer' group
+        metrics: {
+          weight:  0,
+          type:    'boolean',
+          path:    'metrics.enabled',
+          default: false,
+        },
+        debug: {
+          weight:  1,
+          type:    'boolean',
+          path:    'debug',
+          default: false,
+        }
+      };
+    },
+
+    groups(): Group[] {
+      return [{
+        name:     'general',
+        children: [
+          'garbageCollectionInterval',
+          'gitClientTimeout',
+          'proxy',
+          'noProxy',
+          'clusterEnqueueDelay',
+          'nodeSelector',
+          'priorityClassName',
+          'tolerations',
+        ],
+        expanded: true,
+        weight:   0
+      }, {
+        name:     'agent',
+        children: [
+          'agentTLSMode',
+          'agentCheckinInterval'
+        ],
+        weight: 1
+      }, {
+        name:     'replicas',
+        children: [
+          'controllerReplicas',
+          'gitjobReplicas',
+          'helmopsReplicas',
+          'agentReplicas',
+        ],
+        weight: 2
+      }, {
+        name:     'annotations',
+        children: [
+          'controllerAnnotations',
+          'gitjobAnnotations',
+          'helmopsAnnotations'
+        ],
+        weight: 3
+      }, {
+        name:     'developer',
+        children: [
+          'metrics',
+          'debug'
+        ],
+        weight: 4
+      }];
+    }
+  }
+};
+</script>
+
+<template>
+  <ConfigMapSettings
+    :settings="settings"
+    :groups="groups"
+    :namespace="'cattle-system'"
+    :name="'rancher-config'"
+    :data-key="'fleet'"
+    :in-store="'management'"
+    :label-key-prefix="'fleet.settings'"
+    :show-info="true"
+  />
+</template>
+
+<style scoped lang='scss'>
+</style>

package/pages/c/_cluster/longhorn/index.vue

@@ -12,10 +12,13 @@ export default {
 
   async fetch() {
     if ( this.$store.getters['cluster/schemaFor'](SERVICE) ) {
-      this.uiServices = await this.$store.dispatch('cluster/findLabelSelector', {
+      const response = await this.$store.dispatch('cluster/findLabelSelector', {
         type:     SERVICE,
-        matching: { labelSelector: { matchLabels: { app: 'longhorn-ui' } } }
+        matching: { labelSelector: { matchLabels: { app: 'longhorn-ui' } } },
+        opt:      { transient: true }
       });
+
+      this.uiServices = response.data;
     }
   },
 

package/pages/c/_cluster/uiplugins/CatalogList/index.vue

@@ -3,11 +3,12 @@ import { mapGetters } from 'vuex';
 import isEmpty from 'lodash/isEmpty';
 
 import ResourceManager from '@shell/mixins/resource-manager';
-import { SERVICE, WORKLOAD_TYPES } from '@shell/config/types';
+import { SERVICE, SERVICE_ACCOUNT, WORKLOAD_TYPES } from '@shell/config/types';
 import { UI_PLUGIN_LABELS, UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
 import { UI_PLUGIN_CATALOG } from '@shell/config/table-headers';
 
 import ResourceTable from '@shell/components/ResourceTable';
+import { allHash } from '@shell/utils/promise';
 
 export default {
   emits: ['showCatalogUninstallDialog', 'showCatalogLoadDialog'],
@@ -32,6 +33,20 @@ export default {
     };
   },
 
+  async fetch() {
+    const hash = {};
+
+    if ( this.$store.getters['management/canList'](WORKLOAD_TYPES.DEPLOYMENT) ) {
+      hash.deployments = this.$store.dispatch('management/findAll', { type: WORKLOAD_TYPES.DEPLOYMENT });
+    }
+
+    if ( this.$store.getters['management/canList'](SERVICE_ACCOUNT) ) {
+      hash.services = this.$store.dispatch('management/findAll', { type: SERVICE });
+    }
+
+    await allHash(hash);
+  },
+
   computed: {
     ...mapGetters({ allRepos: 'catalog/repos' }),
 

package/pages/c/_cluster/uiplugins/PluginInfoPanel.vue

@@ -167,7 +167,7 @@ export default {
       @after-enter="onEnter"
       @after-leave="onLeave"
     >
-      <div
+      <aside
         v-if="showSlideIn"
         id="slide-in-content-element"
         class="slideIn"
@@ -293,7 +293,7 @@ export default {
             </div>
           </div>
         </div>
-      </div>
+      </aside>
     </transition>
   </div>
 </template>

package/pages/explorer/resource/detail/configmap.vue

@@ -1,19 +1,42 @@
 <script setup lang="ts">
 import DetailPage from '@shell/components/Resource/Detail/Page.vue';
+import TitleBar from '@shell/components/Resource/Detail/TitleBar/index.vue';
+import { useDefaultTitleBarProps } from '@shell/components/Resource/Detail/TitleBar/composables';
+import Metadata from '@shell/components/Resource/Detail/Metadata/index.vue';
+import { useDefaultMetadataProps } from '@shell/components/Resource/Detail/Metadata/composables';
 import { CONFIG_MAP } from '@shell/config/types';
-import { useStore } from 'vuex';
-
-const store = useStore();
-const configMaps = await store.dispatch('cluster/findAll', { type: CONFIG_MAP });
+import { useFetchResourceWithId, useResourceIdentifiers } from '@shell/composables/resources';
+import ResourceTabs from '@shell/components/form/ResourceTabs/index.vue';
+import ConfigMapDataTab from '@shell/components/Resource/Detail/ResourceTabs/ConfigMapDataTab/index.vue';
+import { useGetConfigMapDataTabProps } from '@shell/components/Resource/Detail/ResourceTabs/ConfigMapDataTab/composables';
 
+const { id, schema } = useResourceIdentifiers(CONFIG_MAP);
+const configMap = await useFetchResourceWithId(CONFIG_MAP, id);
+const titleBarProps = useDefaultTitleBarProps(configMap);
+const metadataProps = useDefaultMetadataProps(configMap);
+const configMapDataTabProps = useGetConfigMapDataTabProps(configMap);
 </script>
+
 <template>
   <DetailPage>
     <template #top-area>
-      ConfigMap
+      <TitleBar
+        v-bind="titleBarProps"
+      />
+      <Metadata
+        class="mmt-6"
+        v-bind="metadataProps"
+      />
     </template>
-    <template #middle-area>
-      {{ configMaps }}
+    <template #bottom-area>
+      <ResourceTabs
+        :value="configMap"
+        :schema="schema"
+      >
+        <ConfigMapDataTab
+          v-bind="configMapDataTabProps"
+        />
+      </ResourceTabs>
     </template>
   </DetailPage>
 </template>

package/pages/explorer/resource/detail/secret.vue

@@ -0,0 +1,50 @@
+<script setup lang="ts">
+import DetailPage from '@shell/components/Resource/Detail/Page.vue';
+import TitleBar from '@shell/components/Resource/Detail/TitleBar/index.vue';
+import { useDefaultTitleBarProps } from '@shell/components/Resource/Detail/TitleBar/composables';
+import Metadata from '@shell/components/Resource/Detail/Metadata/index.vue';
+import { useDefaultMetadataProps } from '@shell/components/Resource/Detail/Metadata/composables';
+import { SECRET } from '@shell/config/types';
+import { useFetchResourceWithId, useResourceIdentifiers } from '@shell/composables/resources';
+import ResourceTabs from '@shell/components/form/ResourceTabs/index.vue';
+import SecretDataTab from '@shell/components/Resource/Detail/ResourceTabs/SecretDataTab/index.vue';
+import KnownHostsTab from '@shell/components/Resource/Detail/ResourceTabs/KnownHostsTab/index.vue';
+import { useGetKnownHostsTabProps } from '@shell/components/Resource/Detail/ResourceTabs/KnownHostsTab/composables';
+import { useSecretDataTabDefaultProps } from '@shell/components/Resource/Detail/ResourceTabs/SecretDataTab/composeables';
+import { useSecretIdentifyingInformation } from '@shell/components/Resource/Detail/Metadata/IdentifyingInformation/composable';
+
+const { id, schema } = useResourceIdentifiers(SECRET);
+const secret = await useFetchResourceWithId(SECRET, id);
+const titleBarProps = useDefaultTitleBarProps(secret);
+const additionalIdentifyingInformation = useSecretIdentifyingInformation(secret);
+const metaDataProps = useDefaultMetadataProps(secret, additionalIdentifyingInformation);
+const knownHostsTabProps = useGetKnownHostsTabProps(secret);
+const secretDataTabProps = useSecretDataTabDefaultProps(secret);
+</script>
+<template>
+  <DetailPage>
+    <template #top-area>
+      <TitleBar v-bind="titleBarProps" />
+      <Metadata
+        class="mmt-6"
+        v-bind="metaDataProps"
+      />
+    </template>
+    <template #bottom-area>
+      <ResourceTabs
+        :value="secret"
+        :schema="schema"
+      >
+        <SecretDataTab
+          v-bind="secretDataTabProps"
+          :weight="1"
+        />
+        <KnownHostsTab
+          v-if="knownHostsTabProps"
+          v-bind="knownHostsTabProps"
+          :weight="0"
+        />
+      </ResourceTabs>
+    </template>
+  </DetailPage>
+</template>

package/pages/home.vue

@@ -1,7 +1,6 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { mapPref, AFTER_LOGIN_ROUTE, READ_WHATS_NEW, HIDE_HOME_PAGE_CARDS } from '@shell/store/prefs';
-import { Banner } from '@components/Banner';
+import { mapPref, AFTER_LOGIN_ROUTE, HIDE_HOME_PAGE_CARDS } from '@shell/store/prefs';
 import BannerGraphic from '@shell/components/BannerGraphic.vue';
 import IndentedPanel from '@shell/components/IndentedPanel.vue';
 import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
@@ -14,7 +13,7 @@ import { NAME as MANAGER } from '@shell/config/product/manager';
 import { STATE } from '@shell/config/table-headers';
 import { MODE, _IMPORT } from '@shell/config/query-params';
 import { createMemoryFormat, formatSi, parseSi, createMemoryValues } from '@shell/utils/units';
-import { getVersionInfo, readReleaseNotes, markReadReleaseNotes, markSeenReleaseNotes } from '@shell/utils/version';
+import { markSeenReleaseNotes } from '@shell/utils/version';
 import PageHeaderActions from '@shell/mixins/page-actions';
 import { getVendor } from '@shell/config/private-label';
 import { mapFeature, MULTI_CLUSTER } from '@shell/store/features';
@@ -36,7 +35,6 @@ export default defineComponent({
   name:       'Home',
   layout:     'home',
   components: {
-    Banner,
     BannerGraphic,
     IndentedPanel,
     PaginatedResourceTable,
@@ -66,7 +64,6 @@ export default defineComponent({
 
     return {
       HIDE_HOME_PAGE_CARDS,
-      fullVersion: getVersionInfo(this.$store).fullVersion,
       // Page actions don't change on the Home Page
       pageActions: [
         {
@@ -213,7 +210,7 @@ export default defineComponent({
 
   computed: {
     ...mapState(['managementReady']),
-    ...mapGetters(['currentCluster', 'defaultClusterId', 'releaseNotesUrl']),
+    ...mapGetters(['currentCluster', 'defaultClusterId']),
     mcm: mapFeature(MULTI_CLUSTER),
 
     canCreateCluster() {
@@ -223,14 +220,16 @@ export default defineComponent({
     afterLoginRoute: mapPref(AFTER_LOGIN_ROUTE),
     homePageCards:   mapPref(HIDE_HOME_PAGE_CARDS),
 
-    readWhatsNewAlready() {
-      return readReleaseNotes(this.$store);
-    },
   },
 
   async created() {
     // Update last visited on load
     await this.$store.dispatch('prefs/setLastVisited', { name: 'home' });
+
+    // We mark the release notes as seen still - the user has visited the home page, which will show the
+    // notification centre containing the release notes notification
+    // If we do not, then if they set the landing page, that won't work unless the release notes are marked read
+    // otherwise we always take them to the home page to see the release notes
     markSeenReleaseNotes(this.$store);
   },
 
@@ -406,19 +405,12 @@ export default defineComponent({
       return `${ memValues.useful }/${ memValues.total } ${ memValues.units }`;
     },
 
-    showWhatsNew() {
-      // Update the value, so that the message goes away
-      markReadReleaseNotes(this.$store);
-    },
-
     async resetCards() {
       const value = this.$store.getters['prefs/get'](HIDE_HOME_PAGE_CARDS) || {};
 
       delete value.setLoginPage;
 
       await this.$store.dispatch('prefs/set', { key: HIDE_HOME_PAGE_CARDS, value });
-
-      await this.$store.dispatch('prefs/set', { key: READ_WHATS_NEW, value: '' });
     },
 
     async toggleBanner() {
@@ -499,31 +491,6 @@ export default defineComponent({
       data-testid="home-banner-graphic"
     />
     <IndentedPanel class="mt-20 mb-20">
-      <div
-        v-if="!readWhatsNewAlready"
-        class="row"
-      >
-        <div class="col span-12">
-          <Banner
-            data-testid="changelog-banner"
-            color="info whats-new"
-          >
-            <div>
-              {{ t('landing.seeWhatsNew', { version: CURRENT_RANCHER_VERSION }) }}
-            </div>
-            <a
-              class="hand banner-link"
-              :href="releaseNotesUrl"
-              role="link"
-              target="_blank"
-              rel="noopener noreferrer nofollow"
-              :aria-label="t('landing.whatsNewLink', { version: CURRENT_RANCHER_VERSION })"
-              @click.stop="showWhatsNew"
-              @keyup.stop.enter="showWhatsNew"
-            ><span v-clean-html="t('landing.whatsNewLink', { version: CURRENT_RANCHER_VERSION })" /></a>
-          </Banner>
-        </div>
-      </div>
       <div class="row home-panels">
         <div class="col main-panel">
           <div class="row panel">
@@ -711,19 +678,6 @@ export default defineComponent({
     }
   }
 
-  .whats-new {
-    > :deep() .banner__content {
-      display: flex;
-
-      > div {
-        flex: 1;
-      }
-      > a {
-        align-self: flex-end;
-      }
-    }
-  }
-
   .table-heading {
     align-items: center;
     display: flex;
@@ -761,7 +715,7 @@ export default defineComponent({
       align-items: center;
 
       // Ensure long cluster names truncate with ellipsis
-      > A {
+      > A, > span {
         overflow: hidden;
         text-overflow: ellipsis;
       }

package/pages/support/index.vue

@@ -2,13 +2,13 @@
 import BannerGraphic from '@shell/components/BannerGraphic';
 import IndentedPanel from '@shell/components/IndentedPanel';
 import CommunityLinks from '@shell/components/CommunityLinks';
-import { CATALOG, MANAGEMENT } from '@shell/config/types';
+import { MANAGEMENT } from '@shell/config/types';
 import { getVendor } from '@shell/config/private-label';
 import { SETTING } from '@shell/config/settings';
 import { addParam } from '@shell/utils/url';
 import { isRancherPrime } from '@shell/config/version';
-import { hasCspAdapter } from '@shell/mixins/brand';
 import TabTitle from '@shell/components/TabTitle';
+import CspAdapterUtils from '@shell/utils/cspAdaptor';
 
 export default {
 
@@ -42,9 +42,7 @@ export default {
       return setting;
     };
 
-    if ( this.$store.getters['management/canList'](CATALOG.APP) ) {
-      this.apps = await this.$store.dispatch('management/findAll', { type: CATALOG.APP });
-    }
+    this.apps = await CspAdapterUtils.fetchCspAdaptorApp(this.$store);
     this.brandSetting = await fetchOrCreateSetting(SETTING.BRAND, '');
     this.serverUrlSetting = await fetchOrCreateSetting(SETTING.SERVER_URL, '');
     this.uiIssuesSetting = await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.ISSUES });
@@ -75,7 +73,7 @@ export default {
 
   computed: {
     cspAdapter() {
-      return hasCspAdapter(this.apps);
+      return CspAdapterUtils.hasCspAdapter({ $store: this.$store, apps: this.apps });
     },
 
     hasSupport() {

package/plugins/dashboard-store/actions.js

@@ -408,10 +408,12 @@ export default {
    *
    * @param {*} ctx
    * @param { {type: string, opt: ActionFindPageArgs} } opt
+   * @returns @ActionFindPageResponse
    */
   async findPage(ctx, { type, opt }) {
     const { getters, commit, dispatch } = ctx;
 
+    // of type @ActionFindPageArgs
     opt = opt || {};
 
     if (!opt.pagination) {
@@ -443,7 +445,7 @@ export default {
       return findAllGetter(getters, type, opt);
     }
 
-    console.log(`Find Page: [${ ctx.state.config.namespace }] ${ type }. Page: ${ opt.pagination.page }. Size: ${ opt.pagination.pageSize }`); // eslint-disable-line no-console
+    console.log(`Find Page: [${ ctx.state.config.namespace }] ${ type }. Page: ${ opt.pagination.page }. Size: ${ opt.pagination.pageSize }. Sort: ${ opt.pagination.sort.map((s) => s.field).join(', ') }`); // eslint-disable-line no-console
     opt = opt || {};
     opt.url = getters.urlFor(type, null, opt);
 
@@ -512,6 +514,9 @@ export default {
    * b) Pagination Disabled - use the old 'native kube api' - findMatching
    *
    * Filter is defined via the kube labelSelector object (see KubeLabelSelector)
+   *
+   * opt: @ActionFindLabelSelectorArgs
+   * @returns @ActionFindMatchingResponse (resources[], or if transient { data: resources[], pagination: StorePagination })
    */
   async findLabelSelector(ctx, {
     type,
@@ -528,6 +533,8 @@ export default {
       context,
     };
 
+    opt = opt || {};
+
     if (getters[`paginationEnabled`]?.(args)) {
       if (isLabelSelectorEmpty(labelSelector)) {
         throw new Error(`labelSelector must not be empty when using findLabelSelector (avoid fetching all resources)`);
@@ -537,21 +544,28 @@ export default {
       return dispatch('findPage', {
         type,
         opt: {
-          ...(opt || {}),
+          ...opt,
           namespaced: namespace,
           pagination: new FilterArgs({ labelSelector }),
+          transient:  opt?.transient !== undefined ? opt.transient : false // Call this out explicitly here, as by default findX methods ar eusually be cached AND watched
         }
       });
     }
 
-    return dispatch('findMatching', {
+    // opt of type ActionFindPageArgs
+    const findMatching = await dispatch('findMatching', {
       type,
       selector: labelSelectorToSelector(labelSelector),
       opt,
       namespace,
     });
+
+    return opt.transient ? { data: findMatching } : findMatching;
   },
 
+  /**
+   * opt: @ActionFindMatchingArgs
+   */
   async findMatching(ctx, {
     type,
     selector,
@@ -796,9 +810,9 @@ export default {
 
   // Forget a type in the store
   // Remove all entries for that type and stop watching it
-  forgetType({ commit, dispatch, state }, type) {
+  forgetType({ commit, dispatch, state }, type, compareWatches) {
     state.started
-      .filter((entry) => entry.type === type)
+      .filter((entry) => compareWatches ? compareWatches(entry) : entry.type === type)
       .forEach((entry) => dispatch('unwatch', entry));
 
     commit('forgetType', type);

package/plugins/dashboard-store/getters.js

@@ -152,6 +152,10 @@ export default {
       return getters.all(type);
     }
 
+    if (getters['havePage'](type)) {
+      return getters.all(type);
+    }
+
     // Does the store have all and we can pretend like it contains a result of a labelSelector?
     if (getters['haveAll'](type)) {
       return getters.matching( type, selector, namespace );