@rancher/shell 2.0.0 → 3.0.0-rc.1

package/list/catalog.cattle.io.app.vue

@@ -60,7 +60,7 @@ export default {
 </template>
 
 <style scoped>
-.apps ::v-deep .state-description{
+.apps :deep() .state-description{
   color: var(--error)
 }
 </style>

package/list/cis.cattle.io.clusterscan.vue

@@ -1,5 +1,4 @@
 <script>
-import Vue from 'vue';
 import ResourceTable from '@shell/components/ResourceTable';
 import { AGE } from '@shell/config/table-headers';
 import ResourceFetch from '@shell/mixins/resource-fetch';
@@ -33,7 +32,7 @@ export default {
       hasScheduledScanConfig: fetchSpecsScheduledScanConfig(this.schema),
     });
 
-    Vue.set(this, 'hasScheduledScanConfig', res.hasScheduledScanConfig);
+    this['hasScheduledScanConfig'] = res.hasScheduledScanConfig;
   },
 
   data() {

package/list/fleet.cattle.io.clustergroup.vue

@@ -70,7 +70,6 @@ export default {
     :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
     key-field="_key"
-    v-on="$listeners"
   >
     <template #cell:clusters="{row}">
       <template v-if="row.status">

package/list/group.principal.vue

@@ -123,7 +123,7 @@ export default {
       :schema="schema"
       :resource="resource"
     >
-      <template slot="extraActions">
+      <template #extraActions>
         <AsyncButton
           v-if="canRefreshAccess"
           mode="refresh"

package/list/management.cattle.io.feature.vue

@@ -163,14 +163,16 @@ export default {
           const response = await this.$axios.get(url, { timeout: 5000 });
 
           if (response?.status === 200) {
-            this.rows = await this.$store.dispatch('management/findAll', { type: this.resource, opt: { force: true } });
+            await this.$store.dispatch('management/findAll', { type: this.resource, opt: { force: true } });
             btnCB(true);
             this.close();
             this.waiting = false;
           }
         } catch (e) {}
 
-        this.waitForBackend(btnCB, id);
+        if (this.waiting) {
+          this.waitForBackend(btnCB, id);
+        }
       }, 5000);
     },
 
