@rancher/shell 2.0.0 → 3.0.0-rc.1

package/edit/auth/azuread.vue

@@ -137,7 +137,7 @@ export default {
       const applicationSecret = this.getNewApplicationSecret();
 
       if (applicationSecret) {
-        this.$set(this.model, 'applicationSecret', applicationSecret);
+        this.model['applicationSecret'] = applicationSecret;
       }
 
       return {
@@ -186,7 +186,7 @@ export default {
         this.model.rancherUrl = this.model.rancherUrl || this.replyUrl;
 
         if (this.model.applicationSecret) {
-          this.$set(this, 'applicationSecret', this.model.applicationSecret);
+          this['applicationSecret'] = this.model.applicationSecret;
         }
       }
     },
@@ -206,14 +206,7 @@ export default {
         const endpointType = this.oldEndpoint && endpoint !== 'custom' ? OLD_ENDPOINTS : ENDPOINT_MAPPING;
 
         Object.keys(endpointType[endpoint]).forEach((key) => {
-          this.$set(
-            this.model,
-            key,
-            endpointType[endpoint][key].replace(
-              TENANT_ID_TOKEN,
-              this.model.tenantId
-            )
-          );
+          this.model.key = endpointType[endpoint][key].replace(TENANT_ID_TOKEN, this.model.tenantId);
         });
       }
     },
