@rancher/shell 0.3.24 → 0.3.25

package/models/management.cattle.io.cluster.js

@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import { CATALOG, CLUSTER_BADGE } from '@shell/config/labels-annotations';
 import { NODE, FLEET, MANAGEMENT, CAPI } from '@shell/config/types';
-import { insertAt } from '@shell/utils/array';
+import { insertAt, addObject, removeObject } from '@shell/utils/array';
 import { downloadFile } from '@shell/utils/download';
 import { parseSi } from '@shell/utils/units';
 import { parseColor, textColor } from '@shell/utils/color';
@@ -14,6 +14,7 @@ import { isHarvesterCluster } from '@shell/utils/cluster';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 import { LINUX, WINDOWS } from '@shell/store/catalog';
 import { KONTAINER_TO_DRIVER } from './management.cattle.io.kontainerdriver';
+import { PINNED_CLUSTERS } from '@shell/store/prefs';
 
 // See translation file cluster.providers for list of providers
 // If the logo is not named with the provider name, add an override here
@@ -455,4 +456,24 @@ export default class MgmtCluster extends HybridModel {
 
     return findRelationship(verb === 'to' ? 'from' : 'to', CAPI.RANCHER_CLUSTER, this.metadata?.relationships);
   }
+
+  get pinned() {
+    return this.$rootGetters['prefs/get'](PINNED_CLUSTERS).includes(this.id);
+  }
+
+  pin() {
+    const types = this.$rootGetters['prefs/get'](PINNED_CLUSTERS) || [];
+
+    addObject(types, this.id);
+
+    this.$dispatch('prefs/set', { key: PINNED_CLUSTERS, value: types }, { root: true });
+  }
+
+  unpin() {
+    const types = this.$rootGetters['prefs/get'](PINNED_CLUSTERS) || [];
+
+    removeObject(types, this.id);
+
+    this.$dispatch('prefs/set', { key: PINNED_CLUSTERS, value: types }, { root: true });
+  }
 }

package/models/management.cattle.io.clusterroletemplatebinding.js

