@rancher/shell 3.0.5-rc.1 → 3.0.5-rc.3

package/{pages/c/_cluster/uiplugins/CatalogList/CatalogLoadDialog.vue → dialog/ExtensionCatalogInstallDialog.vue}

@@ -10,7 +10,6 @@ import { allHash } from '@shell/utils/promise';
 import ResourceManager from '@shell/mixins/resource-manager';
 
 import AsyncButton from '@shell/components/AsyncButton';
-import AppModal from '@shell/components/AppModal';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import Loading from '@shell/components/Loading.vue';
 import { Banner } from '@components/Banner';
@@ -98,14 +97,41 @@ const initialState = () => {
 };
 
 export default {
-  emits: ['closed', 'refresh'],
+  emits: ['close'],
 
   components: {
-    AsyncButton, Banner, LabeledInput, Loading, LabeledSelect, AppModal,
+    AsyncButton, Banner, LabeledInput, Loading, LabeledSelect
   },
 
   mixins: [ResourceManager],
 
+  props: {
+    /**
+     * Callback to trigger refresh banner on extensions screen
+     */
+    refresh: {
+      type:     Function,
+      default:  () => {},
+      required: true
+    },
+    /**
+     * Callback when modal is closed
+     */
+    closed: {
+      type:     Function,
+      default:  () => {},
+      required: true
+    },
+    resources: {
+      type:    Array,
+      default: () => []
+    },
+    registerBackgroundClosing: {
+      type:    Function,
+      default: () => {}
+    }
+  },
+
   async fetch() {
     const hash = {};
 
@@ -126,9 +152,7 @@ export default {
   data() {
     return {
       ...initialState(),
-      secondaryResourceData: null,
-      showModal:             false,
-      returnFocusSelector:   '[data-testid="extensions-catalog-load-dialog"]'
+      secondaryResourceData: null
     };
   },
 
@@ -163,18 +187,15 @@ export default {
       };
     },
 
-    showDialog() {
-      this.showModal = true;
-    },
-
     closeDialog(result) {
-      this.showModal = false;
-      this.$emit('closed', result);
+      this.closed(result);
 
       // Reset state
       Object.assign(this.$data, initialState());
       this.secondaryResourceData = this.secondaryResourceDataConfig();
       this.resourceManagerFetchSecondaryResources(this.secondaryResourceData);
+
+      this.$emit('close');
     },
 
     async loadImage(btnCb) {
@@ -205,7 +226,8 @@ export default {
                 message: this.t('plugins.manageCatalog.imageLoad.success.message'),
                 timeout: 4000,
               }, { root: true });
-              this.$emit('refresh');
+
+              this.refresh();
             }
           } else {
             throw new Error('Unable to determine image name');
@@ -430,90 +452,80 @@ export default {
 </script>
 
 <template>
-  <app-modal
-    v-if="showModal"
-    name="catalogLoadDialog"
-    height="auto"
-    :scrollable="true"
-    :trigger-focus-trap="true"
-    :return-focus-selector="returnFocusSelector"
-    @close="closeDialog()"
+  <Loading
+    v-if="$fetchState.loading"
+    mode="relative"
+  />
+  <div
+    v-else
+    class="plugin-install-dialog"
   >
-    <Loading
-      v-if="$fetchState.loading"
-      mode="relative"
-    />
-    <div
-      v-else
-      class="plugin-install-dialog"
-    >
-      <div>
-        <h4>
-          {{ t('plugins.manageCatalog.imageLoad.load') }}
-        </h4>
-        <p>
-          {{ t('plugins.manageCatalog.imageLoad.prompt') }}
-        </p>
-
-        <div class="custom mt-10">
-          <Banner
-            color="info"
-            :label="t('plugins.manageCatalog.imageLoad.banner')"
-            class="mt-10"
-          />
-        </div>
+    <div>
+      <h4>
+        {{ t('plugins.manageCatalog.imageLoad.load') }}
+      </h4>
+      <p>
+        {{ t('plugins.manageCatalog.imageLoad.prompt') }}
+      </p>
 
-        <div class="custom mt-10">
-          <div class="fields">
-            <LabeledInput
-              v-model:value.trim="deploymentValues.spec.template.spec.containers[0].image"
-              label-key="plugins.manageCatalog.imageLoad.fields.image.label"
-              placeholder-key="plugins.manageCatalog.imageLoad.fields.image.placeholder"
-            />
-          </div>
-        </div>
-        <div class="custom mt-10">
-          <div class="fields">
-            <LabeledSelect
-              v-model:value="imagePullSecrets"
-              :label="t('plugins.manageCatalog.imageLoad.fields.imagePullSecrets.label')"
-              :tooltip="t('plugins.manageCatalog.imageLoad.fields.imagePullSecrets.tooltip')"
-              :multiple="true"
-              :taggable="true"
-              :options="imagePullNamespacedSecrets"
-              option-label="metadata.name"
-              :reduce="service => service.metadata.name"
-            />
-            <Banner
-              color="warning"
-              class="mt-10"
-            >
-              <span v-clean-html="t('plugins.manageCatalog.imageLoad.fields.secrets.banner', {}, true)" />
-            </Banner>
-          </div>
-        </div>
+      <div class="custom mt-10">
+        <Banner
+          color="info"
+          :label="t('plugins.manageCatalog.imageLoad.banner')"
+          class="mt-10"
+        />
       </div>
 
       <div class="custom mt-10">
         <div class="fields">
-          <div class="dialog-buttons mt-20">
-            <button
-              class="btn role-secondary"
-              data-testid="image-load-ext-modal-cancel-btn"
-              @click="closeDialog()"
-            >
-              {{ t('generic.cancel') }}
-            </button>
-            <AsyncButton
-              mode="load"
-              data-testid="image-load-ext-modal-install-btn"
-              @click="loadImage"
-            />
-          </div>
+          <LabeledInput
+            v-model:value.trim="deploymentValues.spec.template.spec.containers[0].image"
+            label-key="plugins.manageCatalog.imageLoad.fields.image.label"
+            placeholder-key="plugins.manageCatalog.imageLoad.fields.image.placeholder"
+          />
+        </div>
+      </div>
+      <div class="custom mt-10">
+        <div class="fields">
+          <LabeledSelect
+            v-model:value="imagePullSecrets"
+            :label="t('plugins.manageCatalog.imageLoad.fields.imagePullSecrets.label')"
+            :tooltip="t('plugins.manageCatalog.imageLoad.fields.imagePullSecrets.tooltip')"
+            :multiple="true"
+            :taggable="true"
+            :options="imagePullNamespacedSecrets"
+            option-label="metadata.name"
+            :reduce="service => service.metadata.name"
+          />
+          <Banner
+            color="warning"
+            class="mt-10"
+          >
+            <span v-clean-html="t('plugins.manageCatalog.imageLoad.fields.secrets.banner', {}, true)" />
+          </Banner>
+        </div>
+      </div>
+    </div>
+
+    <div class="custom mt-10">
+      <div class="fields">
+        <div class="dialog-buttons mt-20">
+          <button
+            class="btn role-secondary"
+            data-testid="image-load-ext-modal-cancel-btn"
+            @click="closeDialog()"
+          >
+            {{ t('generic.cancel') }}
+          </button>
+          <AsyncButton
+            mode="load"
+            data-testid="image-load-ext-modal-install-btn"
+            @click="loadImage"
+          />
         </div>
       </div>
     </div>
-  </app-modal>
+  </div>
 </template>
 
 <style lang="scss" scoped>

package/{pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue → dialog/ExtensionCatalogUninstallDialog.vue}

@@ -6,12 +6,46 @@ import { UI_PLUGIN_LABELS, UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
 import { allHash } from '@shell/utils/promise';
 
 import AsyncButton from '@shell/components/AsyncButton';
-import AppModal from '@shell/components/AppModal.vue';
 
 export default {
-  emits: ['closed', 'refresh', 'update'],
-
-  components: { AsyncButton, AppModal },
+  emits: ['close'],
+
+  components: { AsyncButton },
+
+  props: {
+    /**
+     * Catalog object
+     */
+    catalog: {
+      type:     Object,
+      default:  () => {},
+      required: true
+    },
+    /**
+     * Callback to trigger refresh banner on extensions screen
+     */
+    refresh: {
+      type:     Function,
+      default:  () => {},
+      required: true
+    },
+    /**
+     * Callback when modal is closed
+     */
+    closed: {
+      type:     Function,
+      default:  () => {},
+      required: true
+    },
+    resources: {
+      type:    Array,
+      default: () => []
+    },
+    registerBackgroundClosing: {
+      type:    Function,
+      default: () => {}
+    }
+  },
 
   async fetch() {
     if ( this.$store.getters['management/schemaFor'](UI_PLUGIN) ) {
@@ -23,11 +57,8 @@ export default {
 
   data() {
     return {
-      catalog:             undefined,
-      busy:                false,
-      plugins:             null,
-      showModal:           false,
-      returnFocusSelector: '[data-testid="extensions-catalog-load-dialog"]'
+      busy:    false,
+      plugins: null,
     };
   },
 
@@ -40,19 +71,14 @@ export default {
   },
 
   methods: {
-    showDialog(catalog) {
-      this.catalog = catalog;
-      this.busy = false;
-      this.showModal = true;
-    },
-
     closeDialog(result) {
-      this.showModal = false;
-      this.$emit('closed', result);
+      this.closed(result);
 
       if ( result ) {
-        this.$emit('refresh');
+        this.refresh();
       }
+
+      this.$emit('close');
     },
 
     async uninstall() {
@@ -76,7 +102,6 @@ export default {
       if ( pluginApps.length ) {
         try {
           pluginApps.forEach((app) => {
-            this.$emit('update', app.name, 'uninstall');
             app.remove();
           });
         } catch (e) {
@@ -94,18 +119,24 @@ export default {
     },
 
     async removeCatalogResources(catalog) {
-      const selector = `${ UI_PLUGIN_LABELS.CATALOG_IMAGE }=${ catalog.name }`;
-      const namespace = UI_PLUGIN_NAMESPACE;
+      if ( catalog.name ) {
+        const namespace = UI_PLUGIN_NAMESPACE;
+        // of type KubeLabelSelector
+        const labelSelector = { matchLabels: { [UI_PLUGIN_LABELS.CATALOG_IMAGE]: catalog.name } };
 
-      if ( selector ) {
         const hash = await allHash({
-          deployment: this.$store.dispatch('management/findMatching', {
-            type: WORKLOAD_TYPES.DEPLOYMENT, selector, namespace
+          deployment: this.$store.dispatch('management/findLabelSelector', {
+            type:     WORKLOAD_TYPES.DEPLOYMENT,
+            matching: { namespace, labelSelector }
           }),
-          service: this.$store.dispatch('management/findMatching', {
-            type: SERVICE, selector, namespace
+          service: this.$store.dispatch('management/findLabelSelector', {
+            type:     SERVICE,
+            matching: { namespace, labelSelector }
           }),
-          repo: this.$store.dispatch('management/findMatching', { type: CATALOG.CLUSTER_REPO, selector })
+          repo: this.$store.dispatch('management/findLabelSelector', {
+            type:     CATALOG.CLUSTER_REPO,
+            matching: { labelSelector }
+          })
         });
 
         for ( const resource of Object.keys(hash) ) {
@@ -120,46 +151,33 @@ export default {
 </script>
 
 <template>
-  <app-modal
-    v-if="showModal"
-    name="uninstallCatalogDialog"
-    height="auto"
-    :scrollable="true"
-    :trigger-focus-trap="true"
-    :return-focus-selector="returnFocusSelector"
-    @close="closeDialog(false)"
-  >
-    <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 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>
-  </app-modal>
+  </div>
 </template>
 
 <style lang="scss" scoped>