@@ -198,10 +200,7 @@ export default {
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
       :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
     >
-      <template
-        slot="cell:name"
-        slot-scope="scope"
-      >
+      <template #cell:name="scope">
         <div class="feature-name">
           <div>{{ scope.row.nameDisplay }}</div>
           <i
@@ -226,13 +225,12 @@ export default {
         class="prompt-update"
         :show-highlight-border="false"
       >
-        <h4
-          slot="title"
-          class="text-default-text"
-        >
-          Are you sure?
-        </h4>
-        <div slot="body">
+        <template #title>
+          <h4 class="text-default-text">
+            Are you sure?
+          </h4>
+        </template>
+        <template #body>
           <div
             v-if="update"
             class="mb-10"
@@ -251,7 +249,7 @@ export default {
                   class="row mt-10"
                 >
                   <LabeledInput
-                    v-model="serverUrl"
+                    v-model:value="serverUrl"
                     :label="t('setup.serverUrl.label')"
                   />
                   <div class="col pl-5">
@@ -272,7 +270,7 @@ export default {
           <div class="text-error mb-10">
             {{ error }}
           </div>
-        </div>
+        </template>
         <template #actions>
           <button
             class="btn role-secondary"
@@ -293,21 +291,19 @@ export default {
         class="prompt-update"
         :show-highlight-border="false"
       >
-        <h4
-          slot="title"
-          class="text-default-text"
-        >
-          {{ t('featureFlags.restart.title') }}
-        </h4>
-        <div
-          slot="body"
-          class="waiting"
-        >
-          <p>{{ t('featureFlags.restart.wait') }}</p>
-          <span class="restarting-icon">
-            <i class=" icon icon-spinner icon-spin" />
-          </span>
-        </div>
+        <template #title>
+          <h4 class="text-default-text">
+            {{ t('featureFlags.restart.title') }}
+          </h4>
+        </template>
+        <template #body>
+          <div class="waiting">
+            <p>{{ t('featureFlags.restart.wait') }}</p>
+            <span class="restarting-icon">
+              <i class=" icon icon-spinner icon-spin" />
+            </span>
+          </div>
+        </template>
         <template #actions>
           <button
             class="btn role-secondary"
@@ -327,7 +323,7 @@ export default {
       box-shadow: none;
     }
 
-    ::v-deep .card-actions {
+    :deep() .card-actions {
       display: flex;
       justify-content: center;
     }

package/list/management.cattle.io.fleetworkspace.vue

@@ -40,6 +40,5 @@ export default {
     :schema="schema"
     :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    v-on="$listeners"
   />
 </template>

package/list/management.cattle.io.setting.vue

@@ -89,8 +89,8 @@ export default {
       </div>
     </Banner>
     <div
-      v-for="setting in settings"
-      :key="setting.id"
+      v-for="(setting, i) in settings"
+      :key="i"
       class="advanced-setting mb-20"
       :data-testid="`advanced-setting__option-${setting.id}`"
     >

package/list/management.cattle.io.user.vue

@@ -123,7 +123,7 @@ export default {
       :load-resources="loadResources"
       :load-indeterminate="loadIndeterminate"
     >
-      <template slot="extraActions">
+      <template #extraActions>
         <AsyncButton
           v-if="canRefreshAccess"
           mode="refresh"

package/list/namespace.vue

@@ -60,6 +60,5 @@ export default {
     key-field="_key"
     :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    v-on="$listeners"
   />
 </template>

package/list/node.vue

@@ -76,7 +76,7 @@ export default defineComponent({
     };
   },
 
-  beforeDestroy() {
+  beforeUnmount() {
     // Stop watching pods, nodes and node metrics
     if (this.canViewPods) {
       this.$store.dispatch('cluster/forgetType', POD);
@@ -172,7 +172,7 @@ export default defineComponent({
     },
 
     toggleLabels(row: any) {
-      this.$set(row, 'displayLabels', !row.displayLabels);
+      row['displayLabels'] = !row.displayLabels;
     },
 
     fetchSecondaryResources(): { [key: string]: Promise<any>} {
@@ -306,7 +306,6 @@ export default defineComponent({
       :external-pagination-enabled="canPaginate"
       :external-pagination-result="paginationResult"
       @pagination-changed="paginationChanged"
-      v-on="$listeners"
     >
       <template #sub-row="{fullColspan, row, onRowMouseEnter, onRowMouseLeave}">
         <tr
@@ -322,8 +321,8 @@ export default defineComponent({
               <span v-if="row.spec.taints && row.spec.taints.length">
                 {{ t('node.list.nodeTaint') }}:
                 <Tag
-                  v-for="taint in row.spec.taints"
-                  :key="taint.key + taint.value + taint.effect"
+                  v-for="(taint, i) in row.spec.taints"
+                  :key="i"
                   class="mr-5 mt-2"
                 >
                   {{ taint.key }}={{ taint.value }}:{{ taint.effect }}

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

@@ -174,7 +174,7 @@ export default {
     >
       <template
         v-if="canImport"
-        slot="extraActions"
+        #extraActions
       >
         <router-link
           :to="importLocation"

package/list/rbac.authorization.k8s.io.clusterrolebinding.vue

@@ -42,7 +42,6 @@ export default {
       :schema="schema"
       :loading="loading"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-      v-on="$listeners"
     />
   </div>
 </template>

package/machine-config/__tests__/vmwarevsphere.test.ts

@@ -1,5 +1,6 @@
 import { mount } from '@vue/test-utils';
-import vmwarevsphere, { DEFAULT_VALUES, SENTINEL } from '@shell/machine-config/vmwarevsphere.vue';
+import vmwarevsphere from '@shell/machine-config/vmwarevsphere.vue';
+import { DEFAULT_VALUES, SENTINEL } from '@shell/machine-config/vmwarevsphere-config';
 
 describe('component: vmwarevsphere', () => {
   const defaultGetters = { 'i18n/t': jest.fn().mockImplementation((key: string) => key) };
@@ -11,11 +12,13 @@ describe('component: vmwarevsphere', () => {
       disabled:     false,
       provider:     'vmwarevsphere'
     },
-    mocks: {
-      $fetchState: { pending: false },
-      $store:      { getters: defaultGetters },
-    },
-    stubs: { CodeMirror: true },
+    global: {
+      mocks: {
+        $fetchState: { pending: false },
+        $store:      { getters: defaultGetters },
+      },
+      stubs: { CodeMirror: true },
+    }
   };
   const defaultCreateSetup = {
     ...baseSetup,
@@ -115,7 +118,7 @@ describe('component: vmwarevsphere', () => {
 
   describe('mapHostOptionsToContent', () => {
     const hostPlaceholder = {
-      label: 'cluster.machineConfig.vsphere.hostOptions.any',
+      label: '%cluster.machineConfig.vsphere.hostOptions.any%',
       value: SENTINEL
     };
     const testCases = [

package/machine-config/amazonec2.vue

@@ -63,7 +63,7 @@ export default {
       const region = this.value.region || this.credential?.decodedData.defaultRegion || this.$store.getters['aws/defaultRegion'];
 
       if ( !this.value.region ) {
-        this.$set(this.value, 'region', region);
+        this.value['region'] = region;
       }
 
       this.ec2Client = await this.$store.dispatch('aws/ec2', { region, cloudCredentialId: this.credentialId });
@@ -100,18 +100,18 @@ export default {
       }
 
       if ( !this.value.zone ) {
-        this.$set(this.value, 'zone', 'a');
+        this.value['zone'] = 'a';
       }
 
       if ( !this.value.instanceType ) {
-        this.$set(this.value, 'instanceType', this.$store.getters['aws/defaultInstanceType']);
+        this.value['instanceType'] = this.$store.getters['aws/defaultInstanceType'];
       }
 
       this.initNetwork();
       this.initTags();
 
       if ( !this.value.securityGroup?.length ) {
-        this.$set(this.value, 'securityGroup', [DEFAULT_GROUP]);
+        this.value['securityGroup'] = [DEFAULT_GROUP];
       }
 
       if ( this.value.securityGroup?.length === 1 && this.value.securityGroup[0] === DEFAULT_GROUP ) {
@@ -374,7 +374,7 @@ export default {
         ary.push(k, tags[k]);
       }
 
-      this.$set(this.value, 'tags', ary.join(','));
+      this.value['tags'] = ary.join(',');
     },
 
     test() {
@@ -410,7 +410,7 @@ export default {
         <div class="row mb-20">
           <div class="col span-6">
             <LabeledSelect
-              v-model="value.region"
+              v-model:value="value.region"
               :mode="mode"
               :options="regionOptions"
               :required="true"
@@ -421,7 +421,7 @@ export default {
           </div>
           <div class="col span-6">
             <LabeledSelect
-              v-model="value.zone"
+              v-model:value="value.zone"
               :mode="mode"
               :options="zoneOptions"
               :required="true"
@@ -433,7 +433,7 @@ export default {
         <div class="row mb-20">
           <div class="col span-9">
             <LabeledSelect
-              v-model="value.instanceType"
+              v-model:value="value.instanceType"
               :mode="mode"
               :options="instanceOptions"
               :required="true"
@@ -454,7 +454,7 @@ export default {
           </div>
           <div class="col span-3">
             <UnitInput
-              v-model="value.rootSize"
+              v-model:value="value.rootSize"
               output-as="string"
               :mode="mode"
               :disabled="disabled"
@@ -477,7 +477,7 @@ export default {
               :label="t('cluster.machineConfig.amazonEc2.selectedNetwork.label')"
               data-testid="amazonEc2__selectedNetwork"
               option-key="value"
-              @input="updateNetwork($event)"
+              @update:value="updateNetwork($event)"
             >
               <template v-slot:option="opt">
                 <div :class="{'vpc': opt.kind === 'vpc', 'vpc-subnet': opt.kind !== 'vpc'}">
@@ -488,7 +488,7 @@ export default {
           </div>
           <div class="col span-6">
             <LabeledInput
-              v-model="value.iamInstanceProfile"
+              v-model:value="value.iamInstanceProfile"
               :mode="mode"
               :disabled="disabled"
               :required="isIamInstanceProfileNameRequired"
@@ -502,7 +502,7 @@ export default {
           <div class="row mt-20">
             <div class="col span-6">
               <LabeledInput
-                v-model="value.ami"
+                v-model:value="value.ami"
                 :mode="mode"
                 :disabled="disabled"
                 :placeholder="t('cluster.machineConfig.amazonEc2.ami.placeholder')"
@@ -511,7 +511,7 @@ export default {
             </div>
             <div class="col span-6">
               <LabeledInput
-                v-model="value.sshUser"
+                v-model:value="value.sshUser"
                 :mode="mode"
                 :label="t('cluster.machineConfig.amazonEc2.sshUser.label')"
                 :disabled="!value.ami || disabled"
@@ -533,7 +533,7 @@ export default {
                 </span>
               </h3>
               <RadioGroup
-                v-model="securityGroupMode"
+                v-model:value="securityGroupMode"
                 name="securityGroupMode"
                 :mode="mode"
                 :disabled="!value.vpcId || disabled"
@@ -542,7 +542,7 @@ export default {
               />
               <LabeledSelect
                 v-if="value.vpcId && securityGroupMode === 'custom'"
-                v-model="value.securityGroup"
+                v-model:value="value.securityGroup"
                 :mode="mode"
                 :disabled="!value.vpcId || disabled"
                 :options="securityGroupOptions"
@@ -556,7 +556,7 @@ export default {
           <div class="row mt-20">
             <div class="col span-6">
               <LabeledInput
-                v-model="value.volumeType"
+                v-model:value="value.volumeType"
                 :mode="mode"
                 :disabled="disabled"
                 :label="t('cluster.machineConfig.amazonEc2.volumeType.label')"
@@ -568,7 +568,7 @@ export default {
           <div class="row mt-20">
             <div class="col span-12">
               <Checkbox
-                v-model="value.encryptEbsVolume"
+                v-model:value="value.encryptEbsVolume"
                 :mode="mode"
                 :label="t('cluster.machineConfig.amazonEc2.encryptEbsVolume')"
               />
@@ -578,7 +578,7 @@ export default {
               >
                 <LabeledSelect
                   v-if="canReadKms"
-                  v-model="value.kmsKey"
+                  v-model:value="value.kmsKey"
                   :mode="mode"
                   :options="kmsOptions"
                   :disabled="disabled"
@@ -586,7 +586,7 @@ export default {
                 />
                 <template v-else>
                   <LabeledInput
-                    v-model="value.kmsKey"
+                    v-model:value="value.kmsKey"
                     :mode="mode"
                     :disabled="disabled"
                     :label="t('cluster.machineConfig.amazonEc2.kmsKey.label')"
@@ -601,7 +601,7 @@ export default {
           <div class="row mt-20">
             <div class="col span-6">
               <Checkbox
-                v-model="value.requestSpotInstance"
+                v-model:value="value.requestSpotInstance"
                 :mode="mode"
                 :label="t('cluster.machineConfig.amazonEc2.requestSpotInstance')"
               />
@@ -610,7 +610,7 @@ export default {
                 class="mt-10"
               >
                 <UnitInput
-                  v-model="value.spotPrice"
+                  v-model:value="value.spotPrice"
                   output-as="string"
                   :mode="mode"
                   :disabled="disabled"
@@ -626,7 +626,7 @@ export default {
             <div class="col span-12">
               <div>
                 <Checkbox
-                  v-model="value.privateAddressOnly"
+                  v-model:value="value.privateAddressOnly"
                   :mode="mode"
                   :disabled="disabled"
                   :label="t('cluster.machineConfig.amazonEc2.privateAddressOnly')"
@@ -634,7 +634,7 @@ export default {
               </div>
               <div>
                 <Checkbox
-                  v-model="value.useEbsOptimizedInstance"
+                  v-model:value="value.useEbsOptimizedInstance"
                   :mode="mode"
                   :disabled="disabled"
                   :label="t('cluster.machineConfig.amazonEc2.useEbsOptimizedInstance')"
@@ -642,7 +642,7 @@ export default {
               </div>
               <div>
                 <Checkbox
-                  v-model="value.httpEndpoint"
+                  v-model:value="value.httpEndpoint"
                   value-when-true="enabled"
                   :mode="mode"
                   :disabled="disabled"
@@ -651,7 +651,7 @@ export default {
               </div>
               <div>
                 <Checkbox
-                  v-model="value.httpTokens"
+                  v-model:value="value.httpTokens"
                   value-when-true="required"
                   :mode="mode"
                   :disabled="!value.httpEndpoint || disabled"
@@ -670,7 +670,7 @@ export default {
                 :label="t('cluster.machineConfig.amazonEc2.tagTitle')"
                 :add-label="t('labels.addTag')"
                 :disabled="disabled"
-                @input="updateTags"
+                @update:value="updateTags"
               />
             </div>
           </div>