@@ -43,7 +43,7 @@ export default class CRTB extends HybridModel {
 
   get principalId() {
     // We've either set it ourselves or it's comes from native properties
-    return this.principalName || this.userPrincipalName || this.groupPrincipalName;
+    return this.principalName || this.userPrincipalName || this.groupPrincipalName || '';
   }
 
   get nameDisplay() {
@@ -117,12 +117,12 @@ export default class CRTB extends HybridModel {
   get norman() {
     return (async() => {
       const principal = await this.principal;
-      const principalProperty = principal.principalType === 'group' ? 'groupPrincipalId' : 'userPrincipalId';
+      const principalProperty = principal?.principalType === 'group' ? 'groupPrincipalId' : 'userPrincipalId';
 
       return this.$dispatch(`rancher/create`, {
         type:                NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING,
         roleTemplateId:      this.roleTemplateName,
-        [principalProperty]: principal.id,
+        [principalProperty]: principal?.id,
         clusterId:           this.clusterName,
         id:                  this.id?.replace('/', ':')
       }, { root: true });

package/models/management.cattle.io.globalrole.js

@@ -4,7 +4,6 @@ import { CATTLE_API_GROUP, SUBTYPE_MAPPING, CREATE_VERBS } from '@shell/models/m
 import { uniq } from '@shell/utils/array';
 import { get } from '@shell/utils/object';
 import SteveDescriptionModel from '@shell/plugins/steve/steve-description-class';
-import Role from './rbac.authorization.k8s.io.role';
 import { AS, MODE, _CLONE, _UNFLAG } from '@shell/config/query-params';
 
 const BASE = 'user-base';
@@ -16,7 +15,14 @@ const GLOBAL = SUBTYPE_MAPPING.GLOBAL.key;
 
 export default class GlobalRole extends SteveDescriptionModel {
   get customValidationRules() {
-    return Role.customValidationRules();
+    return [
+      {
+        path:       'rules',
+        validators: [`roleTemplateRules:${ this.type }`],
+        nullable:   false,
+        type:       'array',
+      },
+    ];
   }
 
   get details() {
@@ -137,6 +143,15 @@ export default class GlobalRole extends SteveDescriptionModel {
   async save() {
     const norman = await this.norman;
 
+    for (const rule of norman.rules) {
+      if (rule.nonResourceURLs.length) {
+        delete rule.resources;
+        delete rule.apiGroups;
+      } else {
+        delete rule.nonResourceURLs;
+      }
+    }
+
     return norman.save();
   }
 

package/models/management.cattle.io.node.js

@@ -125,11 +125,14 @@ export default class MgmtNode extends HybridModel {
     return false;
   }
 
+  get addresses() {
+    return this.status?.addresses || this.status?.internalNodeStatus?.addresses || [];
+  }
+
   get internalIp() {
     // This shows in the IP address column for RKE1 nodes in the
     // list of nodes in the cluster detail page of Cluster Management.
-
-    const internal = this.status?.addresses?.find(({ type }) => {
+    const internal = this.addresses.find(({ type }) => {
       return type === ADDRESSES.INTERNAL_IP;
     });
 
@@ -147,8 +150,7 @@ export default class MgmtNode extends HybridModel {
   }
 
   get externalIp() {
-    const addresses = this.status?.addresses || [];
-    const statusAddress = findLast(addresses, (address) => address.type === 'ExternalIP')?.address;
+    const statusAddress = findLast(this.addresses, (address) => address.type === 'ExternalIP')?.address;
 
     if (statusAddress) {
       return statusAddress;

package/models/management.cattle.io.projectroletemplatebinding.js

@@ -31,7 +31,7 @@ export default class PRTB extends HybridModel {
 
   get principalId() {
     // We've either set it ourselves or it's comes from native properties
-    return this.principalName || this.userPrincipalName || this.groupPrincipalName;
+    return this.principalName || this.userPrincipalName || this.groupPrincipalName || '';
   }
 
   get nameDisplay() {
@@ -123,12 +123,12 @@ export default class PRTB extends HybridModel {
   get norman() {
     return (async() => {
       const principal = await this.principal;
-      const principalProperty = principal.principalType === 'group' ? 'groupPrincipalId' : 'userPrincipalId';
+      const principalProperty = principal?.principalType === 'group' ? 'groupPrincipalId' : 'userPrincipalId';
 
       return this.$dispatch(`rancher/create`, {
         type:                  NORMAN.PROJECT_ROLE_TEMPLATE_BINDING,
         roleTemplateId:        this.roleTemplateName,
-        [principalProperty]:   principal.id,
+        [principalProperty]:   principal?.id,
         projectId:             this.projectName,
         projectRoleTemplateId: '',
         id:                    this.id?.replace('/', ':')

package/models/management.cattle.io.roletemplate.js

@@ -3,7 +3,6 @@ import { get } from '@shell/utils/object';
 import { DESCRIPTION } from '@shell/config/labels-annotations';
 import { NORMAN } from '@shell/config/types';
 import SteveDescriptionModel from '@shell/plugins/steve/steve-description-class';
-import Role from './rbac.authorization.k8s.io.role';
 import { AS, MODE, _CLONE, _UNFLAG } from '@shell/config/query-params';
 
 export const CATTLE_API_GROUP = '.cattle.io';
@@ -60,7 +59,14 @@ export const CREATE_VERBS = new Set(['PUT', 'blocked-PUT']);
 
 export default class RoleTemplate extends SteveDescriptionModel {
   get customValidationRules() {
-    return Role.customValidationRules();
+    return [
+      {
+        path:       'rules',
+        validators: [`roleTemplateRules:${ this.type }`],
+        nullable:   false,
+        type:       'array',
+      },
+    ];
   }
 
   get details() {
@@ -185,6 +191,15 @@ export default class RoleTemplate extends SteveDescriptionModel {
   async save() {
     const norman = await this.norman;
 
+    for (const rule of norman.rules) {
+      if (rule.nonResourceURLs.length) {
+        delete rule.resources;
+        delete rule.apiGroups;
+      } else {
+        delete rule.nonResourceURLs;
+      }
+    }
+
     return norman.save();
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.3.24",
+  "version": "0.3.25",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -17,7 +17,6 @@
     "lint": "./node_modules/.bin/eslint --max-warnings 0 --ext .ts,.js,.vue .",
     "test": "./node_modules/.bin/nyc ava --serial --verbose",
     "dev": "./node_modules/.bin/vue-cli-service dev",
-    "docker-dev": "docker run --rm --name dashboard-dev -p 8005:8005 -e API=$API -v $(pwd):/src -v dashboard_node:/src/node_modules rancher/dashboard:dev",
     "build": "./node_modules/.bin/vue-cli-service build",
     "analyze": "./node_modules/.bin/vue-cli-service build --report",
     "start": "./node_modules/.bin/vue-cli-service start",
@@ -38,7 +37,7 @@
     "@novnc/novnc": "1.2.0",
     "@nuxt/types": "2.14.6",
     "@nuxt/typescript-build": "2.1.0",
-    "@nuxtjs/axios": "5.12.0",
+    "@nuxtjs/axios": "5.13.6",
     "@nuxtjs/eslint-config-typescript": "6.0.1",
     "@nuxtjs/webpack-profile": "0.1.0",
     "@popperjs/core": "2.4.4",
@@ -107,9 +106,6 @@
     "papaparse": "5.3.0",
     "portal-vue": "2.1.7",
     "rancher-icons": "rancher/icons#v2.0.16",
-    "require-extension-hooks": "0.3.3",
-    "require-extension-hooks-babel": "1.0.0",
-    "require-extension-hooks-vue": "3.0.0",
     "sass": "1.51.0",
     "sass-loader": "10.2.1",
     "serve-static": "1.14.1",

package/pages/about.vue

@@ -101,6 +101,7 @@ export default {
       <n-link
         :to="{ name: 'diagnostic' }"
         class="btn role-primary"
+        data-testid="about__diagnostics_button"
       >
         {{ t('about.diagnostic.title') }}
       </n-link>
@@ -195,6 +196,7 @@ export default {
           <td>
             <a
               v-if="d.imageList"
+              :data-testid="`image_list_download_link__${d.label}`"
               @click="d.imageList"
             >
               {{ t('asyncButton.download.action') }}

package/pages/auth/setup.vue

@@ -17,6 +17,7 @@ import { exceptionToErrorsArray } from '@shell/utils/error';
 import Password from '@shell/components/form/Password';
 import { applyProducts } from '@shell/store/type-map';
 import BrandImage from '@shell/components/BrandImage';
+import { waitFor } from '@shell/utils/async';
 
 const calcIsFirstLogin = (store) => {
   const firstLoginSetting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.FIRST_LOGIN);
@@ -250,10 +251,10 @@ export default {
 
         await Promise.all(promises);
 
-        setTimeout(() => {
-          buttonCb(true);
-          this.done();
-        }, 2000);
+        await waitFor(() => !calcIsFirstLogin(this.$store), 'first login to be completed', 10000, 1000, true);
+
+        buttonCb(true);
+        this.done();
       } catch (err) {
         console.error(err) ; // eslint-disable-line no-console
         buttonCb(false);

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

@@ -94,12 +94,11 @@ export default {
   methods: {
     async fetchDeps() {
       const { $store, externalLinks } = this;
-      const currentCluster = this.$store.getters['currentCluster'];
 
       this.v1Installed = await haveV1MonitoringWorkloads($store);
       const hash = await allHash({
+        apps:      $store.dispatch('cluster/findAll', { type: CATALOG.APP }),
         endpoints: $store.dispatch('cluster/findAll', { type: ENDPOINTS }),
-        app:       $store.dispatch(`cluster/find`, { type: CATALOG.APP, id: 'cattle-monitoring-system/rancher-monitoring' })
       });
 
       if (!isEmpty(hash.endpoints)) {
@@ -109,7 +108,13 @@ export default {
           (el) => el.group === 'prometheus'
         );
 
-        grafanaMatch.link = `${ getClusterPrefix(hash.app?.currentVersion || '', currentCluster.id) }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/`;
+        // Generate Grafana link
+        const currentCluster = this.$store.getters['currentCluster'];
+        const rancherMonitoring = !isEmpty(hash.apps) ? findBy(hash.apps, 'id', 'cattle-monitoring-system/rancher-monitoring') : '';
+        const clusterPrefix = getClusterPrefix(rancherMonitoring?.currentVersion || '', currentCluster.id);
+
+        grafanaMatch.link = `${ clusterPrefix }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/`;
+
         const alertmanager = findBy(
           hash.endpoints,
           'id',

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

@@ -2,9 +2,7 @@
 import { mapGetters } from 'vuex';
 import isEmpty from 'lodash/isEmpty';
 
-import {
-  CATALOG, SECRET, SERVICE, UI_PLUGIN, WORKLOAD_TYPES
-} from '@shell/config/types';
+import { CATALOG, SECRET, SERVICE, WORKLOAD_TYPES } from '@shell/config/types';
 import { UI_PLUGIN_LABELS, UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
 import { TYPES as SECRET_TYPES } from '@shell/models/secret';
 import { allHash } from '@shell/utils/promise';
@@ -195,11 +193,15 @@ export default {
             }
 
             if (this.extensionRepo) {
-              // Create uiplugin crd
-              await this.loadPlugin(name, this.extensionUrl, image);
+              btnCb(true);
+              this.closeDialog();
+              this.$store.dispatch('growl/success', {
+                title:   this.t('plugins.manageCatalog.imageLoad.success.title', { name }),
+                message: this.t('plugins.manageCatalog.imageLoad.success.message'),
+                timeout: 4000,
+              }, { root: true });
+              this.$emit('refresh');
             }
-
-            btnCb(true);
           } else {
             throw new Error('Unable to determine image name');
           }
@@ -313,62 +315,6 @@ export default {
       }
     },
 
-    async loadPlugin(name, url, image, btnCb) {
-      // Try and parse version number from the image
-      const version = this.extractImageVersion(image) || 'latest';
-
-      if (!this.extractImageVersion(image)) {
-        this.$store.dispatch('growl/warning', {
-          title:   this.t('plugins.manageCatalog.imageLoad.imageVersion.title'),
-          message: this.t('plugins.manageCatalog.imageLoad.imageVersion.message', { image }),
-          timeout: 4000,
-        }, { root: true });
-      }
-
-      let crdName = name;
-
-      const parts = name.split('-');
-
-      if (parts.length >= 2) {
-        crdName = parts.join('-');
-      }
-
-      this.extensionCrd = await this.$store.dispatch('management/create', {
-        type:     UI_PLUGIN,
-        metadata: {
-          name,
-          namespace: UI_PLUGIN_NAMESPACE,
-          labels:    {
-            [UI_PLUGIN_LABELS.CATALOG_IMAGE]: name,
-            [UI_PLUGIN_LABELS.REPOSITORY]:    this.extensionRepo.metadata.name
-          }
-        },
-        spec: {
-          plugin: {
-            name:     crdName,
-            version,
-            endpoint: url,
-            noCache:  false,
-            metadata: { [UI_PLUGIN_LABELS.CATALOG]: 'true' }
-          }
-        }
-      });
-
-      try {
-        await this.extensionCrd.save({ url: `/v1/${ UI_PLUGIN }`, method: 'POST' });
-
-        this.closeDialog();
-        this.$store.dispatch('growl/success', {
-          title:   this.t('plugins.manageCatalog.imageLoad.success.title', { name }),
-          message: this.t('plugins.manageCatalog.imageLoad.success.message'),
-          timeout: 4000,
-        }, { root: true });
-      } catch (e) {
-        this.handleGrowlError(e, true);
-        btnCb(false);
-      }
-    },
-
     parseDeploymentValues(name) {
       let out = {};
 
@@ -459,9 +405,6 @@ export default {
       if (this.extensionRepo) {
         this.extensionRepo.remove();
       }
-      if (this.extensionCrd) {
-        this.extensionCrd.remove();
-      }
     },
 
     handleGrowlError(e, clean = false) {

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

@@ -0,0 +1,182 @@
+<script>
+import { mapGetters } from 'vuex';
+
+import { CATALOG, UI_PLUGIN, SERVICE, WORKLOAD_TYPES } from '@shell/config/types';
+import { UI_PLUGIN_LABELS, UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
+import { allHash } from '@shell/utils/promise';
+
+import AsyncButton from '@shell/components/AsyncButton';
+
+export default {
+  components: { AsyncButton },
+
+  async fetch() {
+    if ( this.$store.getters['management/schemaFor'](UI_PLUGIN) ) {
+      const plugins = this.$store.dispatch('management/findAll', { type: UI_PLUGIN });
+
+      this.plugins = plugins || [];
+    }
+  },
+
+  data() {
+    return {
+      catalog: undefined, busy: false, plugins: null
+    };
+  },
+
+  computed: {
+    ...mapGetters({ allCharts: 'catalog/charts' }),
+
+    pluginsFromCatalogImage() {
+      return this.plugins.filter((p) => p.metadata?.labels?.[UI_PLUGIN_LABELS.CATALOG_IMAGE]);
+    }
+  },
+
+  methods: {
+    showDialog(catalog) {
+      this.catalog = catalog;
+      this.busy = false;
+      this.$modal.show('uninstallCatalogDialog');
+    },
+
+    closeDialog(result) {
+      this.$modal.hide('uninstallCatalogDialog');
+      this.$emit('closed', result);
+
+      if ( result ) {
+        this.$emit('refresh');
+      }
+    },
+
+    async uninstall() {
+      this.busy = true;
+
+      const catalog = this.catalog;
+      const apps = await this.$store.dispatch('management/findAll', { type: CATALOG.APP });
+      const pluginApps = apps.filter((app) => {
+        if ( app.namespace === UI_PLUGIN_NAMESPACE ) {
+          // Find the related apps from the deployed helm repository
+          const charts = this.allCharts.filter((chart) => chart.repoName === catalog.repo?.metadata?.name);
+
+          return charts.some((chart) => chart.chartName === app.metadata.name);
+        }
+
+        return false;
+      });
+
+      await this.removeCatalogResources(catalog);
+
+      if ( pluginApps.length ) {
+        try {
+          pluginApps.forEach((app) => {
+            this.$emit('update', app.name, 'uninstall');
+            app.remove();
+          });
+        } catch (e) {
+          this.$store.dispatch('growl/error', {
+            title:   this.t('plugins.error.generic'),
+            message: e.message ? e.message : e,
+            timeout: 10000
+          }, { root: true });
+        }
+
+        await this.$store.dispatch('management/findAll', { type: CATALOG.OPERATION });
+      }
+
+      this.closeDialog(catalog);
+    },
+
+    async removeCatalogResources(catalog) {
+      const selector = `${ UI_PLUGIN_LABELS.CATALOG_IMAGE }=${ catalog.name }`;
+      const namespace = UI_PLUGIN_NAMESPACE;
+
+      if ( selector ) {
+        const hash = await allHash({
+          deployment: this.$store.dispatch('management/findMatching', {
+            type: WORKLOAD_TYPES.DEPLOYMENT, selector, namespace
+          }),
+          service: this.$store.dispatch('management/findMatching', {
+            type: SERVICE, selector, namespace
+          }),
+          repo: this.$store.dispatch('management/findMatching', { type: CATALOG.CLUSTER_REPO, selector })
+        });
+
+        for ( const resource of Object.keys(hash) ) {
+          if ( hash[resource] ) {
+            hash[resource].forEach((r) => r.remove());
+          }
+        }
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <modal
+    name="uninstallCatalogDialog"
+    height="auto"
+    :scrollable="true"
+  >
+    <div
+      v-if="catalog"
+      class="plugin-install-dialog"
+    >
+      <h4 class="mt-10">
+        {{ t('plugins.uninstall.title', { name: catalog.name }) }}
+      </h4>
+      <div class="mt-10 dialog-panel">
+        <div class="dialog-info">
+          <p>
+            {{ t('plugins.uninstall.catalog') }}
+          </p>
+        </div>
+        <div class="dialog-buttons">
+          <button
+            :disabled="busy"
+            class="btn role-secondary"
+            data-testid="uninstall-ext-modal-cancel-btn"
+            @click="closeDialog(false)"
+          >
+            {{ t('generic.cancel') }}
+          </button>
+          <AsyncButton
+            mode="uninstall"
+            data-testid="uninstall-ext-modal-uninstall-btn"
+            @click="uninstall()"
+          />
+        </div>
+      </div>
+    </div>
+  </modal>
+</template>
+
+<style lang="scss" scoped>
+  .plugin-install-dialog {
+    padding: 10px;
+
+    h4 {
+      font-weight: bold;
+    }
+
+    .dialog-panel {
+      display: flex;
+      flex-direction: column;
+      min-height: 100px;
+
+      .dialog-info {
+        flex: 1;
+      }
+    }
+
+    .dialog-buttons {
+      display: flex;
+      justify-content: flex-end;
+      margin-top: 10px;
+
+      > *:not(:last-child) {
+        margin-right: 10px;
+      }
+    }
+  }
+</style>

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

@@ -13,13 +13,6 @@ import ResourceTable from '@shell/components/ResourceTable';
 export default {
   name: 'CatalogList',
 
-  props: {
-    plugins: {
-      type:     Array,
-      required: true
-    }
-  },
-
   components: { ActionMenu, ResourceTable },
 
   mixins: [ResourceManager],
@@ -27,7 +20,7 @@ export default {
   data() {
     const actions = [
       {
-        action:  'uninstall',
+        action:  'showCatalogUninstallDialog',
         label:   this.t('plugins.uninstall.label'),
         icon:    'icon icon-trash',
         enabled: true,
@@ -57,36 +50,26 @@ export default {
     catalogRows() {
       const rows = [];
 
-      if (this.plugins.length) {
-        // Find the resources associated with the image by the CATALOG_IMAGE label
-        this.plugins.forEach((plugin) => {
-          const resources = [this.namespacedDeployments, this.namespacedServices, this.allRepos];
-          const pluginName = plugin.metadata?.labels?.[UI_PLUGIN_LABELS.CATALOG_IMAGE];
+      if ( !isEmpty(this.namespacedDeployments) ) {
+        this.namespacedDeployments.forEach((deploy) => {
+          const resources = [this.namespacedServices, this.allRepos];
+          const deployName = deploy.metadata?.labels?.[UI_PLUGIN_LABELS.CATALOG_IMAGE];
 
-          if (pluginName) {
+          if ( deployName ) {
             const out = {
-              uiplugin:        plugin,
-              catalog:         true,
-              name:            pluginName,
-              state:           plugin.metadata?.state?.name,
-              cacheState:      plugin.status?.cacheState,
-              version:         plugin.spec?.plugin?.version,
-              deployment:      null,
-              deploymentImage: null,
-              service:         null,
-              repo:            null
+              name:    deployName,
+              state:   deploy.metadata?.state?.name,
+              image:   deploy.spec?.template?.spec?.containers[0]?.image,
+              service: null,
+              repo:    null
             };
-            const keys = ['deployment', 'service', 'repo'];
+            const keys = ['service', 'repo'];
 
             resources.forEach((resource, i) => {
-              out[keys[i]] = resource?.filter((item) => item.metadata?.labels?.[UI_PLUGIN_LABELS.CATALOG_IMAGE] === pluginName)[0];
+              out[keys[i]] = resource?.filter((item) => item.metadata?.labels?.[UI_PLUGIN_LABELS.CATALOG_IMAGE] === deployName)[0];
             });
 
-            if (!isEmpty(out?.deployment)) {
-              out.deploymentImage = out.deployment.spec?.template?.spec?.containers[0]?.image;
-
-              rows.push(out);
-            }
+            rows.push(out);
           }
         });
       }
@@ -153,7 +136,7 @@ export default {
             :custom-target-element="menuTargetElement"
             :custom-target-event="menuTargetEvent"
             @close="setMenu(false)"
-            @uninstall="e => $emit('showUninstallDialog', row, e.event)"
+            @showCatalogUninstallDialog="e => $emit('showCatalogUninstallDialog', row, e.event)"
           />
         </template>
       </ResourceTable>