@rancher/shell 3.0.9-rc.5 → 3.0.9

package/list/service.vue

@@ -1,6 +1,6 @@
 <script>
 import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
-import { NODE } from '@shell/config/types';
+import { fetchNodesForServiceTargets } from '@shell/models/service';
 
 export default {
   name:       'ListService',
@@ -27,13 +27,11 @@ export default {
      * of type PagTableFetchSecondaryResources
      */
     async fetchSecondaryResources(opts) {
-      const inStore = this.$store.getters['currentStore']();
-
-      if (this.$store.getters[`${ inStore }/schemaFor`](NODE)) {
-        // fetch nodes before loading this page, as they may be referenced in the Target table column
-        // shell/components/formatter/ServiceTargets.vue --> shell/components/formatter/Endpoints.vue --> Picks the first one that has a model's externalIp
-        await this.$store.dispatch(`${ inStore }/findAll`, { type: NODE });
-      }
+      // Nodes should be fetched because they may be referenced in the target column of a service list item.
+      await fetchNodesForServiceTargets({
+        $store:  this.$store,
+        inStore: this.$store.getters['currentStore']()
+      });
     }
   }
 };

package/machine-config/amazonec2.vue

@@ -24,7 +24,7 @@ export default {
 
   mixins: [CreateEditView],
 
-  emits: ['validationChanged', 'update:hasIpv6'],
+  emits: ['validationChanged', 'update:isIpv6', 'update:isDualStack'],
 
   props: {
     uuid: {
@@ -47,7 +47,12 @@ export default {
       default: false
     },
 
-    hasIpv6: {
+    isIpv6: {
+      type:    Boolean,
+      default: false
+    },
+
+    isDualStack: {
       type:    Boolean,
       default: false
     },
@@ -386,10 +391,12 @@ export default {
           :zone="value.zone"
           :region="value.region"
           :machine-pools="machinePools"
-          :has-ipv6="hasIpv6"
+          :is-ipv6="isIpv6"
+          :is-dual-stack="isDualStack"
           :disabled="disabled"
           :is-new="poolCreateMode"
-          @update:has-ipv6="e=>$emit('update:hasIpv6', e)"
+          @update:is-ipv6="e=>$emit('update:isIpv6', e)"
+          @update:is-dual-stack="e=>$emit('update:isDualStack', e)"
           @validation-changed="e=>$emit('validationChanged',e)"
         />
 

package/machine-config/components/EC2Networking.vue

@@ -9,6 +9,7 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import { Banner } from '@components/Banner';
 import { scrollToBottom } from '@shell/utils/scroll';
 import { _CREATE } from '@shell/config/query-params';
+import { getSubnetDisplayName, getVpcDisplayName, isIpv4Network, isIpv6Network } from '@shell/utils/aws';
 
 export default {
   name: 'Ec2MachinePoolNetworking',
@@ -17,7 +18,7 @@ export default {
     Checkbox, LabeledSelect, LabeledInput, Banner
   },
 
-  emits: ['update:enablePrimaryIpv6', 'update:ipv6AddressCount', 'update:ipv6AddressOnly', 'update:httpProtocolIpv6', 'update:vpcId', 'update:subnetId', 'update:hasIpv6', 'validationChanged'],
+  emits: ['update:enablePrimaryIpv6', 'update:ipv6AddressCount', 'update:ipv6AddressOnly', 'update:httpProtocolIpv6', 'update:vpcId', 'update:subnetId', 'update:isIpv6', 'update:isDualStack', 'validationChanged'],
 
   props: {
     mode: {
@@ -84,7 +85,12 @@ export default {
       default: ''
     },
 
-    hasIpv6: {
+    isIpv6: {
+      type:    Boolean,
+      default: false
+    },
+
+    isDualStack: {
       type:    Boolean,
       default: false
     },
@@ -113,7 +119,7 @@ export default {
       this.enableIpv6 = !!vpcs.find((vpc) => vpc.VpcId === this.vpcId && vpc.Ipv6CidrBlockAssociationSet && !isEmpty(vpc.Ipv6CidrBlockAssociationSet));
     }
 
-    if (this.isNew && this.somePoolHasIpv6OrDual) {
+    if (this.isNew && this.somePoolisIpv6OrDual) {
       this.enableIpv6 = true;
     }
   },
@@ -133,7 +139,7 @@ export default {
       if (this.isNew) {
         this.updateNetwork();
       }
-      this.$emit('update:hasIpv6', neu);
+      this.$emit('update:isDualStack', neu);
 
       if (neu) {
         this.$emit('update:ipv6AddressCount', '1');
@@ -154,7 +160,12 @@ export default {
     },
 
     ipv6AddressOnly(neu) {
-      this.$emit('update:hasIpv6', neu);
+      this.$emit('update:isIpv6', neu);
+      if (neu) {
+        this.$emit('update:isDualStack', false);
+      } else if (this.enableIpv6) {
+        this.$emit('update:isDualStack', true);
+      }
     },
 
     allValid: {
@@ -174,13 +185,13 @@ export default {
       const subnetsByVpc = {};
 
       for ( const obj of this.vpcInfo.Vpcs ) {
-        const name = obj.Tags && obj.Tags?.length ? obj.Tags.find((t) => t.Key === 'Name')?.Value : null;
-        const hasIpv6 = !!obj.Ipv6CidrBlockAssociationSet && !isEmpty(obj.Ipv6CidrBlockAssociationSet);
-        const hasIpv4 = !!obj.CidrBlock;
+        const name = getVpcDisplayName(obj);
+        const hasIpv6 = isIpv6Network(obj);
+        const hasIpv4 = isIpv4Network(obj);
 
         vpcs.push({
-          label:     name || obj.VpcId,
-          subLabel:  name ? obj.VpcId : obj.CidrBlock,
+          label:     name,
+          subLabel:  obj.CidrBlock,
           isDefault: obj.IsDefault || false,
           kind:      'vpc',
           value:     obj.VpcId,
@@ -197,8 +208,8 @@ export default {
           continue;
         }
 
-        const hasIpv6 = !!obj.Ipv6CidrBlockAssociationSet && !isEmpty(obj.Ipv6CidrBlockAssociationSet);
-        const hasIpv4 = !!obj.CidrBlock;
+        const hasIpv6 = isIpv6Network(obj);
+        const hasIpv4 = isIpv4Network(obj);
 
         if (this.enableIpv6 !== hasIpv6) {
           continue;
@@ -211,11 +222,11 @@ export default {
           subnetsByVpc[obj.VpcId] = entry;
         }
 
-        const name = obj.Tags && obj.Tags?.length ? obj.Tags.find((t) => t.Key === 'Name')?.Value : null;
+        const name = getSubnetDisplayName(obj);
 
         entry.push({
-          label:     name || obj.SubnetId,
-          subLabel:  name ? obj.SubnetId : obj.CidrBlock,
+          label:     name,
+          subLabel:  obj.CidrBlock,
           kind:      'subnet',
           isDefault: obj.DefaultForAz || false,
           value:     obj.SubnetId,
@@ -278,18 +289,18 @@ export default {
       return opt && opt.hasIpv6 && !opt.hasIpv4;
     },
 
-    somePoolHasIpv6OrDual() {
-      return !!this.machinePools.find((p) => p.hasIpv6);
+    somePoolisIpv6OrDual() {
+      return !!this.machinePools.find((p) => p.isIpv6 || p.isDualStack);
     },
 
     showIpv6Options() {
-      return this.mode === _CREATE || (this.isNew && this.somePoolHasIpv6OrDual) || this.enableIpv6;
+      return this.mode === _CREATE || (this.isNew && this.somePoolisIpv6OrDual) || this.enableIpv6;
     },
 
     poolsInvalid() {
-      const somePoolHasIpv4 = !!this.machinePools.find((p) => !p.hasIpv6);
+      const somePoolHasIpv4 = !!this.machinePools.find((p) => !p.isIpv6 && !p.isDualStack);
 
-      return this.somePoolHasIpv6OrDual && somePoolHasIpv4;
+      return this.somePoolisIpv6OrDual && somePoolHasIpv4;
     },
 
     addressCountInvalid() {
@@ -398,9 +409,14 @@ export default {
         </template>
       </LabeledSelect>
     </div>
+  </div>
+  <div
+    v-if="enableIpv6"
+    class="row mb-10 ipv6-row"
+  >
     <div
       v-if="enableIpv6"
-      class="col span-3"
+      class="col span-2"
     >
       <Checkbox
         :disabled="!isNew || !dualStackSelected"
@@ -411,17 +427,12 @@ export default {
         @update:value="e=>$emit('update:ipv6AddressOnly', e)"
       />
     </div>
-  </div>
-  <div
-    v-if="enableIpv6"
-    class="row mb-10 ipv6-row"
-  >
-    <div class="col span-6">
+    <div class="col span-4">
       <Checkbox
         :value="httpProtocolIpv6==='enabled'"
         :disabled="!isNew"
         :label="t('cluster.machineConfig.amazonEc2.httpProtocolIpv6.label')"
-        data-testid="amazonEc2__enableIpv6"
+        data-testid="amazonEc2__httpProtocolIpv6"
         :mode="mode"
         @update:value="e=>$emit('update:httpProtocolIpv6', e ? 'enabled' : 'disabled')"
       />
@@ -431,7 +442,7 @@ export default {
     v-if="enableIpv6"
     class="row mb-10 ipv6-row"
   >
-    <div class="col span-3">
+    <div class="col span-6">
       <LabeledInput
         :disabled="!isNew"
         min="1"
@@ -443,7 +454,12 @@ export default {
         @update:value="e=>$emit('update:ipv6AddressCount', e)"
       />
     </div>
-    <div class="col span-9">
+  </div>
+  <div
+    v-if="enableIpv6"
+    class="row mb-10 ipv6-row"
+  >
+    <div class="col span-6">
       <Checkbox
         :disabled="!isNew"
         :value="enablePrimaryIpv6"

package/machine-config/components/__tests__/EC2Networking.test.ts

@@ -82,9 +82,9 @@ describe('component: EC2Networking', () => {
   });
 
   it.each([
-    [[{ hasIpv6: true }, { hasIpv6: false }], true],
-    [[{ hasIpv6: false }, { hasIpv6: false }], false],
-    [[{ hasIpv6: true }, { hasIpv6: true }], false],
+    [[{ isIpv6: true }, { isIpv6: false }], true],
+    [[{ isIpv6: false }, { isIpv6: false }], false],
+    [[{ isIpv6: true }, { isIpv6: true }], false],
   ])('should show an error banner if pools do not either all have ipv6 or all have ipv4', (pools, shouldShowError) => {
     const wrapper = shallowMount(EC2Networking, { ...defaultCreateSetup, propsData: { ...defaultCreateSetup.propsData, machinePools: pools } });
     const ipv6Warning = wrapper.findComponent('[data-testid="amazonEc2__ipv6Warning"]');
@@ -97,7 +97,7 @@ describe('component: EC2Networking', () => {
       ...defaultCreateSetup,
       propsData: {
         ...defaultCreateSetup.propsData,
-        machinePools: [{ hasIpv6: true }],
+        machinePools: [{ isIpv6: true }],
       },
     });
 
@@ -112,7 +112,7 @@ describe('component: EC2Networking', () => {
       ...defaultCreateSetup,
       propsData: {
         ...defaultCreateSetup.propsData,
-        machinePools: [{ hasIpv6: false }],
+        machinePools: [{ isIpv6: false }],
       },
     });
 
@@ -127,7 +127,7 @@ describe('component: EC2Networking', () => {
       ...defaultCreateSetup,
       propsData: {
         ...defaultCreateSetup.propsData,
-        machinePools: [{ hasIpv6: true }, { hasIpv6: false }],
+        machinePools: [{ isIpv6: true }, { isIpv6: false }],
       },
     });
 
@@ -139,7 +139,7 @@ describe('component: EC2Networking', () => {
       ...defaultCreateSetup,
       propsData: {
         ...defaultCreateSetup.propsData,
-        machinePools: [{ hasIpv6: true }, { hasIpv6: true }],
+        machinePools: [{ isIpv6: true }, { isIpv6: true }],
       },
     });
 

package/machine-config/components/__tests__/utils/vpcSubnetMockData.js

@@ -25,10 +25,6 @@ export const vpcInfo = {
         {
           Key:   'displayName',
           Value: 'test'
-        },
-        {
-          Key:   'Name',
-          Value: 'test-eks-vpc-VPC'
         }
       ]
     },
@@ -107,11 +103,6 @@ export const subnetInfo = {
       OwnerId:                     '1234',
       AssignIpv6AddressOnCreation: false,
       Tags:                        [
-        {
-          Key:   'Name',
-          Value: 'aws-controltower-PrivateSubnet2A'
-        },
-
         {
           Key:   'Network',
           Value: 'Private'

package/machine-config/digitalocean.vue

@@ -16,7 +16,7 @@ export default {
 
   mixins: [CreateEditView],
 
-  emits: ['update:hasIpv6'],
+  emits: ['update:isDualStack'],
 
   props: {
     credentialId: {
@@ -29,7 +29,7 @@ export default {
       default: false
     },
 
-    hasIpv6: {
+    isDualStack: {
       type:    Boolean,
       default: false
     },
@@ -119,7 +119,7 @@ export default {
     'value.image': 'updateUsername',
 
     'value.ipv6'(neu) {
-      this.$emit('update:hasIpv6', neu);
+      this.$emit('update:isDualStack', neu);
     }
   },
 

package/models/__tests__/chart.test.ts

@@ -236,12 +236,12 @@ describe('class Chart', () => {
 
       expect(result.footerItems).toHaveLength(3);
 
-      const categoryItem = result.footerItems.find((i) => i.icon === 'icon-category-alt');
+      const categoryItem = result.footerItems.find((i) => i.icon === 'category-alt');
 
       expect(categoryItem).toBeDefined();
       expect(categoryItem?.labels).toContain('database');
 
-      const tagItem = result.footerItems.find((i) => i.icon === 'icon-tag-alt');
+      const tagItem = result.footerItems.find((i) => i.icon === 'tag-alt');
 
       expect(tagItem).toBeDefined();
       expect(tagItem?.labels).toStrictEqual(expect.arrayContaining(['linux', 'experimentl']));

package/models/__tests__/namespace.test.ts

@@ -187,6 +187,17 @@ describe('class Namespace', () => {
   it.todo('should set the resourceQuota as reactive Vue property');
   it.todo('should reset project with cleanForNew');
 
+  describe('hideDetailLocation', () => {
+    it('should not throw when currentProduct is undefined', () => {
+      const namespace = new Namespace({});
+
+      jest.spyOn(namespace, '$rootGetters', 'get').mockReturnValue({ currentProduct: undefined });
+
+      expect(() => namespace.hideDetailLocation).not.toThrow();
+      expect(namespace.hideDetailLocation).toBe(true);
+    });
+  });
+
   describe('glance', () => {
     it('should return projectGlance instead of namespace when namespace is in a project', () => {
       const t = jest.fn((key) => key);

package/models/__tests__/provisioning.cattle.io.cluster.test.ts

@@ -275,4 +275,100 @@ describe('class ProvCluster', () => {
     }
     );
   });
+
+  describe('supportsWindows', () => {
+    const testCases = [
+      {
+        description: 'should return false for k3s',
+        clusterData: { isK3s: true },
+        expected:    false
+      },
+      {
+        description: 'should return false for imported k3s',
+        clusterData: { isImportedK3s: true },
+        expected:    false
+      },
+      {
+        description: 'should return windowsPreferedCluster for rke1',
+        clusterData: { isRke1: true, mgmt: { spec: { windowsPreferedCluster: true } } },
+        expected:    true
+      },
+      {
+        description: 'should return false for rke1 if windowsPreferedCluster is false/missing',
+        clusterData: { isRke1: true, mgmt: { spec: { windowsPreferedCluster: false } } },
+        expected:    false
+      },
+      {
+        description: 'should return false if not rke2 (and not rke1 or k3s)',
+        clusterData: { isRke2: false },
+        expected:    false
+      },
+      {
+        description: 'should return false if kubernetesVersion is missing',
+        clusterData: { isRke2: true, kubernetesVersion: undefined },
+        expected:    false
+      },
+      {
+        description: 'should return false if kubernetesVersion is less than v1.21.0',
+        clusterData: { isRke2: true, kubernetesVersion: 'v1.20.9' },
+        expected:    false
+      },
+      {
+        description: 'should return false if cni is not calico or flannel',
+        clusterData: {
+          isRke2: true, kubernetesVersion: 'v1.34.0', spec: { rkeConfig: { machineGlobalConfig: { cni: 'cilium' } } }
+        },
+        expected: false
+      },
+      {
+        description: 'should return true if cni is calico',
+        clusterData: {
+          isRke2: true, kubernetesVersion: 'v1.34.0', spec: { rkeConfig: { machineGlobalConfig: { cni: 'calico' } } }
+        },
+        expected: true
+      },
+      {
+        description: 'should return false if cni is flannel and kubernetesVersion is less than v1.29.2 (e.g. v1.29.1)',
+        clusterData: {
+          isRke2: true, kubernetesVersion: 'v1.29.1', spec: { rkeConfig: { machineGlobalConfig: { cni: 'flannel' } } }
+        },
+        expected: false
+      },
+      {
+        description: 'should return true if cni is flannel and kubernetesVersion is exactly v1.29.2',
+        clusterData: {
+          isRke2: true, kubernetesVersion: 'v1.29.2', spec: { rkeConfig: { machineGlobalConfig: { cni: 'flannel' } } }
+        },
+        expected: true
+      },
+      {
+        description: 'should return true if cni is flannel and kubernetesVersion is >= v1.29.2 (e.g. v1.35.0)',
+        clusterData: {
+          isRke2: true, kubernetesVersion: 'v1.35.0', spec: { rkeConfig: { machineGlobalConfig: { cni: 'flannel' } } }
+        },
+        expected: true
+      },
+      {
+        description: 'should return true if cni is empty/undefined',
+        clusterData: {
+          isRke2: true, kubernetesVersion: 'v1.34.0', spec: { rkeConfig: { machineGlobalConfig: {} } }
+        },
+        expected: true
+      },
+    ];
+
+    it.each(testCases)('$description', ({ clusterData, expected }) => {
+      const cluster = new ProvCluster({ spec: clusterData.spec });
+
+      jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue(clusterData.mgmt);
+      jest.spyOn(cluster, 'isK3s', 'get').mockReturnValue(clusterData.isK3s || false);
+      jest.spyOn(cluster, 'isImportedK3s', 'get').mockReturnValue(clusterData.isImportedK3s || false);
+      jest.spyOn(cluster, 'isRke1', 'get').mockReturnValue(clusterData.isRke1 || false);
+      jest.spyOn(cluster, 'isRke2', 'get').mockReturnValue(clusterData.isRke2 || false);
+      jest.spyOn(cluster, 'kubernetesVersion', 'get').mockReturnValue(clusterData.kubernetesVersion);
+
+      expect(cluster.supportsWindows).toBe(expected);
+      jest.clearAllMocks();
+    });
+  });
 });

package/models/__tests__/workload.test.ts

@@ -274,6 +274,7 @@ describe('class: Workload', () => {
       expect(card).not.toBeNull();
       expect(card.props.title).toBe('component.resource.detail.card.podsCard.title');
       expect(card.props.showScaling).toBe(true);
+      expect(card.props.noResourcesMessage).toBe('component.resource.detail.card.podsCard.noPods');
     });
 
     it('should return card for DaemonSet type without scaling', () => {
@@ -312,7 +313,7 @@ describe('class: Workload', () => {
       expect(card).toBeNull();
     });
 
-    it('should return null when pods array is empty', () => {
+    it('should return card when pods array is empty (scaled to 0)', () => {
       const workload = new Workload({
         type:     WORKLOAD_TYPES.DEPLOYMENT,
         metadata: { name: 'test', namespace: 'default' },
@@ -324,6 +325,46 @@ describe('class: Workload', () => {
       });
 
       Object.defineProperty(workload, 'pods', { get: () => [] });
+      Object.defineProperty(workload, 'canUpdate', { get: () => true });
+
+      const card = workload.podsCard;
+
+      expect(card).not.toBeNull();
+      expect(card.props.resources).toStrictEqual([]);
+      expect(card.props.noResourcesMessage).toBe('component.resource.detail.card.podsCard.noPods');
+    });
+
+    it('should return null for non-scalable type with empty pods', () => {
+      const workload = new Workload({
+        type:     WORKLOAD_TYPES.DAEMON_SET,
+        metadata: { name: 'test', namespace: 'default' },
+        spec:     {}
+      }, {
+        getters:     { schemaFor: () => ({ linkFor: jest.fn() }) },
+        dispatch:    jest.fn(),
+        rootGetters: { 'i18n/t': (key: string) => key },
+      });
+
+      Object.defineProperty(workload, 'pods', { get: () => [] });
+      Object.defineProperty(workload, 'canUpdate', { get: () => true });
+
+      const card = workload.podsCard;
+
+      expect(card).toBeNull();
+    });
+
+    it('should return null when pods is undefined', () => {
+      const workload = new Workload({
+        type:     WORKLOAD_TYPES.DEPLOYMENT,
+        metadata: { name: 'test', namespace: 'default' },
+        spec:     {}
+      }, {
+        getters:     { schemaFor: () => ({ linkFor: jest.fn() }) },
+        dispatch:    jest.fn(),
+        rootGetters: { 'i18n/t': (key: string) => key },
+      });
+
+      Object.defineProperty(workload, 'pods', { get: () => undefined });
 
       const card = workload.podsCard;
 

package/models/catalog.cattle.io.clusterrepo.js

@@ -1,7 +1,7 @@
 import { parse } from '@shell/utils/url';
 import { CATALOG } from '@shell/config/labels-annotations';
 import { insertAt } from '@shell/utils/array';
-import { CATALOG as CATALOG_TYPE } from '@shell/config/types';
+import { CLUSTER_REPO_APPCO_AUTH_GENERATE_NAME, CATALOG as CATALOG_TYPE } from '@shell/config/types';
 import { colorForState, stateDisplay } from '@shell/plugins/dashboard-store/resource-class';
 
 import SteveModel from '@shell/plugins/steve/steve-class';
@@ -143,14 +143,27 @@ export default class ClusterRepo extends SteveModel {
     return this.metadata?.state?.name === 'active';
   }
 
+  get isSuseAppCollectionFromUI() {
+    return this.metadata?.annotations?.[CATALOG.SUSE_APP_COLLECTION];
+  }
+
+  get isSuseAppCollection() {
+    // Check annotation set by the UI or if the URL points to the SUSE App Collection registry
+    return this.isSuseAppCollectionFromUI || this.spec?.url?.startsWith('oci://dp.apps.rancher.io/charts');
+  }
+
   get typeDisplay() {
+    if (this.isSuseAppCollectionFromUI) {
+      return 'SUSE AppCo';
+    }
     if ( this.spec.gitRepo ) {
       return 'git';
-    } else if ( this.spec.url ) {
+    }
+    if ( this.spec.url ) {
       return this.isOciType ? 'oci' : 'http';
-    } else {
-      return '?';
     }
+
+    return '?';
   }
 
   get nameDisplay() {
@@ -220,4 +233,17 @@ export default class ClusterRepo extends SteveModel {
       });
     }, `catalog operation fetch`, timeout, interval);
   }
+
+  async save() {
+    // Add annotation only if the type is SUSE_APP_COLLECTION
+    if (this.spec.clientSecret?.name?.search(CLUSTER_REPO_APPCO_AUTH_GENERATE_NAME) === 0) {
+      if (!this.metadata.annotations) {
+        this.metadata.annotations = {};
+      }
+      this.metadata.annotations[CATALOG.SUSE_APP_COLLECTION] = 'true';
+    }
+
+    // Call the parent save method
+    return super.save();
+  }
 }

package/models/chart.js

@@ -164,7 +164,7 @@ export default class Chart extends SteveModel {
     const footerItems = [
       {
         type:         REPO,
-        icon:         'icon-repository-alt',
+        icon:         'repository-alt',
         iconTooltip:  { key: 'tableHeaders.repoName' },
         labels:       [this.repoNameDisplay],
         labelTooltip: this.t('catalog.charts.findSimilar.message', { type: this.t('catalog.charts.findSimilar.types.repo') }, true)
@@ -174,7 +174,7 @@ export default class Chart extends SteveModel {
     if (this.categories.length) {
       footerItems.push( {
         type:         CATEGORY,
-        icon:         'icon-category-alt',
+        icon:         'category-alt',
         iconTooltip:  { key: 'generic.category' },
         labels:       this.categories,
         labelTooltip: this.t('catalog.charts.findSimilar.message', { type: this.t('catalog.charts.findSimilar.types.category') }, true)
@@ -184,7 +184,7 @@ export default class Chart extends SteveModel {
     if (this.tags.length) {
       footerItems.push({
         type:         TAG,
-        icon:         'icon-tag-alt',
+        icon:         'tag-alt',
         iconTooltip:  { key: 'generic.tags' },
         labels:       this.tags,
         labelTooltip: this.t('catalog.charts.findSimilar.message', { type: this.t('catalog.charts.findSimilar.types.tag') }, true)