@rancher/shell 0.3.24 → 0.3.26

package/creators/app/files/.vscode/settings.json

@@ -10,7 +10,6 @@
     ".gitignore": true,
     ".nuxt*": true,
     ".nyc_output": true,
-    "Dockerfile": true,
     ".vscode": true,
     "LICENSE": true,
     "node_modules": true,

package/detail/__tests__/autoscaling.horizontalpodautoscaler.test.ts

@@ -0,0 +1,118 @@
+import { shallowMount } from '@vue/test-utils';
+import HorizontalPodAutoScaler from '@shell/detail/autoscaling.horizontalpodautoscaler/index.vue';
+
+describe('view: autoscaling.horizontalpodautoscaler', () => {
+  const mockStore = {
+    getters: {
+      'i18n/t':                  (text: string) => text,
+      t:                         (text: string) => text,
+      currentStore:              () => 'current_store',
+      'current_store/schemaFor': jest.fn(),
+      'current_store/all':       jest.fn(),
+      workspace:                 jest.fn(),
+    },
+  };
+
+  const mocks = {
+    $store:      mockStore,
+    $fetchState: { pending: false },
+    $route:      {
+      query: { AS: '' },
+      name:  {
+        endsWith: () => {
+          return false;
+        },
+      },
+    },
+  };
+
+  const value = {
+    status: {
+      currentMetrics: [
+        {
+          resource: {
+            current: {
+              averageUtilization: 8,
+              averageValue:       '11481088'
+            },
+            name: 'memory'
+          },
+          type: 'Resource'
+        },
+        {
+          resource: {
+            current: {
+              averageUtilization: 0,
+              averageValue:       '1m'
+            },
+            name: 'cpu'
+          },
+          type: 'Resource'
+        }
+      ],
+    },
+    spec: {
+      maxReplicas: 10,
+      metrics:     [
+        {
+          resource: {
+            name:   'memory',
+            target: {
+              averageUtilization: 80,
+              type:               'Utilization'
+            }
+          },
+          type: 'Resource'
+        },
+        {
+          resource: {
+            name:   'cpu',
+            target: {
+              averageUtilization: 50,
+              type:               'Utilization'
+            }
+          },
+          type: 'Resource'
+        }
+      ],
+      minReplicas:    1,
+      scaleTargetRef: {
+        apiVersion: 'apps/v1',
+        kind:       'Deployment',
+        name:       'php-apache'
+      }
+    }
+  };
+
+  const metricsValue = Object.values(value.spec.metrics);
+  const currentMetrics = Object.values(value.status.currentMetrics);
+
+  const wrapper = shallowMount(HorizontalPodAutoScaler, {
+    mocks,
+    propsData: { value },
+  });
+
+  describe.each(value.spec.metrics)('should display metrics for each resource:', (metric) => {
+    const name = metric.resource.name;
+
+    it(`${ name }:`, () => {
+      // Resource metrics
+      const resourceValue = wrapper.find(`[data-testid="resource-metrics-value-${ name }"]`);
+      const resourceName = wrapper.find(`[data-testid="resource-metrics-name-${ name }"]`);
+      const metricValue = metricsValue.find((f) => f.resource.name === name)?.resource;
+
+      // Current Metrics
+      const averageUtilization = wrapper.find(`[data-testid="current-metrics-Average Utilization-${ name }"]`);
+      const averageValue = wrapper.find(`[data-testid="current-metrics-Average Value-${ name }"]`);
+      const currentResource = currentMetrics.find((f) => f.resource.name === name)?.resource.current;
+
+      // Resource metrics
+      expect(resourceValue.element.textContent).toBe(`${ metricValue?.target?.averageUtilization }`);
+      expect(resourceName.element.textContent).toBe(`${ metricValue?.name }`);
+
+      // Current Metrics
+      expect(averageUtilization.element.textContent).toBe(`${ currentResource?.averageUtilization }`);
+      expect(averageValue.element.textContent).toBe(`${ currentResource?.averageValue }`);
+    });
+  });
+});

package/detail/autoscaling.horizontalpodautoscaler/index.vue

