Fix type-checks

Ref: coreui/coreui-vue#295 Signed-off-by: Aurélien Bompard <[email protected]>
fedora-infra · Oct 14, 2024 · 57651d8 · 57651d8
1 parent 379b03f
commit 57651d8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/frontend/src/components/AdminSubHeader.vue b/frontend/src/components/AdminSubHeader.vue
@@ -11,12 +11,12 @@ import { CNav, CNavItem } from "@coreui/vue";
 <template>
   <h1 class="border-bottom mb-5 pb-2">Admin Dashboard</h1>
   <CNav variant="tabs" class="mb-2">
-    <CNavItem>
+    <CNavItem as="li">
       <router-link to="/admin/disabled-rules" class="nav-link"
         >Disabled Rules List</router-link
       >
     </CNavItem>
-    <CNavItem>
+    <CNavItem as="li">
       <router-link to="/admin/user-rules" class="nav-link"
         >User Rules</router-link
       >

diff --git a/frontend/src/components/LoginButton.vue b/frontend/src/components/LoginButton.vue
@@ -17,7 +17,7 @@ SPDX-License-Identifier: MIT
         <CDropdownItem @click="doLogout()">{{ t("logout") }}</CDropdownItem>
       </CDropdownMenu>
     </CDropdown>
-    <CNavItem v-else>
+    <CNavItem as="li" v-else>
       <CButton
         @click.prevent="doLogin()"
         component="a"

diff --git a/frontend/src/forms/MultiSelectAsyncDefaultInput.vue b/frontend/src/forms/MultiSelectAsyncDefaultInput.vue
@@ -63,7 +63,8 @@ function handleChange(value: Option[]) {
       :key="slotName"
       v-slot:[slotName]="slotParams"
     >
-      <component :is="slot" v-bind="slotParams" />
+      <!-- Not sure how to type slotParams properly -->
+      <component :is="slot" v-bind="slotParams as any" />
     </template>
   </Multiselect>
 </template>

diff --git a/frontend/src/forms/MultiSelectInput.vue b/frontend/src/forms/MultiSelectInput.vue
@@ -14,7 +14,11 @@ const props = defineProps<{ context: FormKitFrameworkContext }>();
 
 const bindableProps = computed(() => getBindableProps(props.context));
 const slots = computed(
-  () => props.context.slots as Partial<Multiselect["$slots"]>,
+  () =>
+    props.context.slots as Omit<
+      Partial<Multiselect["$slots"]>,
+      "multiplelabel" | "singlelabel"
+    >,
 );
 
 function handleChange(value: string) {
@@ -31,7 +35,8 @@ function handleChange(value: string) {
       :key="slotName"
       v-slot:[slotName]="slotParams"
     >
-      <component :is="slot" v-bind="slotParams" />
+      <!-- Not sure how to type slotParams properly -->
+      <component :is="slot" v-bind="slotParams as any" />
     </template>
   </Multiselect>
 </template>