@rancher/shell 2.0.1 → 2.0.2

package/pages/c/_cluster/manager/cloudCredential/index.vue

@@ -9,21 +9,31 @@ import {
   ID_UNLINKED,
   NAME_UNLINKED,
 } from '@shell/config/table-headers';
+import { allHash } from 'utils/promise';
+import { Banner } from '@components/Banner';
 
 export default {
   components: {
     Loading,
     ResourceTable,
     Masthead,
+    Banner
   },
 
   async fetch() {
+    const promises = {};
+
     if (this.$store.getters['management/schemaFor'](SECRET) && !this.$store.getters[`cluster/paginationEnabled`](SECRET)) {
       // Having secrets allows showing the public portion of more types but not all users can see them.
-      await this.$store.dispatch('management/findAll', { type: SECRET });
+      promises.secrets = this.$store.dispatch('management/findAll', { type: SECRET });
     }
+    promises.allCredentials = this.$store.dispatch('rancher/findAll', { type: NORMAN.CLOUD_CREDENTIAL });
+
+    const hash = await allHash(promises);
 
-    this.allCredentials = await this.$store.dispatch('rancher/findAll', { type: NORMAN.CLOUD_CREDENTIAL });
+    this.allCredentials = hash.allCredentials;
+    // This can be optimized in future to to a quick fetch for those with annotation `"provisioning.cattle.io/driver": "harvester"`
+    this.hasHarvester = !!this.allCredentials.find((cc) => !!cc.harvestercredentialConfig);
   },
 
   data() {
@@ -40,7 +50,7 @@ export default {
     },
 
     headers() {
-      return [
+      const headers = [
         ID_UNLINKED,
         NAME_UNLINKED,
         {
@@ -52,8 +62,21 @@ export default {
           formatter: 'CloudCredPublicData',
         },
         DESCRIPTION,
-        AGE_NORMAN,
       ];
+
+      if (this.hasHarvester) {
+        headers.push({
+          name:      'expiresDate',
+          labelKey:  'tableHeaders.expires',
+          value:     'expires',
+          sort:      'expiresForSort',
+          formatter: 'CloudCredExpired',
+        });
+      }
+
+      headers.push(AGE_NORMAN);
+
+      return headers;
     },
 
     createLocation() {
@@ -65,6 +88,29 @@ export default {
         },
       };
     },
+
+    expiredData() {
+      const counts = this.allCredentials.reduce((res, cc) => {
+        const expireData = cc.expireData;
+
+        if (expireData?.expiring) {
+          res.expiring++;
+        }
+        if (expireData?.expired) {
+          res.expired++;
+        }
+
+        return res;
+      }, {
+        expiring: 0,
+        expired:  0
+      });
+
+      return {
+        expiring: counts.expiring ? this.t('manager.cloudCredentials.banners.expiring', { count: counts.expiring }) : '',
+        expired:  counts.expired ? this.t('manager.cloudCredentials.banners.expired', { count: counts.expired }) : '',
+      };
+    }
   },
 
 };
@@ -79,6 +125,18 @@ export default {
       :create-location="createLocation"
       :type-display="t('manager.cloudCredentials.label')"
     />
+    <Banner
+      v-if="expiredData.expiring"
+      data-testid="cert-expiring-banner"
+      color="warning"
+      :label="expiredData.expiring"
+    />
+    <Banner
+      v-if="expiredData.expired"
+      color="error"
+      :label="expiredData.expired"
+    />
+
     <ResourceTable
       :schema="schema"
       :rows="rows"
@@ -92,3 +150,9 @@ export default {
     </ResourceTable>
   </div>
 </template>
+
+<style lang="scss" scoped>
+.banner {
+  margin: 0 0 10px 0
+}
+</style>

package/pages/c/_cluster/manager/jwt.authentication/index.vue

@@ -22,7 +22,7 @@ export default {
   async fetch() {
     const hash = {
       mgmtClusters: this.$fetchType(MANAGEMENT.CLUSTER),
-      proxyConfig:  this.$fetchType(MANAGEMENT.CLUSTER_PROXY_CONFIG)
+      proxyConfig:  this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER_PROXY_CONFIG, opt: { omitExcludeFields: ['metadata.managedFields'] } })
     };
 
     const res = await allHash(hash);
@@ -150,7 +150,11 @@ export default {
 
           const value = config?.enabled || '';
           const configName = config?.metadata?.name || '';
-          const updatedOn = value ? config?.metadata?.creationTimestamp : '';
+          let updatedOn = '';
+
+          if (value) {
+            updatedOn = config?.metadata?.managedFields?.find((field) => field.operation === 'Update')?.time || '';
+          }
           const stateBackground = value ? colorForState(STATES_ENUM.ACTIVE).replace('text', 'bg') : colorForState(STATES_ENUM.INFO).replace('text', 'bg');
           const stateLabel = value ? this.t('jwt.state.enabled') : this.t('jwt.state.disabled');
           const creationTimestamp = cluster.metadata.creationTimestamp;
@@ -159,7 +163,7 @@ export default {
             if (!configName) {
               const clusterProxyConfig = await this.$store.dispatch('management/create', {
                 enabled:  true,
-                metadata: { namespace: id, generateName: 'cluster-proxy-config-' },
+                metadata: { namespace: id, name: 'clusterproxyconfig' },
               });
 
               return clusterProxyConfig.save({ url: 'v1/management.cattle.io.clusterproxyconfigs', method: 'POST' });
@@ -170,7 +174,9 @@ export default {
             }
           };
           const disable = async() => {
-            return config.remove();
+            config.enabled = false;
+
+            return config.save();
           };
 
           rows.push({

package/pages/c/_cluster/settings/performance.vue

@@ -61,7 +61,7 @@ export default {
 
   data() {
     return {
-      uiPerfSetting:              DEFAULT_PERF_SETTING,
+      uiPerfSetting:              null,
       authUserTTL:                null,
       bannerVal:                  {},
       value:                      {},
@@ -161,7 +161,7 @@ export default {
         return;
       }
 
-      // We're enabling a preference. Are there any incomaptible preferences?
+      // We're enabling a preference. Are there any incompatible preferences?
       if ((incompatible[property] || []).every((p) => !this.value[p].enabled)) {
         // No, just set and exit
         this.value[property].enabled = true;

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

@@ -5,6 +5,7 @@ import { Banner } from '@components/Banner';
 import LazyImage from '@shell/components/LazyImage';
 import { MANAGEMENT } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
+import { EXTENSIONS_INCOMPATIBILITY_TYPES, UI_PLUGIN_HOST_APP } from '@shell/config/uiplugins';
 
 export default {
   async fetch() {
@@ -65,10 +66,9 @@ export default {
     async loadPluginVersionInfo(version) {
       const versionName = version || this.info.displayVersion;
 
-      const isVersionNotCompatibleWithUi = this.info.versions?.find((v) => v.version === versionName && !v.isCompatibleWithUi);
-      const isVersionNotCompatibleWithKubeVersion = this.info.versions?.find((v) => v.version === versionName && !v.isCompatibleWithKubeVersion);
+      const isVersionNotCompatible = this.info.versions?.find((v) => v.version === versionName && !v.isVersionCompatible);
 
-      if (!this.info.chart || isVersionNotCompatibleWithUi || isVersionNotCompatibleWithKubeVersion) {
+      if (!this.info.chart || isVersionNotCompatible) {
         return;
       }
 
@@ -107,18 +107,15 @@ export default {
     },
 
     handleVersionBtnTooltip(version) {
-      if (version.requiredUiVersion) {
-        return this.t('plugins.info.requiresRancherVersion', { version: version.requiredUiVersion });
-      }
-      if (version.requiredKubeVersion) {
-        return this.t('plugins.info.requiresKubeVersion', { version: version.requiredKubeVersion });
+      if (!version.isVersionCompatible && Object.keys(version.versionIncompatibilityData).length) {
+        return this.t(version.versionIncompatibilityData?.tooltipKey, { required: version.versionIncompatibilityData?.type === EXTENSIONS_INCOMPATIBILITY_TYPES.HOST ? UI_PLUGIN_HOST_APP : version.versionIncompatibilityData?.required });
       }
 
       return '';
     },
 
     handleVersionBtnClass(version) {
-      return { 'version-active': version.version === this.infoVersion, disabled: !version.isCompatibleWithUi || !version.isCompatibleWithKubeVersion };
+      return { 'version-active': version.version === this.infoVersion, disabled: !version.isVersionCompatible };
     }
   }
 };
@@ -219,7 +216,7 @@ export default {
         <div class="plugin-versions mb-10">
           <div
             v-for="v in info.versions"
-            :key="v.version"
+            :key="`${v.name}-${v.version}`"
           >
             <a
               v-clean-tooltip="handleVersionBtnTooltip(v)"

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

@@ -31,12 +31,13 @@ import {
   uiPluginAnnotation,
   uiPluginHasAnnotation,
   isSupportedChartVersion,
-  isChartVersionAvailableForInstall,
   isChartVersionHigher,
   UI_PLUGIN_NAMESPACE,
   UI_PLUGIN_CHART_ANNOTATIONS,
   UI_PLUGINS_REPO_URL,
-  UI_PLUGINS_PARTNERS_REPO_URL
+  UI_PLUGINS_PARTNERS_REPO_URL,
+  UI_PLUGIN_HOST_APP,
+  EXTENSIONS_INCOMPATIBILITY_TYPES
 } from '@shell/config/uiplugins';
 import TabTitle from '@shell/components/TabTitle';
 
@@ -152,7 +153,8 @@ export default {
     },
 
     showAddReposBanner() {
-      const hasExtensionReposBannerSetting = this.addExtensionReposBannerSetting?.value === 'true';
+      // because of https://github.com/rancher/rancher/pull/45894 we need to consider other start values
+      const hasExtensionReposBannerSetting = this.addExtensionReposBannerSetting?.value === 'true' || this.addExtensionReposBannerSetting?.value === '' || this.addExtensionReposBannerSetting?.value === undefined;
       const uiPluginsRepoNotFound = isRancherPrime() && !this.repos?.find((r) => r.urlDisplay === UI_PLUGINS_REPO_URL);
       const uiPluginsPartnersRepoNotFound = !this.repos?.find((r) => r.urlDisplay === UI_PLUGINS_PARTNERS_REPO_URL);
 
@@ -258,19 +260,20 @@ export default {
 
         item.versions = [...chart.versions];
         item.chart = chart;
+        item.incompatibilityMessage = '';
 
         // Filter the versions available to install (plugins-api version and current dashboard version)
-        item.installableVersions = item.versions.filter((version) => isSupportedChartVersion({ version, kubeVersion: this.kubeVersion }) && isChartVersionAvailableForInstall({
+        item.installableVersions = item.versions.filter((version) => isSupportedChartVersion({
           version, rancherVersion: this.rancherVersion, kubeVersion: this.kubeVersion
         }));
 
         // add prop to version object if version is compatible with the current dashboard version
-        item.versions = item.versions.map((version) => isChartVersionAvailableForInstall({
+        item.versions = item.versions.map((version) => isSupportedChartVersion({
           version, rancherVersion: this.rancherVersion, kubeVersion: this.kubeVersion
         }, true));
 
         const latestCompatible = item.installableVersions?.[0];
-        const latestNotCompatible = item.versions.find((version) => !version.isCompatibleWithUi || !version.isCompatibleWithKubeVersion);
+        const latestNotCompatible = item.versions.find((version) => !version.isVersionCompatible);
 
         if (latestCompatible) {
           item.displayVersion = latestCompatible.version;
@@ -280,11 +283,20 @@ export default {
           item.icon = chart.icon || latestCompatible?.annotations?.['catalog.cattle.io/ui-icon'];
         }
 
+        // add message of extension card if there's a newer version of the extension, but it's not available to be installed
         if (latestNotCompatible && item.installableVersions.length && isChartVersionHigher(latestNotCompatible.version, item.installableVersions?.[0].version)) {
-          if (!item.isCompatibleWithUi) {
-            item.incompatibleRancherVersion = this.t('plugins.incompatibleRancherVersion', { version: latestNotCompatible.version, rancherVersion: latestNotCompatible.requiredUiVersion }, true);
-          } else if (!item.isCompatibleWithKubeVersion) {
-            item.incompatibleKubeVersion = this.t('plugins.incompatibleKubeVersion', { version: latestNotCompatible.version, kubeVersion: latestNotCompatible.requiredKubeVersion }, true);
+          switch (latestNotCompatible.versionIncompatibilityData?.type) {
+          case EXTENSIONS_INCOMPATIBILITY_TYPES.HOST:
+            item.incompatibilityMessage = this.t(latestNotCompatible.versionIncompatibilityData?.cardMessageKey, {
+              version: latestNotCompatible.version, required: latestNotCompatible.versionIncompatibilityData?.required, mainHost: UI_PLUGIN_HOST_APP
+            }, true);
+            break;
+          default:
+            item.incompatibilityMessage = this.t(latestNotCompatible.versionIncompatibilityData?.cardMessageKey, {
+              version:  latestNotCompatible.version,
+              required: latestNotCompatible.versionIncompatibilityData?.required
+            }, true);
+            break;
           }
         }
 
@@ -398,8 +410,9 @@ export default {
 
           if (versionInstalledData) {
             const kubeVersionToCheck = versionInstalledData.annotations?.[UI_PLUGIN_CHART_ANNOTATIONS.KUBE_VERSION];
+            const versionSupportedData = isSupportedChartVersion({ version: versionInstalledData, kubeVersion: this.kubeVersion });
 
-            if (this.kubeVersion && !isSupportedChartVersion({ version: versionInstalledData, kubeVersion: this.kubeVersion })) {
+            if (this.kubeVersion && !versionSupportedData.isVersionCompatible && versionSupportedData.versionIncompatibilityData?.type === EXTENSIONS_INCOMPATIBILITY_TYPES.KUBE) {
               plugin.installedError = this.t('plugins.currentInstalledVersionBlockedByKubeVersion', { kubeVersion: this.kubeVersion, kubeVersionToCheck }, true);
             }
           }
@@ -611,7 +624,8 @@ export default {
     },
 
     updateAddReposSetting() {
-      if (this.addExtensionReposBannerSetting?.value === 'true') {
+      // because of https://github.com/rancher/rancher/pull/45894 we need to consider other start values
+      if (this.addExtensionReposBannerSetting?.value === 'true' || this.addExtensionReposBannerSetting?.value === '' || this.addExtensionReposBannerSetting?.value === undefined) {
         this.addExtensionReposBannerSetting.value = 'false';
         this.addExtensionReposBannerSetting.save();
       }
@@ -848,13 +862,9 @@ export default {
                         <span>{{ plugin.installedError }}</span>
                       </p>
                       <p
-                        v-else-if="plugin.incompatibleRancherVersion"
+                        v-else-if="plugin.incompatibilityMessage"
                         class="incompatible"
-                      >{{ plugin.incompatibleRancherVersion }}</p>
-                      <p
-                        v-else-if="plugin.incompatibleKubeVersion"
-                        class="incompatible"
-                      >{{ plugin.incompatibleKubeVersion }}</p>
+                      >{{ plugin.incompatibilityMessage }}</p>
                     </span>
                   </div>
                   <!-- plugin badges -->

package/pages/home.vue

@@ -91,10 +91,6 @@ export default {
     ...mapGetters(['currentCluster', 'defaultClusterId', 'releaseNotesUrl']),
     mcm: mapFeature(MULTI_CLUSTER),
 
-    mgmtClusters() {
-      return this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
-    },
-
     provClusters() {
       return this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER);
     },
@@ -211,15 +207,7 @@ export default {
     },
 
     kubeClusters() {
-      const filteredClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(this.provClusters || [], this.$store), this.$store);
-
-      return filteredClusters.map((provCluster) => {
-        const mgmtCluster = this.mgmtClusters?.find((c) => provCluster.mgmt?.id === c.id);
-
-        provCluster.description = provCluster.description || mgmtCluster?.description;
-
-        return provCluster;
-      });
+      return filterHiddenLocalCluster(filterOnlyKubernetesClusters(this.provClusters || [], this.$store), this.$store);
     }
   },
 
@@ -385,6 +373,7 @@ export default {
                 :rows="kubeClusters"
                 :headers="clusterHeaders"
                 :loading="!kubeClusters"
+                :paging="true"
               >
                 <template #header-left>
                   <div class="row table-heading">

package/plugins/dashboard-store/actions.js

@@ -419,7 +419,7 @@ export default {
         },
         result: {
           count:     out.count,
-          pages:     out.pages,
+          pages:     out.pages || Math.ceil(out.count / (opt.pagination.pageSize || Number.MAX_SAFE_INTEGER)),
           timestamp: new Date().getTime()
         }
       } : undefined,

package/plugins/dashboard-store/getters.js

@@ -429,7 +429,7 @@ export default {
       };
     }
 
-    const namespaces = _typeObj?.namespaced ? Object.keys(rootGetters.activeNamespaceCache || {}) : [];
+    const namespaces = _typeObj?.namespaced && !rootGetters.isAllNamespaces ? Object.keys(rootGetters.activeNamespaceCache || {}) : [];
 
     return matchingCounts(_typeObj, namespaces.length ? namespaces : null);
   },

package/plugins/steve/__tests__/getters.test.ts

@@ -109,13 +109,13 @@ describe('steve: getters:', () => {
     it('returns a string with a labelSelector and filter, and formatted for steve if the url starts with "/v1"', () => {
       expect(urlOptionsGetter('/v1/foo', { labelSelector: 'a=b', filter: { bar: 'baz', far: 'faz' } })).toBe('/v1/foo?labelSelector=a=b&filter=bar=baz&far=faz&exclude=metadata.managedFields');
     });
-    it('returns a string with an exclude statement for "bar" and "metadata.managedFields" if excludeFields is a single element array with the string "bar" and the url starts with "/v1/"', () => {
-      expect(urlOptionsGetter('/v1/foo', { excludeFields: ['bar'] })).toBe('/v1/foo?exclude=bar&exclude=metadata.managedFields');
+    it('returns a string with an exclude statement for "bar" if excludeFields is a single element array with the string "bar" and the url starts with "/v1/"', () => {
+      expect(urlOptionsGetter('/v1/foo', { excludeFields: ['bar'] })).toBe('/v1/foo?exclude=bar');
     });
-    it('returns a string without an exclude statement if excludeFields is but the url does not start with "/v1/"', () => {
-      expect(urlOptionsGetter('foo', { excludeFields: ['bar'] })).toBe('foo');
+    it('returns a string without an exclude statement for "managedFields" if omitExcludeFields includes it and the url starts with "/v1/"', () => {
+      expect(urlOptionsGetter('/v1/foo', { omitExcludeFields: ['metadata.managedFields'] })).toBe('/v1/foo?');
     });
-    it('returns a string without an exclude statement if excludeFields is an array but the URL doesn\'t include the "/v1/ string"', () => {
+    it('returns a string without an exclude statement if excludeFields is set but the url does not start with "/v1/"', () => {
       expect(urlOptionsGetter('foo', { excludeFields: ['bar'] })).toBe('foo');
     });
     it('returns a string with a limit applied if a limit is provided', () => {

package/plugins/steve/getters.js

@@ -119,11 +119,13 @@ export default {
     // excludeFields should be an array of strings representing the paths of the fields to exclude
     // only works on Steve but is ignored without error by Norman
     if (isSteve) {
-      if (Array.isArray(opt?.excludeFields)) {
-        opt.excludeFields = [...opt.excludeFields, 'metadata.managedFields'];
-      } else {
-        opt.excludeFields = ['metadata.managedFields'];
+      if (!Array.isArray(opt?.excludeFields)) {
+        const excludeFields = ['metadata.managedFields'];
+
+        // for some resources, we might want to include fields, excluded by default.
+        opt.excludeFields = Array.isArray(opt?.omitExcludeFields) ? excludeFields.filter((f) => !f.includes(opt.omitExcludeFields)) : excludeFields;
       }
+
       const excludeParamsString = opt.excludeFields.map((field) => `exclude=${ field }`).join('&');
 
       url += `${ url.includes('?') ? '&' : '?' }${ excludeParamsString }`;

package/plugins/steve/hybrid-class.js

@@ -1,4 +1,4 @@
-import { ANNOTATIONS_TO_IGNORE_REGEX, LABELS_TO_IGNORE_REGEX, DESCRIPTION } from '@shell/config/labels-annotations';
+import { ANNOTATIONS_TO_IGNORE_REGEX, LABELS_TO_IGNORE_REGEX } from '@shell/config/labels-annotations';
 import omitBy from 'lodash/omitBy';
 import pickBy from 'lodash/pickBy';
 import Vue from 'vue';
@@ -100,8 +100,4 @@ export default class HybridModel extends Resource {
   get state() {
     return this.stateObj?.name || 'unknown';
   }
-
-  get description() {
-    return this.metadata?.annotations?.[DESCRIPTION] || this.spec?.description || this._description;
-  }
 }

package/scripts/extension/bundle

@@ -43,7 +43,7 @@ for d in ${BASE_DIR}/dist-pkg/*; do
   mkdir plugin && mv ./${pkg}/* ./plugin
   rm -rf ./${pkg}/* && mv ./plugin ./${pkg}
 
-  find ${pkg} -type f -printf '%P\n' | sort > ./${pkg}/files.txt
+  find ${pkg} -type f | sed "s|^${pkg}/||" | sort > ./${pkg}/files.txt
   popd > /dev/null
 
   cp -R ${BASE_DIR}/dist-pkg/${pkg} ${TMP}/container/plugin

package/scripts/extension/helm/charts/ui-plugin-server/Chart.yaml

@@ -1,6 +1,6 @@
 annotations:
   catalog.cattle.io/certified: rancher # Any application we are adding as a helm chart
-  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.29.0-0'
+  catalog.cattle.io/kube-version: '>= 1.16.0-0'
   catalog.cattle.io/namespace: cattle-ui-plugin-system # Must prefix with cattle- and suffix with -system=
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux, windows

package/scripts/publish-shell.sh

@@ -1,15 +1,19 @@
 #!/usr/bin/env bash
 
+set -eo pipefail
+
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-BASE_DIR="$(
-  cd $SCRIPT_DIR && cd ../.. &
-  pwd
-)"
+BASE_DIR="$(cd $SCRIPT_DIR && cd ../.. && pwd)"
 SHELL_DIR=$BASE_DIR/shell/
-TMP_DIR=$BASE_DIR/tmp
-PUBLISH_ARGS="--no-git-tag-version --access public $PUBLISH_ARGS"
+CREATORS_DIR=$BASE_DIR/creators/extension
 FORCE_PUBLISH_TO_NPM="false"
-DEFAULT_YARN_REGISTRY="https://registry.npmjs.org"
+DEFAULT_NPM_REGISTRY="https://registry.npmjs.org"
+
+# if TAG doesn't exist, we can exit as it's needed for any type of publish.
+if [ -z "$TAG" ]; then
+  echo "You need to set the TAG variable first!"
+  exit 1
+fi
 
 if [ ! -d "${BASE_DIR}/node_modules" ]; then
   echo "You need to run 'yarn install' first"
@@ -23,44 +27,25 @@ if [ "$1" == "--npm" ]; then
 fi
 
 if [ "$FORCE_PUBLISH_TO_NPM" == "true" ]; then
-  export YARN_REGISTRY=$DEFAULT_YARN_REGISTRY
+  export NPM_REGISTRY=$DEFAULT_NPM_REGISTRY
 fi
 
-# We use the version from the shell package for the creator packages
-# Need to copy them to a temporary location, so we can patch the version number
-# before publishing
-
-# To set a token for NPM registry auth: `npm config set //registry.npmjs.org/:_authToken <TOKEN>``
-
-PKG_DIST=$BASE_DIR/dist-pkg/creators
-mkdir -p ${PKG_DIST}
-rm -rf ${PKG_DIST}/app
-rm -rf ${PKG_DIST}/pkg
-rm -rf ${PKG_DIST}/update
+PUBLISH_ARGS="--no-git-tag-version --access public --registry $NPM_REGISTRY"
 
 pushd ${SHELL_DIR} >/dev/null
 
-PKG_VERSION=$(node -p "require('./package.json').version")
-popd >/dev/null
-
-echo "Publishing version: $PKG_VERSION"
-
-cp -R ${SHELL_DIR}/creators/app ${PKG_DIST}
-cp -R ${SHELL_DIR}/creators/pkg ${PKG_DIST}
-cp -R ${SHELL_DIR}/creators/update ${PKG_DIST}
-
-sed -i.bak -e "s/\"0.0.0/"\"$PKG_VERSION"/g" ${PKG_DIST}/app/package.json
-sed -i.bak -e "s/\"0.0.0/"\"$PKG_VERSION"/g" ${PKG_DIST}/pkg/package.json
-sed -i.bak -e "s/\"0.0.0/"\"$PKG_VERSION"/g" ${PKG_DIST}/update/package.json
-
-rm ${PKG_DIST}/app/package.json.bak
-rm ${PKG_DIST}/pkg/package.json.bak
-rm ${PKG_DIST}/update/package.json.bak
-
 function publish() {
   NAME=$1
   FOLDER=$2
 
+  # if we pass a third arg, that is the version number
+  # that we want to actually publish on NPM
+  # they should match with the package.json version stated 
+  # because of the check in the "Check Tags Version Matching" step in the workflow
+  if [ -n "$3" ]; then
+    PKG_VERSION=$3
+  fi
+
   echo "Publishing ${NAME} from ${FOLDER}"
   pushd ${FOLDER} >/dev/null
 
@@ -71,25 +56,20 @@ function publish() {
     cp -R ${BASE_DIR}/pkg/rancher-components/src/components ./rancher-components/
   fi
 
-  if [ "$NAME" == "Update" ]; then
-    # Add files from the app and pkg creators to the update package
-    mkdir -p ./app
-    mkdir -p ./pkg
-    cp -R ${BASE_DIR}/shell/creators/app/* ./app
-    cp -R ${BASE_DIR}/shell/creators/pkg/* ./pkg
-    # Remove index.ts from pkg files, as we don't want to replace that
-    rm -f ./pkg/files/index.ts
-
-    # Update the package.json for the app
-    cd app
-    node ${SCRIPT_DIR}/record-deps.js
-    cd ..
+  # if the PKG_VERSION has a - it means it will be a pre-release of legacy-v2
+  if [[ $PKG_VERSION == *"-"* ]]; then
+    PUBLISH_ARGS="$PUBLISH_ARGS --tag legacy-v2-pre-release"
+  else
+    # If we need to release shell, we tag it as legacy-v2
+    PUBLISH_ARGS="$PUBLISH_ARGS --tag legacy-v2"
   fi
 
   # Make a note of dependency versions, if required
   node ${SCRIPT_DIR}/record-deps.js
 
-  yarn publish . --new-version ${PKG_VERSION} ${PUBLISH_ARGS}
+  echo "Publishing to registry: $NPM_REGISTRY with args: $PUBLISH_ARGS"
+
+  npm publish ${PUBLISH_ARGS}
   RET=$?
 
   popd >/dev/null
@@ -100,15 +80,32 @@ function publish() {
   fi
 }
 
-# Generate the type definitions for the shell
-${SCRIPT_DIR}/typegen.sh
-
-# Publish the packages - don't tag the git repo and don't auto-increment the version number
-publish "Shell" ${SHELL_DIR}
-publish "Application creator" ${PKG_DIST}/app/
-publish "Package creator" ${PKG_DIST}/pkg/
-publish "Update" ${PKG_DIST}/update/
+echo "TAG ${TAG}"
+  
+  # let's get the package name and version from the tag
+PKG_NAME=$(sed 's/-pkg-v.*//' <<< "$TAG")
+PKG_V=$(sed 's/.*-pkg-v//'<<< "$TAG")
 
-echo "Done"
+echo "PKG_NAME ${PKG_NAME}"
+echo "PKG_V ${PKG_V}"
 
+# Generate the type definitions for the shell
+if [ ${PKG_NAME} == "shell" ]; then
+  ${SCRIPT_DIR}/typegen.sh
+fi
 
+# version comparison checks
+case $PKG_NAME in
+  "shell")
+    echo "Publishing only Shell pkg via tagged release"
+    publish "Shell" ${SHELL_DIR} ${PKG_V}
+    ;;
+  "creators")
+    echo "Publishing only Creators pkg via tagged release"
+    publish "Extension creator" ${CREATORS_DIR} ${PKG_V}
+    ;;
+  *)
+    echo "something went wrong with the tagging name => TAG: ${TAG} , PKG_NAME: ${PKG_NAME}. Admissable names are 'shell' and 'creator'"
+    exit 1
+    ;;
+esac