@@ -330,7 +323,7 @@ export default {
           :disable="disable"
           :edit="goToEdit"
         >
-          <template slot="rows">
+          <template #rows>
             <tr>
               <td>{{ t(`authConfig.azuread.tenantId.label`) }}:</td>
               <td>{{ model.tenantId }}</td>
@@ -358,7 +351,7 @@ export default {
           </template>
           <template
             v-if="needsUpdate"
-            slot="actions"
+            #actions
           >
             <button
               type="button"
@@ -403,7 +396,7 @@ export default {
           <div class="col span-6">
             <LabeledInput
               id="tenant-id"
-              v-model="model.tenantId"
+              v-model:value="model.tenantId"
               :label="t('authConfig.azuread.tenantId.label')"
               :mode="mode"
               :required="true"
@@ -418,7 +411,7 @@ export default {
           <div class="col span-6">
             <LabeledInput
               id="application-id"
-              v-model="model.applicationId"
+              v-model:value="model.applicationId"
               :label="t('authConfig.azuread.applicationId.label')"
               :mode="mode"
               :required="true"
@@ -430,7 +423,7 @@ export default {
           <div class="col span-6">
             <LabeledInput
               id="application-secret"
-              v-model="model.applicationSecret"
+              v-model:value="model.applicationSecret"
               type="password"
               :label="t('authConfig.azuread.applicationSecret.label')"
               :required="true"
@@ -443,17 +436,17 @@ export default {
         <div class="row mb-20">
           <div class="col span-12">
             <Checkbox
-              v-model="isGroupMembershipFilterEnabled"
+              v-model:value="isGroupMembershipFilterEnabled"
               class="mb-10 mr-10"
               :mode="mode"
               :label="t('authConfig.azuread.groupMembershipFilter.enable')"
               :tooltip="t('authConfig.azuread.groupMembershipFilter.tooltip')"
               data-testid="checkbox-azureAD-groupMembershipFilter"
-              @input="toggleGroupMembershipFilter"
+              @update:value="toggleGroupMembershipFilter"
             />
             <div v-if="isGroupMembershipFilterEnabled">
               <LabeledInput
-                v-model="model.groupMembershipFilter"
+                v-model:value="model.groupMembershipFilter"
                 :label="t('authConfig.azuread.groupMembershipFilter.label')"
                 placeholder="e.g. (displayName eq 'group1') or (displayName eq 'group2')"
                 :mode="mode"
@@ -471,7 +464,7 @@ export default {
           </div>
         </div>
         <RadioGroup
-          v-model="endpoint"
+          v-model:value="endpoint"
           class="mb-20"
           :required="true"
           :label="t('authConfig.azuread.endpoints.label')"
@@ -485,7 +478,7 @@ export default {
           <div class="row mb-20">
             <div class="col span-6">
               <LabeledInput
-                v-model="model.endpoint"
+                v-model:value="model.endpoint"
                 :label="t('authConfig.azuread.endpoint.label')"
                 :mode="mode"
                 :required="true"
@@ -495,7 +488,7 @@ export default {
             </div>
             <div class="col span-6">
               <LabeledInput
-                v-model="model.graphEndpoint"
+                v-model:value="model.graphEndpoint"
                 :label="t('authConfig.azuread.graphEndpoint.label')"
                 :required="true"
                 :rules="fvGetAndReportPathRules('graphEndpoint')"
@@ -507,7 +500,7 @@ export default {
           <div class="row mb-20">
             <div class="col span-6">
               <LabeledInput
-                v-model="model.tokenEndpoint"
+                v-model:value="model.tokenEndpoint"
                 :label="t('authConfig.azuread.tokenEndpoint.label')"
                 :mode="mode"
                 :required="true"
@@ -517,7 +510,7 @@ export default {
             </div>
             <div class="col span-6">
               <LabeledInput
-                v-model="model.authEndpoint"
+                v-model:value="model.authEndpoint"
                 :label="t('authConfig.azuread.authEndpoint.label')"
                 :required="true"
                 :rules="fvGetAndReportPathRules('authEndpoint')"

package/edit/auth/github.vue

@@ -137,7 +137,7 @@ export default {
           :disable="disable"
           :edit="goToEdit"
         >
-          <template slot="rows">
+          <template #rows>
             <tr><td>{{ t(`authConfig.${ NAME }.table.server`) }}: </td><td>{{ baseUrl }}</td></tr>
             <tr><td>{{ t(`authConfig.${ NAME }.table.clientId`) }}: </td><td>{{ value.clientId }}</td></tr>
           </template>
@@ -160,7 +160,7 @@ export default {
 
         <h3 v-t="`authConfig.${NAME}.target.label`" />
         <RadioGroup
-          v-model="targetType"
+          v-model:value="targetType"
           name="targetType"
           data-testid="authConfig-gitHub"
           :options="['public','private']"
@@ -172,7 +172,7 @@ export default {
           <div class="col span-6">
             <LabeledInput
               v-if="!isPublic"
-              v-model="targetUrl"
+              v-model:value="targetUrl"
               :label-key="`authConfig.${NAME}.host.label`"
               :placeholder="t(`authConfig.${NAME}.host.placeholder`)"
               :required="true"
@@ -235,14 +235,14 @@ export default {
         <div class="row mb-20">
           <div class="col span-6">
             <LabeledInput
-              v-model="model.clientId"
+              v-model:value="model.clientId"
               :label="t(`authConfig.${NAME}.clientId.label`)"
               :mode="mode"
             />
           </div>
           <div class="col span-6">
             <LabeledInput
-              v-model="model.clientSecret"
+              v-model:value="model.clientSecret"
               type="password"
               :label="t(`authConfig.${NAME}.clientSecret.label`)"
               :mode="mode"
@@ -261,7 +261,7 @@ export default {
   .banner {
     display: block;
 
-    &::v-deep code {
+    &:deep() code {
       padding: 0 3px;
       margin: 0 3px;
     }

package/edit/auth/googleoauth.vue

@@ -82,7 +82,7 @@ export default {
           :disable="disable"
           :edit="goToEdit"
         >
-          <template slot="rows">
+          <template #rows>
             <tr><td>{{ t(`authConfig.${NAME}.adminEmail`) }}: </td><td>{{ model.adminEmail }}</td></tr>
             <tr><td>{{ t(`authConfig.${NAME}.domain`) }}: </td><td>{{ model.hostname }}</td></tr>
 
@@ -110,7 +110,7 @@ export default {
         >
           <div class="col span-5">
             <LabeledInput
-              v-model="model.adminEmail"
+              v-model:value="model.adminEmail"
               :label="t(`authConfig.${NAME}.adminEmail`)"
               :mode="mode"
               required
@@ -118,7 +118,7 @@ export default {
           </div>
           <div class="col span-5">
             <LabeledInput
-              v-model="model.hostname"
+              v-model:value="model.hostname"
               :label="t(`authConfig.${NAME}.domain`)"
               :mode="mode"
               required
@@ -126,7 +126,7 @@ export default {
           </div>
           <div class="col span-2">
             <Checkbox
-              v-model="model.nestedGroupMembershipEnabled"
+              v-model:value="model.nestedGroupMembershipEnabled"
               :mode="mode"
               :label="t('authConfig.ldap.nestedGroupMembership.label')"
             />
@@ -184,7 +184,7 @@ export default {
             </div>
             <div class="col span-6">
               <LabeledInput
-                v-model="model.oauthCredential"
+                v-model:value="model.oauthCredential"
                 :label="t(`authConfig.googleoauth.oauthCredentials.label`)"
                 :mode="mode"
                 required
@@ -219,7 +219,7 @@ export default {
             </div>
             <div class="col span-6">
               <LabeledInput
-                v-model="model.serviceAccountCredential"
+                v-model:value="model.serviceAccountCredential"
                 :label="t(`authConfig.googleoauth.serviceAccountCredentials.label`)"
                 :mode="mode"
                 required
@@ -248,7 +248,7 @@ export default {
   .banner {
     display: block;
 
-    &::v-deep code {
+    &:deep() code {
       padding: 0 3px;
       margin: 0 3px;
     }

package/edit/auth/ldap/config.vue

@@ -94,12 +94,12 @@ export default {
 </script>
 
 <template>
-  <div @input="$emit('input', model)">
+  <div @update:value="$emit('update:value', model)">
     <template>
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="hostname"
+            v-model:value="hostname"
             required
             :mode="mode"
             :hoover-tooltip="true"
@@ -117,13 +117,13 @@ export default {
             :step="1"
             :mode="mode"
             :label="t('authConfig.ldap.port')"
-            @input="e=>$set(model, 'port', e.replace(/[^0-9]*/g, ''))"
+            @update:value="e=>$set(model, 'port', e.replace(/[^0-9]*/g, ''))"
           />
         </div>
 
         <div class="col">
           <Checkbox
-            v-model="model.tls"
+            v-model:value="model.tls"
             :mode="mode"
             class="full-height"
             :label="t('authConfig.ldap.tls')"
@@ -131,7 +131,7 @@ export default {
         </div>
         <div class="col span-1">
           <Checkbox
-            v-model="model.starttls"
+            v-model:value="model.starttls"
             :tooltip="t('authConfig.ldap.starttls.tip')"
             :mode="mode"
             class="full-height"
@@ -145,7 +145,7 @@ export default {
       >
         <div class="col span-12">
           <LabeledInput
-            v-model="model.certificate"
+            v-model:value="model.certificate"
             required
             type="multiline"
             :mode="mode"
@@ -162,7 +162,7 @@ export default {
       <div class="row mb-20">
         <div class="col span-6">
           <UnitInput
-            v-model="model.connectionTimeout"
+            v-model:value="model.connectionTimeout"
             required
             :mode="mode"
             :label="t('authConfig.ldap.serverConnectionTimeout')"
@@ -180,7 +180,7 @@ export default {
           class="col span-6"
         >
           <LabeledInput
-            v-model="model.serviceAccountUsername"
+            v-model:value="model.serviceAccountUsername"
             required
             :mode="mode"
             :label="t('authConfig.ldap.serviceAccountDN')"
@@ -192,7 +192,7 @@ export default {
           class="col span-6"
         >
           <LabeledInput
-            v-model="model.serviceAccountDistinguishedName"
+            v-model:value="model.serviceAccountDistinguishedName"
             required
             :mode="mode"
             :label="t('authConfig.ldap.serviceAccountDN')"
@@ -200,7 +200,7 @@ export default {
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model="model.serviceAccountPassword"
+            v-model:value="model.serviceAccountPassword"
             required
             type="password"
             :mode="mode"
@@ -214,7 +214,7 @@ export default {
       >
         <div class="col span-6">
           <LabeledInput
-            v-model="model.defaultLoginDomain"
+            v-model:value="model.defaultLoginDomain"
             :hoover-tooltip="true"
             :tooltip="t('authConfig.ldap.defaultLoginDomain.hint')"
             :placeholder="t('authConfig.ldap.defaultLoginDomain.placeholder')"
@@ -226,7 +226,7 @@ export default {
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="model.userSearchBase"
+            v-model:value="model.userSearchBase"
             required
             :mode="mode"
             :label="t('authConfig.ldap.userSearchBase.label')"
@@ -235,7 +235,7 @@ export default {
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model="model.groupSearchBase"
+            v-model:value="model.groupSearchBase"
             :mode="mode"
             :placeholder="t('authConfig.ldap.groupSearchBase.placeholder')"
             :label="t('authConfig.ldap.groupSearchBase.label')"
@@ -263,14 +263,14 @@ export default {
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="model.userObjectClass"
+            v-model:value="model.userObjectClass"
             :mode="mode"
             :label="t('authConfig.ldap.objectClass')"
           />
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model="model.groupObjectClass"
+            v-model:value="model.groupObjectClass"
             :mode="mode"
             :label="t('authConfig.ldap.objectClass')"
           />
@@ -279,14 +279,14 @@ export default {
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="model.userNameAttribute"
+            v-model:value="model.userNameAttribute"
             :mode="mode"
             :label="t('authConfig.ldap.usernameAttribute')"
           />
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model="model.groupNameAttribute"
+            v-model:value="model.groupNameAttribute"
             :mode="mode"
             :label="t('authConfig.ldap.nameAttribute')"
           />
@@ -295,14 +295,14 @@ export default {
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="model.userLoginAttribute"
+            v-model:value="model.userLoginAttribute"
             :mode="mode"
             :label="t('authConfig.ldap.loginAttribute')"
           />
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model="model.groupMemberUserAttribute"
+            v-model:value="model.groupMemberUserAttribute"
             :mode="mode"
             :label="t('authConfig.ldap.groupMemberUserAttribute')"
           />
@@ -311,14 +311,14 @@ export default {
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="model.userMemberAttribute"
+            v-model:value="model.userMemberAttribute"
             :mode="mode"
             :label="t('authConfig.ldap.userMemberAttribute')"
           />
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model="model.groupSearchAttribute"
+            v-model:value="model.groupSearchAttribute"
             :mode="mode"
             :label="t('authConfig.ldap.searchAttribute')"
           />
@@ -327,14 +327,14 @@ export default {
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="model.userSearchAttribute"
+            v-model:value="model.userSearchAttribute"
             :mode="mode"
             :label="t('authConfig.ldap.searchAttribute')"
           />
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model="model.groupSearchFilter"
+            v-model:value="model.groupSearchFilter"
             :mode="mode"
             :label="t('authConfig.ldap.searchFilter')"
           />
@@ -343,14 +343,14 @@ export default {
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="model.userSearchFilter"
+            v-model:value="model.userSearchFilter"
             :mode="mode"
             :label="t('authConfig.ldap.searchFilter')"
           />
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model="model.groupMemberMappingAttribute"
+            v-model:value="model.groupMemberMappingAttribute"
             :mode="mode"
             :label="t('authConfig.ldap.groupMemberMappingAttribute')"
           />
@@ -359,14 +359,14 @@ export default {
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="model.userEnabledAttribute"
+            v-model:value="model.userEnabledAttribute"
             :mode="mode"
             :label="t('authConfig.ldap.userEnabledAttribute')"
           />
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model="model.groupDNAttribute"
+            v-model:value="model.groupDNAttribute"
             :mode="mode"
             :label="t('authConfig.ldap.groupDNAttribute')"
           />
@@ -375,7 +375,7 @@ export default {
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model="model.disabledStatusBitmask"
+            v-model:value="model.disabledStatusBitmask"
             :mode="mode"
             :label="t('authConfig.ldap.disabledStatusBitmask')"
           />
@@ -385,7 +385,7 @@ export default {
           class=" col span-6"
         >
           <RadioGroup
-            v-model="model.nestedGroupMembershipEnabled"
+            v-model:value="model.nestedGroupMembershipEnabled"
             :mode="mode"
             name="nested"
             class="full-height"

package/edit/auth/ldap/index.vue

@@ -93,7 +93,7 @@ export default {
           :disable="disable"
           :edit="goToEdit"
         >
-          <template slot="rows">
+          <template #rows>
             <tr><td>{{ t(`authConfig.ldap.table.server`) }}: </td><td>{{ serverUrl }}</td></tr>
             <tr><td>{{ t(`authConfig.ldap.table.clientId`) }}: </td><td>{{ model.serviceAccountDistinguishedName || model.serviceAccountUsername }}</td></tr>
           </template>
@@ -116,7 +116,7 @@ export default {
 
         <h3>{{ t(`authConfig.ldap.${NAME}`) }}</h3>
         <config
-          v-model="model"
+          v-model:value="model"
           :type="NAME"
           :mode="mode"
         />
@@ -125,7 +125,7 @@ export default {
         <div class="row mb-20">
           <div class="col span-6">
             <LabeledInput
-              v-model="username"
+              v-model:value="username"
               :label="t(`authConfig.${AUTH_TYPE}.username`)"
               :mode="mode"
               required
@@ -133,7 +133,7 @@ export default {
           </div>
           <div class="col span-6">
             <Password
-              v-model="password"
+              v-model:value="password"
               :label="t(`authConfig.${AUTH_TYPE}.password`)"
               :mode="mode"
               required
@@ -148,7 +148,7 @@ export default {
   .banner {
     display: block;
 
-    &::v-deep code {
+    &:deep() code {
       padding: 0 3px;
       margin: 0 3px;
     }