fix: errors caused by upgrades

rluetzner · Dec 18, 2022 · 25fe2cf · 25fe2cf
1 parent 33f0607
commit 25fe2cf
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 32 deletions.
diff --git a/src/jelu-ui/src/components/UserSettings.vue b/src/jelu-ui/src/components/UserSettings.vue
@@ -137,7 +137,7 @@ watch(() => locale.value,(newValue, oldValue) => {
       </option>
       <option
         v-for="loc in availableLocales"
-        :key="loc"
+        :key="(loc as string)"
         :value="loc"
       >
         {{ loc }}

diff --git a/src/jelu-ui/src/composables/useVueRouterArray.ts b/src/jelu-ui/src/composables/useVueRouterArray.ts
@@ -1,36 +1,38 @@
-import { MaybeRef } from '@vueuse/router/node_modules/@vueuse/shared'
-import { computed, nextTick, unref } from 'vue'
+import { MaybeRef } from '@vueuse/shared/'
+import type { Ref } from '@vueuse/router/node_modules/vue-demi'
+import { computed, nextTick, unref } from '@vueuse/router/node_modules/vue-demi'
 import { useRoute, useRouter } from 'vue-router'
-// import {ReactiveRouteOptions} from '@vueuse/router'
 
-export function useRouteQueryArray<T extends string[]>(
-    name: string,
-    defaultValue?: T,
-    {
-      mode = 'replace',
-      route = useRoute(),
-      router = useRouter(),
-    }: ReactiveRouteOptions = {},
-  ) {
-    return computed<any>({
-      get() {
-        const data = route.query[name]
-        console.log("qu a data " + data)
-        if (data == null)
-          return defaultValue ?? null
-        if (Array.isArray(data))
-          return data.filter(Boolean)
-        return [data]
-      },
-      set(v) {
-        nextTick(() => {
-          router[unref(mode)]({ query: { ...route.query, [name]: v } })
-        })
-      },
-    })
-  }
+export function useRouteQueryArray(name: string): Ref<null | string | string[]>
+export function useRouteQueryArray<T extends null | undefined | string | string[] = null | string | string[]>(name: string, defaultValue?: T, options?: ReactiveRouteOptions): Ref<T>
+export function useRouteQueryArray<T extends string | string[]>(
+  name: string,
+  defaultValue?: T,
+  {
+    mode = 'replace',
+    route = useRoute(),
+    router = useRouter(),
+  }: ReactiveRouteOptions = {},
+) {
+  return computed<any>({
+    get() {
+      const data = route.query[name]
+      if (data == null)
+        return defaultValue ?? null
+      if (Array.isArray(data))
+        return data.filter(Boolean)
+      return [data]
+    },
+    set(v) {
+      nextTick(() => {
+        router[unref(mode)]({ ...route, query: { ...route.query, [name]: v === defaultValue || v === null ? undefined : v } })
+      })
+    },
+  })
+}
+
 
-  export interface ReactiveRouteOptions {
+export interface ReactiveRouteOptions {
     /**
      * Mode to update the router query, ref is also acceptable
      *
@@ -47,4 +49,4 @@ export function useRouteQueryArray<T extends string[]>(
      * Router instance, use `useRouter()` if not given
      */
     router?: ReturnType<typeof useRouter>
-  }
+  }