@@ -43,7 +43,7 @@ export default {
       return metrics.map((metric) => {
         const metricValue = get(metric, camelCase(metric.type));
         const targetType = metricValue?.target?.type;
-        const currentMatch = findBy(currentMetrics, 'type', metric.type);
+        const currentMatch = findBy(currentMetrics, 'resource.name', metric.resource.name);
         const current = currentMatch ? get(currentMatch, `${ camelCase(metric.type) }.current`) : null;
         const currentMetricsKVs = [];
 
@@ -128,7 +128,7 @@ export default {
                 <label class="text-label">
                   <t k="hpa.metrics.headers.value" />:
                 </label>
-                <span>{{ metric.targetValue }}</span>
+                <span :data-testid="`resource-metrics-value-${metric.subRowContent.resourceName}`">{{ metric.targetValue }}</span>
               </div>
               <div v-if="metric.metricSource === 'Object'">
                 <div class="mb-5">
@@ -155,7 +155,7 @@ export default {
                   <label class="text-label">
                     <t k="hpa.metrics.headers.resource" />:
                   </label>
-                  <span>{{ metric.subRowContent.resourceName }}</span>
+                  <span :data-testid="`resource-metrics-name-${metric.subRowContent.resourceName}`">{{ metric.subRowContent.resourceName }}</span>
                 </div>
               </div>
             </div>
@@ -173,7 +173,7 @@ export default {
                     <label class="text-label">
                       {{ current.targetName }}:
                     </label>
-                    <span>{{ current.targetValue }}</span>
+                    <span :data-testid="`current-metrics-${current.targetName}-${metric.subRowContent.resourceName}`">{{ current.targetValue }}</span>
                   </div>
                 </div>
               </div>

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

@@ -339,9 +339,10 @@ export default {
         pool._clusterSpec = mp;
 
         return {
-          poolId:     pool.id,
-          mainRowKey: 'isFake',
+          poolId:           pool.id,
+          mainRowKey:       'isFake',
           pool,
+          availableActions: []
         };
       });
     },
@@ -361,9 +362,10 @@ export default {
       const emptyNodePools = this.allNodePools.filter((x) => x.spec.clusterName === this.value.mgmtClusterId && x.spec.quantity === 0);
 
       return emptyNodePools.map((np) => ({
-        spec:       { nodePoolName: np.id.replace('/', ':') },
-        mainRowKey: 'isFake',
-        pool:       np,
+        spec:             { nodePoolName: np.id.replace('/', ':') },
+        mainRowKey:       'isFake',
+        pool:             np,
+        availableActions: []
       }));
     },
 

package/edit/__tests__/management.cattle.io.clusterroletemplatebinding.test.ts

@@ -0,0 +1,58 @@
+/* eslint-disable jest/no-hooks */
+import { mount } from '@vue/test-utils';
+import ClusterRoleTemplateBinding from '@shell/edit/management.cattle.io.clusterroletemplatebinding.vue';
+import Banner from '@components/Banner/Banner.vue';
+import CruResource from '@shell/components/CruResource';
+
+describe('view: management.cattle.io.clusterroletemplatebinding should', () => {
+  let wrapper: any;
+
+  const stubs = {
+    ClusterPermissionsEditor: true,
+    Loading:                  true
+  };
+
+  const requiredSetup = () => ({
+    // Remove all these mocks after migration to Vue 2.7/3 due mixin logic
+    mocks: {
+      $store: {
+        getters: {
+          currentStore:              () => 'current_store',
+          'current_store/schemaFor': jest.fn(),
+          'current_store/all':       jest.fn(),
+          currentCluster:            { id: 'my-cluster' },
+          currentProduct:            { inStore: 'whatever' },
+          'i18n/t':                  (val) => val,
+          'i18n/exists':             jest.fn(),
+        },
+        dispatch: { 'management/findAll': () => ([]) }
+      },
+      $fetchState: { pending: false },
+      $route:      { query: { AS: '' } },
+      $router:     {
+        applyQuery: jest.fn(),
+        replace:    jest.fn()
+      },
+    },
+    propsData: { value: {} },
+    stubs,
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it('should only show one error banner', async() => {
+    const errors = ['mistake!'];
+
+    wrapper = mount(ClusterRoleTemplateBinding, { ...requiredSetup() });
+
+    const cruResourceElem = wrapper.findComponent(CruResource);
+
+    await cruResourceElem.vm.$emit('error', errors);
+
+    const bannerElems = wrapper.findAllComponents(Banner);
+
+    expect(bannerElems).toHaveLength(1);
+  });
+});

package/edit/__tests__/namespace.test.ts

@@ -25,9 +25,10 @@ describe('view Namespace should', () => {
         $router: { applyQuery: {} },
         $store:  {
           getters: {
-            'i18n/t':         jest.fn(),
-            'management/all': () => ([project]),
-            currentProduct:   jest.fn(),
+            'i18n/t':              jest.fn(),
+            'management/all':      () => ([project]),
+            currentProduct:        jest.fn(),
+            isStandaloneHarvester: false
           }
         }
       },
@@ -36,6 +37,7 @@ describe('view Namespace should', () => {
         ContainerResourceLimit: { template: '<div data-testid="limits"></div>' }, // Ensure value to be added to component
         NameNsDescription:      true,
         Tab:                    true,
+        ResourceTabs:           true
       }
     });
 

package/edit/management.cattle.io.clusterroletemplatebinding.vue

@@ -1,7 +1,6 @@
 <script>
 import CreateEditView from '@shell/mixins/create-edit-view';
 import CruResource from '@shell/components/CruResource';
-import Banner from '@components/Banner/Banner.vue';
 import { MANAGEMENT } from '@shell/config/types';
 import Loading from '@shell/components/Loading';
 import ClusterPermissionsEditor from '@shell/components/form/Members/ClusterPermissionsEditor';
@@ -9,7 +8,6 @@ import { exceptionToErrorsArray } from '@shell/utils/error';
 
 export default {
   components: {
-    Banner,
     ClusterPermissionsEditor,
     CruResource,
     Loading,
@@ -64,15 +62,9 @@ export default {
     @finish="saveOverride"
     @cancel="done"
   >
-    <ClusterPermissionsEditor
-      v-model="bindings"
-      :cluster-name="$store.getters['currentCluster'].id"
-    />
-    <Banner
-      v-for="(err, i) in errors"
-      :key="i"
-      color="error"
-      :label="err"
+    <ClusterPermissionsEditor
+      v-model="bindings"
+      :cluster-name="$store.getters['currentCluster'].id"
     />
   </CruResource>
 </template>

package/edit/namespace.vue

@@ -7,8 +7,8 @@ import { MANAGEMENT } from '@shell/config/types';
 import { CONTAINER_DEFAULT_RESOURCE_LIMIT, PROJECT } from '@shell/config/labels-annotations';
 import ContainerResourceLimit from '@shell/components/ContainerResourceLimit';
 import PodSecurityAdmission from '@shell/components/PodSecurityAdmission';
-import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
+import ResourceTabs from '@shell/components/form/ResourceTabs/index.vue';
 import CruResource from '@shell/components/CruResource';
 import { PROJECT_ID, _VIEW, FLAT_VIEW, _CREATE } from '@shell/config/query-params';
 import MoveModal from '@shell/components/MoveModal';
@@ -30,7 +30,7 @@ export default {
     PodSecurityAdmission,
     ResourceQuota,
     Tab,
-    Tabbed,
+    ResourceTabs,
     MoveModal
   },
 
@@ -198,7 +198,11 @@ export default {
         />
       </template>
     </NameNsDescription>
-    <Tabbed :side-tabs="true">
+    <ResourceTabs
+      v-model="value"
+      :mode="mode"
+      :side-tabs="true"
+    >
       <Tab
         v-if="showResourceQuota"
         :weight="1"
@@ -269,7 +273,7 @@ export default {
           @updateLabels="PSAChanged"
         />
       </Tab>
-    </Tabbed>
+    </ResourceTabs>
     <MoveModal v-if="projects" />
   </CruResource>
 </template>