refactor: fix code smells

DamianOsipiuk · Oct 22, 2021 · 6ba3d52 · 6ba3d52 · vercel · Oct 22, 2021
1 parent 25a9448
commit 6ba3d52
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 28 deletions.
diff --git a/examples/2.x-basic/src/main.ts b/examples/2.x-basic/src/main.ts
@@ -1,6 +1,5 @@
 import Vue from "vue";
-import { createApp, h } from "@vue/composition-api";
-import VueCompositionApi from "@vue/composition-api";
+import VueCompositionApi, { createApp, h } from "@vue/composition-api";
 
 import App from "./App.vue";
 

diff --git a/examples/basic/src/App.vue b/examples/basic/src/App.vue
@@ -1,6 +1,5 @@
 <script lang="ts">
-import { ref } from "vue";
-import { defineComponent } from "vue";
+import { defineComponent, ref } from "vue";
 import { useQueryProvider } from "vue-query";
 import { VueQueryDevTools } from "vue-query/devtools";
 

diff --git a/examples/multi-page/src/Page.vue b/examples/multi-page/src/Page.vue
@@ -40,7 +40,10 @@ export default defineComponent({
 
 <template>
   <h1>{{ title }}</h1>
-  <p>Turn on <b>Slow 3G</b> or <b>Offline</b> in dev-tools and hit Refetch</p>
+  <p>
+    Turn on <strong>Slow 3G</strong> or <strong>Offline</strong> in dev-tools
+    and hit Refetch
+  </p>
   <button @click="refetch" :disabled="isFetching">
     {{ isFetching ? "Refetching..." : "Refetch" }}
   </button>

diff --git a/examples/simple/src/Todos.vue b/examples/simple/src/Todos.vue
@@ -28,7 +28,9 @@ export default defineComponent({
 </script>
 
 <template>
-  <p>Turn on <b>network throttling</b> in dev-tools and press Refetch</p>
+  <p>
+    Turn on <strong>network throttling</strong> in dev-tools and press Refetch
+  </p>
   <button @click="refetch" :disabled="isFetching">
     {{ isFetching ? "Refetching..." : "Refetch" }}
   </button>

diff --git a/examples/suspense/src/App.vue b/examples/suspense/src/App.vue
@@ -16,7 +16,10 @@ export default defineComponent({
 
 <template>
   <h1>vue-query example</h1>
-  <p>Turn on <b>Slow 3G</b> or <b>Offline</b> in dev-tools and hit Refetch</p>
+  <p>
+    Turn on <strong>Slow 3G</strong> or <strong>Offline</strong> in dev-tools
+    and hit Refetch
+  </p>
   <Suspense>
     <template #default>
       <Content />

diff --git a/src/devtools/active-query-panel/Explorer.vue b/src/devtools/active-query-panel/Explorer.vue
@@ -251,11 +251,8 @@ export default defineComponent({
       )
     );
 
-    const expanded = this.expanded
-      ? this.subEntryPages.length === 1
-        ? singlePage
-        : multiPage
-      : undefined;
+    const page = this.subEntryPages?.length === 1 ? singlePage : multiPage;
+    const expanded = this.expanded ? page : undefined;
 
     const noPages = [
       h("span", { class: "expandable" }, this.label),

diff --git a/src/devtools/components/QueryOptions.vue b/src/devtools/components/QueryOptions.vue
@@ -136,6 +136,7 @@ export default defineComponent({
         )
       : undefined;
 
+    const sortDesc = this.options.sortDesc ? "⬇ Desc" : "⬆ Asc";
     const button = !this.options.filter
       ? h(
           "button",
@@ -155,7 +156,7 @@ export default defineComponent({
               click: this.onSortDescChange,
             },
           },
-          this.options.sortDesc ? "⬇ Desc" : "⬆ Asc"
+          sortDesc
         )
       : undefined;
 

diff --git a/src/devtools/utils.ts b/src/devtools/utils.ts
@@ -67,12 +67,13 @@ const queryHashSort: SortFn = (a, b) => (a.queryHash > b.queryHash ? 1 : -1);
 const dateSort: SortFn = (a, b) =>
   a.state.dataUpdatedAt < b.state.dataUpdatedAt ? 1 : -1;
 
-const statusAndDateSort: SortFn = (a, b) =>
-  getStatusRank(a) === getStatusRank(b)
-    ? dateSort(a, b)
-    : getStatusRank(a) > getStatusRank(b)
-    ? 1
-    : -1;
+const statusAndDateSort: SortFn = (a, b) => {
+  if (getStatusRank(a) === getStatusRank(b)) {
+    return dateSort(a, b);
+  }
+
+  return getStatusRank(a) > getStatusRank(b) ? 1 : -1;
+};
 
 export const sortFns: Record<string, SortFn> = {
   "Status > Last Updated": statusAndDateSort,

diff --git a/src/test-utils.ts b/src/test-utils.ts
@@ -46,9 +46,5 @@ export function successMutator<T>(param: T): Promise<T> {
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function errorMutator<T>(param: T): Promise<Error> {
-  return new Promise((resolve, reject) => {
-    setTimeout(() => {
-      return reject(new Error("Some error"));
-    }, 0);
-  });
+  return rejectFetcher();
 }
diff --git a/src/vue/useIsFetching.ts b/src/vue/useIsFetching.ts
@@ -30,8 +30,8 @@ export function useIsFetching(
   });
 
   watchEffect(() => {
-    const parsedFilters = parseFilterArgs(arg1, arg2);
-    filters.value = parsedFilters;
+    const parsedFiltersUpdate = parseFilterArgs(arg1, arg2);
+    filters.value = parsedFiltersUpdate;
   });
 
   onUnmounted(() => {

diff --git a/src/vue/useMutation.ts b/src/vue/useMutation.ts
@@ -105,8 +105,9 @@ export function useMutation<
     variables: TVariables,
     mutateOptions?: MutateOptions<TData, TError, TVariables, TContext>
   ) => {
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    observer.mutate(variables, mutateOptions).catch(() => {});
+    observer.mutate(variables, mutateOptions).catch(() => {
+      // This is intentional
+    });
   };
 
   watchEffect(() => {