@rancher/shell 0.2.2 → 0.2.4

package/list/service.vue

@@ -18,6 +18,11 @@ export default {
       type:     Object,
       required: true,
     },
+
+    useQueryParamsForSimpleFiltering: {
+      type:    Boolean,
+      default: false
+    }
   },
 
   // fetch nodes before loading this page, as they may be referenced in the Target table column
@@ -51,5 +56,6 @@ export default {
     :headers="$attrs.headers"
     :group-by="$attrs.groupBy"
     :loading="loading"
+    :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
   />
 </template>

package/list/ui.cattle.io.navlink.vue

@@ -21,6 +21,11 @@ export default {
       type:     Boolean,
       required: false,
     },
+
+    useQueryParamsForSimpleFiltering: {
+      type:    Boolean,
+      default: false
+    }
   },
 
   computed: { ...mapGetters(['clusterId']) }
@@ -32,24 +37,36 @@ export default {
     :schema="schema"
     :rows="rows"
     :loading="loading"
+    :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
   >
     <template #cell:to="{row}">
       <template v-if="row.spec && row.spec.toService">
         <n-link :to="{name: 'c-cluster-product-resource-namespace-id', params: { cluster: clusterId, product: 'explorer', resource: 'service', namespace: row.spec.toService.namespace, id: row.spec.toService.name}}">
           {{ row.spec.toService.namespace }}/{{ row.spec.toService.name }}
         </n-link>:
-        <a :href="row.link" :target="row.actualTarget" rel="noopener noreferrer nofollow">
+        <a
+          :href="row.link"
+          :target="row.actualTarget"
+          rel="noopener noreferrer nofollow"
+        >
           {{ row.spec.toService.port || 'default' }}
           <i class="icon icon-external-link" />
         </a>
       </template>
       <template v-else-if="row.link">
-        <a :href="row.link" :target="row.actualTarget" rel="noopener noreferrer nofollow">
+        <a
+          :href="row.link"
+          :target="row.actualTarget"
+          rel="noopener noreferrer nofollow"
+        >
           {{ row.link.replace(/^https:\/\//,'') }}
           <i class="icon icon-external-link" />
         </a>
       </template>
-      <span v-else class="text-muted">&mdash;</span>
+      <span
+        v-else
+        class="text-muted"
+      >&mdash;</span>
     </template>
   </ResourceTable>
 </template>

package/list/workload.vue

@@ -18,6 +18,13 @@ export default {
   components: { ResourceTable },
   mixins:     [ResourceFetch],
 
+  props: {
+    useQueryParamsForSimpleFiltering: {
+      type:    Boolean,
+      default: false
+    }
+  },
+
   async fetch() {
     try {
       const schema = this.$store.getters[`cluster/schemaFor`](NODE);
@@ -85,7 +92,7 @@ export default {
         }
 
         for ( const row of typeRows ) {
-          if (!this.allTypes || row.showAsWorkload) {
+          if (!this.allTypes || !row.ownedByWorkload) {
             out.push(row);
           }
         }
@@ -151,5 +158,11 @@ export default {
 </script>
 
 <template>
-  <ResourceTable :loading="$fetchState.pending" :schema="schema" :rows="filteredRows" :overflow-y="true" />
+  <ResourceTable
+    :loading="$fetchState.pending"
+    :schema="schema"
+    :rows="filteredRows"
+    :overflow-y="true"
+    :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+  />
 </template>

package/machine-config/amazonec2.vue

@@ -523,7 +523,10 @@ export default {
             <div class="col span-12">
               <h3>
                 {{ t('cluster.machineConfig.amazonEc2.securityGroup.title') }}
-                <span v-if="!value.vpcId" class="text-muted text-small">
+                <span
+                  v-if="!value.vpcId"
+                  class="text-muted text-small"
+                >
                   {{ t('cluster.machineConfig.amazonEc2.securityGroup.vpcId') }}
                 </span>
               </h3>
@@ -567,7 +570,10 @@ export default {
                 :mode="mode"
                 :label="t('cluster.machineConfig.amazonEc2.encryptEbsVolume')"
               />
-              <div v-if="value.encryptEbsVolume" class="mt-10">
+              <div
+                v-if="value.encryptEbsVolume"
+                class="mt-10"
+              >
                 <LabeledSelect
                   v-if="canReadKms"
                   v-model="value.kmsKey"
@@ -597,7 +603,10 @@ export default {
                 :mode="mode"
                 :label="t('cluster.machineConfig.amazonEc2.requestSpotInstance')"
               />
-              <div v-if="value.requestSpotInstance" class="mt-10">
+              <div
+                v-if="value.requestSpotInstance"
+                class="mt-10"
+              >
                 <UnitInput
                   v-model="value.spotPrice"
                   output-as="string"

package/machine-config/azure.vue

@@ -191,10 +191,19 @@ export default {
 </script>
 
 <template>
-  <Loading v-if="$fetchState.pending" :delayed="true" />
+  <Loading
+    v-if="$fetchState.pending"
+    :delayed="true"
+  />
   <div v-else-if="errors.length">
-    <div v-for="(err, idx) in errors" :key="idx">
-      <Banner color="error" :label="stringify(err)" />
+    <div
+      v-for="(err, idx) in errors"
+      :key="idx"
+    >
+      <Banner
+        color="error"
+        :label="stringify(err)"
+      />
     </div>
   </div>
   <div v-else>
@@ -245,7 +254,7 @@ export default {
         />
       </div>
     </div>
-    <hr class="mt-20" />
+    <hr class="mt-20">
     <div class="row mt-20">
       <div class="col span-6">
         <LabeledInput
@@ -290,7 +299,7 @@ export default {
           />
         </div>
       </div>
-      <hr class="mt-20" />
+      <hr class="mt-20">
       <div class="row mt-20">
         <div class="col span-6">
           <LabeledInput
@@ -302,7 +311,7 @@ export default {
           />
         </div>
       </div>
-      <hr class="mt-20" />
+      <hr class="mt-20">
       <div class="row mt-20">
         <div class="col span-6">
           <LabeledInput
@@ -383,7 +392,7 @@ export default {
           />
         </div>
       </div>
-      <hr class="mt-20" />
+      <hr class="mt-20">
       <div class="row mt-20">
         <div class="col span-6">
           <LabeledSelect

package/machine-config/digitalocean.vue

@@ -137,7 +137,10 @@ export default {
 </script>
 
 <template>
-  <Loading v-if="$fetchState.pending" :delayed="true" />
+  <Loading
+    v-if="$fetchState.pending"
+    :delayed="true"
+  />
   <div v-else-if="errors.length">
     <div
       v-for="(err, idx) in errors"

package/machine-config/generic.vue

@@ -75,7 +75,10 @@ export default {
 </script>
 
 <template>
-  <Loading v-if="$fetchState.pending" :delayed="true" />
+  <Loading
+    v-if="$fetchState.pending"
+    :delayed="true"
+  />
   <div v-else-if="errors.length">
     <div
       v-for="(err, idx) in errors"

package/machine-config/harvester.vue

@@ -26,6 +26,8 @@ import { podAffinity as podAffinityValidator } from '@shell/utils/validators/pod
 import { stringify, exceptionToErrorsArray } from '@shell/utils/error';
 import { HCI as HCI_ANNOTATIONS } from '@shell/config/labels-annotations';
 
+const STORAGE_NETWORK = 'storage-network.settings.harvesterhci.io';
+
 export function isReady() {
   function getStatusConditionOfType(type, defaultValue = []) {
     const conditions = Array.isArray(get(this, 'status.conditions')) ? this.status.conditions : defaultValue;
@@ -151,7 +153,7 @@ export default {
         this.userDataOptions = userDataOptions;
         this.networkDataOptions = networkDataOptions;
         this.images = res.images.value?.data;
-        this.networkOptions = (res.networks.value?.data || []).map((O) => {
+        this.networkOptions = (res.networks.value?.data || []).filter(O => O.metadata?.annotations?.[STORAGE_NETWORK] !== 'true').map((O) => {
           let value;
           let label;
 
@@ -437,7 +439,10 @@ export default {
 
 <template>
   <div>
-    <Loading v-if="$fetchState.pending" :delayed="true" />
+    <Loading
+      v-if="$fetchState.pending"
+      :delayed="true"
+    />
     <div v-else>
       <div class="row mt-20">
         <div class="col span-6">
@@ -513,7 +518,10 @@ export default {
         </div>
       </div>
 
-      <div v-if="isImportCluster" class="row mt-20">
+      <div
+        v-if="isImportCluster"
+        class="row mt-20"
+      >
         <div class="col span-6">
           <LabeledSelect
             v-model="value.imageName"
@@ -543,7 +551,10 @@ export default {
         </div>
       </div>
 
-      <div v-else class="row mt-20">
+      <div
+        v-else
+        class="row mt-20"
+      >
         <div class="col span-6">
           <LabeledInput
             v-model="value.imageName"
@@ -654,8 +665,14 @@ export default {
       </portal>
     </div>
     <div v-if="errors.length">
-      <div v-for="(err, idx) in errors" :key="idx">
-        <Banner color="error" :label="stringify(err.Message || err)" />
+      <div
+        v-for="(err, idx) in errors"
+        :key="idx"
+      >
+        <Banner
+          color="error"
+          :label="stringify(err.Message || err)"
+        />
       </div>
     </div>
   </div>

package/machine-config/linode.vue

@@ -123,7 +123,10 @@ export default {
 </script>
 
 <template>
-  <Loading v-if="$fetchState.pending" :delayed="true" />
+  <Loading
+    v-if="$fetchState.pending"
+    :delayed="true"
+  />
   <div v-else-if="errors.length">
     <div
       v-for="(err, idx) in errors"

package/machine-config/vmwarevsphere.vue

@@ -659,7 +659,10 @@ export default {
 </script>
 
 <template>
-  <Loading v-if="$fetchState.pending" :delayed="true" />
+  <Loading
+    v-if="$fetchState.pending"
+    :delayed="true"
+  />
   <div v-else-if="errors.length">
     <div
       v-for="(err, idx) in errors"
@@ -672,8 +675,15 @@ export default {
     </div>
   </div>
   <div v-else>
-    <Card class="m-0 mt-20" :show-highlight-border="false" :show-actions="false">
-      <h4 slot="title" class="text-default-text mb-5">
+    <Card
+      class="m-0 mt-20"
+      :show-highlight-border="false"
+      :show-actions="false"
+    >
+      <h4
+        slot="title"
+        class="text-default-text mb-5"
+      >
         {{ t('cluster.machineConfig.vsphere.scheduling.label') }}
         <p class="text-muted text-small">
           {{ t('cluster.machineConfig.vsphere.scheduling.description') }}
@@ -741,8 +751,15 @@ export default {
         </div>
       </div>
     </Card>
-    <Card class="m-0 mt-20" :show-highlight-border="false" :show-actions="false">
-      <h4 slot="title" class="text-default-text mb-5">
+    <Card
+      class="m-0 mt-20"
+      :show-highlight-border="false"
+      :show-actions="false"
+    >
+      <h4
+        slot="title"
+        class="text-default-text mb-5"
+      >
         {{ t('cluster.machineConfig.vsphere.instanceOptions.label') }}
         <p class="text-muted text-small">
           {{ t('cluster.machineConfig.vsphere.instanceOptions.description') }}
@@ -790,7 +807,10 @@ export default {
           </div>
         </div>
         <div class="row mt-10">
-          <div class="col" :class="showContentLibrary ? 'span-4' : 'span-6'">
+          <div
+            class="col"
+            :class="showContentLibrary ? 'span-4' : 'span-6'"
+          >
             <LabeledSelect
               v-model="value.creationType"
               :mode="mode"
@@ -799,7 +819,10 @@ export default {
               :disabled="disabled"
             />
           </div>
-          <div v-if="showTemplate" class="col span-6">
+          <div
+            v-if="showTemplate"
+            class="col span-6"
+          >
             <LabeledSelect
               v-model="value.cloneFrom"
               :loading="templatesLoading"
@@ -811,7 +834,10 @@ export default {
               :tooltip="templateTooltip"
             />
           </div>
-          <div v-if="showContentLibrary" class="col span-4">
+          <div
+            v-if="showContentLibrary"
+            class="col span-4"
+          >
             <LabeledSelect
               v-model="value.contentLibrary"
               :loading="contentLibrariesLoading"
@@ -821,7 +847,10 @@ export default {
               :disabled="disabled"
             />
           </div>
-          <div v-if="showContentLibrary" class="col span-4">
+          <div
+            v-if="showContentLibrary"
+            class="col span-4"
+          >
             <LabeledSelect
               v-model="value.cloneFrom"
               :loading="libraryTemplatesLoading"
@@ -832,7 +861,10 @@ export default {
               :disabled="disabled"
             />
           </div>
-          <div v-if="showVirtualMachines" class="col span-6">
+          <div
+            v-if="showVirtualMachines"
+            class="col span-6"
+          >
             <LabeledSelect
               v-model="value.cloneFrom"
               :loading="virtualMachinesLoading"
@@ -842,7 +874,10 @@ export default {
               :disabled="disabled"
             />
           </div>
-          <div v-if="showIso" class="col span-6">
+          <div
+            v-if="showIso"
+            class="col span-6"
+          >
             <LabeledInput
               v-model="value.boot2dockerUrl"
               :mode="mode"
@@ -852,7 +887,10 @@ export default {
             />
           </div>
         </div>
-        <div v-if="showIso" class="row mt-10">
+        <div
+          v-if="showIso"
+          class="row mt-10"
+        >
           <div class="col span-12">
             <LabeledInput
               v-model="value.cloudinit"
@@ -866,7 +904,10 @@ export default {
             </p>
           </div>
         </div>
-        <div v-if="showCloudConfigYaml" class="row mt-10">
+        <div
+          v-if="showCloudConfigYaml"
+          class="row mt-10"
+        >
           <div class="col span-12">
             <label class="text-label mt-0">{{ t('cluster.machineConfig.vsphere.instanceOptions.cloudConfigYaml') }}</label>
             <YamlEditor
@@ -910,8 +951,16 @@ export default {
         </div>
       </div>
     </Card>
-    <Card v-if="haveTags" class="m-0 mt-20" :show-highlight-border="false" :show-actions="false">
-      <h4 slot="title" class="text-default-text mb-5">
+    <Card
+      v-if="haveTags"
+      class="m-0 mt-20"
+      :show-highlight-border="false"
+      :show-actions="false"
+    >
+      <h4
+        slot="title"
+        class="text-default-text mb-5"
+      >
         {{ t('cluster.machineConfig.vsphere.tags.label') }}
         <p class="text-muted text-small">
           {{ t('cluster.machineConfig.vsphere.tags.description') }}
@@ -927,8 +976,16 @@ export default {
         />
       </div>
     </Card>
-    <Card v-if="haveAttributes" class="m-0 mt-20" :show-highlight-border="false" :show-actions="false">
-      <h4 slot="title" class="text-default-text mb-5">
+    <Card
+      v-if="haveAttributes"
+      class="m-0 mt-20"
+      :show-highlight-border="false"
+      :show-actions="false"
+    >
+      <h4
+        slot="title"
+        class="text-default-text mb-5"
+      >
         {{ t('cluster.machineConfig.vsphere.customAttributes.label') }}
         <p class="text-muted text-small">
           {{ t('cluster.machineConfig.vsphere.customAttributes.description') }}
@@ -948,8 +1005,15 @@ export default {
         />
       </div>
     </Card>
-    <Card class="m-0 mt-20" :show-highlight-border="false" :show-actions="false">
-      <h4 slot="title" class="text-default-text mb-5">
+    <Card
+      class="m-0 mt-20"
+      :show-highlight-border="false"
+      :show-actions="false"
+    >
+      <h4
+        slot="title"
+        class="text-default-text mb-5"
+      >
         {{ t('cluster.machineConfig.vsphere.vAppOptions.label') }}
         <p class="text-muted text-small">
           {{ t('cluster.machineConfig.vsphere.vAppOptions.description') }}
@@ -967,7 +1031,10 @@ export default {
             />
           </div>
         </div>
-        <div v-if="showManual" class="row mb-10">
+        <div
+          v-if="showManual"
+          class="row mb-10"
+        >
           <div class="col span-4">
             <LabeledInput
               v-model="value.vappTransport"
@@ -999,7 +1066,10 @@ export default {
             />
           </div>
         </div>
-        <div v-if="showManual" class="row">
+        <div
+          v-if="showManual"
+          class="row"
+        >
           <div class="col span-12">
             <KeyValue
               v-model="vappProperty"

package/mixins/__tests__/create-edit-view.test.ts

@@ -0,0 +1,19 @@
+import { _EDIT } from '@shell/config/query-params';
+import Vue from 'vue';
+import { mount, VueClass } from '@vue/test-utils';
+import CreateEditView from '@shell/mixins/create-edit-view';
+
+describe('createEditView should', () => {
+  it('add value', () => {
+    const Component = {
+      render() {},
+      mixins:    [CreateEditView],
+      props:  { value: { id: '123' } }
+    };
+
+    // TODO: Investigate type to be used for the .vm property to access the component instance instead of using any
+    const instance = mount(Component as unknown as VueClass<Vue>).vm as any;
+
+    expect(instance.mode).toContain(_EDIT);
+  });
+});

package/mixins/brand.js

@@ -3,6 +3,7 @@ import { getVendor } from '@shell/config/private-label';
 import { SETTING } from '@shell/config/settings';
 import { findBy } from '@shell/utils/array';
 import { createCssVars } from '@shell/utils/color';
+import { _ALL_IF_AUTHED } from '@shell/plugins/dashboard-store/actions';
 
 export default {
   async fetch() {
@@ -13,7 +14,15 @@ export default {
       }
     } catch (e) {}
 
-    this.globalSettings = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.SETTING });
+    // Ensure we read the settings even when we are not authenticated
+    try {
+      this.globalSettings = await this.$store.dispatch('management/findAll', {
+        type: MANAGEMENT.SETTING,
+        opt:  {
+          load: _ALL_IF_AUTHED, url: `/v1/${ MANAGEMENT.SETTING }`, redirectUnauthorized: false
+        }
+      });
+    } catch (e) {}
   },
 
   data() {
@@ -85,7 +94,7 @@ export default {
         const brandSetting = findBy(this.globalSettings, 'id', SETTING.BRAND);
 
         if (brandSetting) {
-          brandSetting.value = 'suse';
+          brandSetting.value = 'csp';
           brandSetting.save();
         } else {
           const schema = this.$store.getters['management/schemaFor'](MANAGEMENT.SETTING);
@@ -93,7 +102,7 @@ export default {
 
           if (url) {
             this.$store.dispatch('management/create', {
-              type: MANAGEMENT.SETTING, metadata: { name: SETTING.BRAND }, value: 'suse', default: ''
+              type: MANAGEMENT.SETTING, metadata: { name: SETTING.BRAND }, value: 'csp', default: ''
             }).then(setting => setting.save());
           }
         }