sprintify-ui 0.6.72 → 0.6.73

package/dist/types/src/utils/getApiData.d.ts

@@ -0,0 +1,2 @@
+import { Collection, PaginatedCollection, ResourceCollection } from "@/types";
+export declare function getItems(data: Collection | PaginatedCollection | ResourceCollection | null): Collection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sprintify-ui",
-  "version": "0.6.72",
+  "version": "0.6.73",
   "scripts": {
     "build": "rimraf dist && vue-tsc && vite build",
     "build-fast": "rimraf dist && vite build",

package/src/components/BaseHasMany.vue

@@ -50,6 +50,7 @@ import { config } from '@/index';
 import { PropType } from 'vue';
 import BaseTagAutocompleteFetch from './BaseTagAutocompleteFetch.vue';
 import { AxiosResponse } from 'axios';
+import { getItems } from '@/utils/getApiData';
 
 const props = defineProps({
   modelValue: {
@@ -128,34 +129,25 @@ watch(
 
 watch(
   () => props.modelValue,
-  debounce(() => fetchModels(), 300),
+  debounce(() => fetchModels(), 200),
   { immediate: true }
 );
 
 function fetchModels() {
 
-  console.log('check if currentModels is undefined');
-
   if (props.currentModels !== undefined) {
     return;
   }
 
-  console.log('check if showRouteUrl is empty');
-
-  if (props.showRouteUrl == null) {
+  if (props.showRouteUrl == undefined) {
     return;
   }
 
-  console.log('check if modelValue is empty');
-
   if (!props.modelValue) {
     models.value = [];
     return;
   }
 
-  console.log('check models');
-
-
   // Do not fetch if the modelValue is the same as the local models
 
   const ids = props.modelValue.map((id: number | string) => id.toString());
@@ -166,12 +158,13 @@ function fetchModels() {
     return;
   }
 
-  console.log('fetch models');
-
   http
     .get(props.showRouteUrl(ids))
     .then((response: AxiosResponse) => {
-      models.value = response.data.data.filter((i: any) => {
+
+      const items = getItems(response.data);
+
+      models.value = items.filter((i: any) => {
         return ids.includes(i[props.primaryKey]);
       });
     })

package/src/composables/paginatedData.ts

@@ -6,18 +6,13 @@ import {
   PaginationMetadata,
 } from '@/types';
 import { isArray } from 'lodash';
+import { getItems } from '@/utils/getApiData';
 
 export function useHasPaginatedData(
   data: Ref<Collection | PaginatedCollection | ResourceCollection | null>
 ) {
   const items = computed(() => {
-    if (!data.value) {
-      return [];
-    }
-    if (isArray(data.value)) {
-      return data.value;
-    }
-    return data.value.data;
+    return getItems(data.value);
   });
 
   const paginationMetadata = computed<PaginationMetadata | null>(() => {

package/src/utils/getApiData.ts

@@ -0,0 +1,12 @@
+import { Collection, PaginatedCollection, ResourceCollection } from "@/types";
+import { isArray } from "lodash";
+
+export function getItems(data: Collection | PaginatedCollection | ResourceCollection | null) {
+    if (!data) {
+        return [];
+    }
+    if (isArray(data)) {
+        return data;
+    }
+    return data.data;
+}