Merge pull request #13279 from rak-phillip/task/13124-vue-compiler-wa…

…rnings Resolve Vue compiler warnings after upgrade to 3.5
rancher · Feb 4, 2025 · 5f75ce5 · 5f75ce5
2 parents cf745f3 + e32e4e5
commit 5f75ce5
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 45 deletions.
diff --git a/pkg/aks/components/AksNodePool.vue b/pkg/aks/components/AksNodePool.vue
@@ -387,26 +387,28 @@ export default defineComponent({
           v-if="(taints && taints.length) || isView"
           class="taints"
         >
-          <tr>
-            <th>
-              <label class="text-label">
-                {{ t('aks.nodePools.taints.key') }}
-                <span class="text-error">*</span>
-              </label>
-            </th>
-            <th>
-              <label class="text-label">
-                {{ t('aks.nodePools.taints.value') }}
-                <span class="text-error">*</span>
-              </label>
-            </th>
-            <th>
-              <label class="text-label">
-                {{ t('aks.nodePools.taints.effect') }}
-              </label>
-            </th>
-            <th />
-          </tr>
+          <thead>
+            <tr>
+              <th>
+                <label class="text-label">
+                  {{ t('aks.nodePools.taints.key') }}
+                  <span class="text-error">*</span>
+                </label>
+              </th>
+              <th>
+                <label class="text-label">
+                  {{ t('aks.nodePools.taints.value') }}
+                  <span class="text-error">*</span>
+                </label>
+              </th>
+              <th>
+                <label class="text-label">
+                  {{ t('aks.nodePools.taints.effect') }}
+                </label>
+              </th>
+              <th />
+            </tr>
+          </thead>
           <template v-if="taints && taints.length">
             <Taint
               v-for="(keyedTaint, i) in taints"

diff --git a/shell/components/ButtonMultiAction.vue b/shell/components/ButtonMultiAction.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, defineEmits } from 'vue';
+import { computed } from 'vue';
 
 defineEmits(['click']);
 

diff --git a/shell/components/auth/Principal.vue b/shell/components/auth/Principal.vue
@@ -85,9 +85,11 @@ export default {
         class="name"
       >
         <table>
-          <tr><td>{{ t('principal.name') }}: </td><td>{{ principal.name || principal.loginName }}</td></tr>
-          <tr><td>{{ t('principal.loginName') }}: </td><td>{{ principal.loginName }}</td></tr>
-          <tr><td>{{ t('principal.type') }}: </td><td>{{ principal.displayType }}</td></tr>
+          <tbody>
+            <tr><td>{{ t('principal.name') }}: </td><td>{{ principal.name || principal.loginName }}</td></tr>
+            <tr><td>{{ t('principal.loginName') }}: </td><td>{{ principal.loginName }}</td></tr>
+            <tr><td>{{ t('principal.type') }}: </td><td>{{ principal.displayType }}</td></tr>
+          </tbody>
         </table>
       </div>
       <template v-else>

diff --git a/shell/edit/auth/saml.vue b/shell/edit/auth/saml.vue
@@ -211,12 +211,14 @@ export default {
             </Banner>
 
             <table v-if="showLdapDetails && model.openLdapConfig">
-              <tr><td>{{ t('authConfig.ldap.hostname.label') }}:</td><td>{{ ldapHosts }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.port') }}:</td><td>{{ model.openLdapConfig.port }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.protocol') }}:</td><td>{{ ldapProtocol }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.serviceAccountDN') }}:</td><td>{{ model.openLdapConfig.serviceAccountDistinguishedName }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.userSearchBase.label') }}:</td><td>{{ model.openLdapConfig.userSearchBase }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.groupSearchBase.label') }}:</td><td>{{ model.openLdapConfig.groupSearchBase }}</td></tr>
+              <tbody>
+                <tr><td>{{ t('authConfig.ldap.hostname.label') }}:</td><td>{{ ldapHosts }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.port') }}:</td><td>{{ model.openLdapConfig.port }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.protocol') }}:</td><td>{{ ldapProtocol }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.serviceAccountDN') }}:</td><td>{{ model.openLdapConfig.serviceAccountDistinguishedName }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.userSearchBase.label') }}:</td><td>{{ model.openLdapConfig.userSearchBase }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.groupSearchBase.label') }}:</td><td>{{ model.openLdapConfig.groupSearchBase }}</td></tr>
+              </tbody>
             </table>
           </template>
         </AuthBanner>

diff --git a/shell/pages/diagnostic.vue b/shell/pages/diagnostic.vue
@@ -346,21 +346,23 @@ export default {
           class="full-width"
         >
           <thead @click="toggleTable(cluster.id)">
-            <th colspan="4">
-              <div class="cluster-row">
-                <span>Cluster: <b>{{ cluster.name }}</b></span>
-                <span>Namespace: <b>{{ cluster.namespace }}</b></span>
-                <span>Total Resources: <b>{{ sumResourceCount(cluster.counts) }}</b></span>
-                <span>Nodes: <b>{{ nodeCount(cluster.counts) }}</b></span>
-                <i
-                  class="icon"
-                  :class="{
-                    'icon-chevron-down': !cluster.isTableVisible,
-                    'icon-chevron-up': cluster.isTableVisible
-                  }"
-                />
-              </div>
-            </th>
+            <tr>
+              <th colspan="4">
+                <div class="cluster-row">
+                  <span>Cluster: <b>{{ cluster.name }}</b></span>
+                  <span>Namespace: <b>{{ cluster.namespace }}</b></span>
+                  <span>Total Resources: <b>{{ sumResourceCount(cluster.counts) }}</b></span>
+                  <span>Nodes: <b>{{ nodeCount(cluster.counts) }}</b></span>
+                  <i
+                    class="icon"
+                    :class="{
+                      'icon-chevron-down': !cluster.isTableVisible,
+                      'icon-chevron-up': cluster.isTableVisible
+                    }"
+                  />
+                </div>
+              </th>
+            </tr>
           </thead>
           <tbody v-show="cluster.isTableVisible">
             <tr>