atom-nuxt 1.4.10 → 1.4.13

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@atomengine/atom-nuxt",
   "configKey": "atomNuxt",
-  "version": "1.4.10",
+  "version": "1.4.13",
   "builder": {
     "@nuxt/module-builder": "1.0.1",
     "unbuild": "3.5.0"

package/dist/runtime/components/CrudPaginatedLoader.vue

@@ -4,7 +4,7 @@ import { useCrudConverters } from "../composables/useCrudConverters";
 import { usePreviousRoute } from "../composables/usePreviousRoute";
 import { useRoute, useRouter } from "#app";
 import CrudFilterList from "./CrudFilterList.vue";
-import { computed, ref, watch, onMounted, onBeforeUnmount, toRaw } from "vue";
+import { computed, ref, watch, onMounted, onBeforeUnmount, toRaw, nextTick } from "vue";
 import { useDebounceFn } from "@vueuse/core";
 import { useListenerService } from "../composables/useListenerService";
 import CrudFormDialog from "./CrudFormDialog.vue";
@@ -247,6 +247,7 @@ const dialogOpen = computed({
 const page = computed(() => props.loaderKey ? parseQuery(route.query[props.loaderKey])?.page ?? 1 : route.query.page ?? 1);
 const filterValues = props.loaderKey ? ref({ fromPaginatedLoader: true, ...props.customFilters, ...parseQuery(route.query[props.loaderKey]) }) : ref({ fromPaginatedLoader: true, ...props.customFilters, ...route.query });
 const isInitialLoad = ref(true);
+const isSanitizing = ref(false);
 const onQueryChange = (page2) => {
   console.error("QUERY CHANGED");
   const newQuery = {};
@@ -265,13 +266,6 @@ const onQueryChange = (page2) => {
   } else {
     finalQuery = newQuery;
   }
-  if (props.loaderKey) {
-    delete finalQuery[`${props.loaderKey}action`];
-    delete finalQuery[`${props.loaderKey}actionId`];
-  } else {
-    delete finalQuery.action;
-    delete finalQuery.actionId;
-  }
   console.error("Setting query", finalQuery);
   router.replace({ path: route.path, query: finalQuery, force: true });
 };
@@ -279,9 +273,32 @@ watch(currentPage, (newVal, oldValue) => {
   onQueryChange(currentPage.value);
 });
 watch(filterValues, (newVal, oldValue) => {
+  if (isSanitizing.value) return;
   console.error("FILTERS CHANGED");
   onQueryChange(1);
 }, { deep: true });
+watch(filters, (newFilters) => {
+  if (!newFilters || newFilters.length === 0) return;
+  isSanitizing.value = true;
+  newFilters.forEach((filter) => {
+    if (filter.type === "option" || filter.type === "multiOption") {
+      const currentValue = filterValues.value[filter.key];
+      if (!currentValue) return;
+      const validValues = filter.options?.map((opt) => opt.value) || [];
+      if (filter.type === "multiOption" && Array.isArray(currentValue)) {
+        const validatedValue = currentValue.filter((v) => validValues.includes(v));
+        if (validatedValue.length !== currentValue.length) {
+          filterValues.value[filter.key] = validatedValue.length > 0 ? validatedValue : [];
+        }
+      } else if (filter.type === "option" && !validValues.includes(currentValue)) {
+        filterValues.value[filter.key] = null;
+      }
+    }
+  });
+  nextTick(() => {
+    isSanitizing.value = false;
+  });
+});
 watch(() => page, () => {
   console.error("ROUTE CHANGED");
   debouncedGet();

package/dist/runtime/composables/useCrudApi.js

@@ -20,6 +20,7 @@ export const useCrudApi = (path, watchPage = true, transformItem = null, transfo
   const atomNuxtConfig = useRuntimeConfig().public.atomNuxt;
   const { stringifyQuery, flattenQuery, cloneDeep } = useCrudConverters();
   const { setAlertMessage } = useAlertService();
+  let currentAbortController = null;
   if (atomNuxtConfig.azureAdB2C) {
     setCrudHeadersGenerator(async () => {
       const { acquireTokensSilent } = useMSAuth();
@@ -119,6 +120,12 @@ export const useCrudApi = (path, watchPage = true, transformItem = null, transfo
       }
       return responseBody;
     } catch (error) {
+      if (error.name === "AbortError") {
+        if (atomNuxtConfig.debug) {
+          console.log("Request aborted:", error);
+        }
+        return null;
+      }
       if (error.status === 401 && crudOnUnauthenticated) {
         await crudOnUnauthenticated();
       }
@@ -130,6 +137,11 @@ export const useCrudApi = (path, watchPage = true, transformItem = null, transfo
     }
   };
   const getItems = async (page = null, perPageLimit = null, filterValues = null, headers = {}) => {
+    if (currentAbortController) {
+      currentAbortController.abort();
+    }
+    currentAbortController = new AbortController();
+    const signal = currentAbortController.signal;
     let pageToFetch = page ? page : currentPage.value;
     let perPageToFetch = perPageLimit ? perPageLimit : perPage.value;
     let parameters = stringifyQuery({ page: pageToFetch, limit: perPageToFetch }, "?");
@@ -144,9 +156,13 @@ export const useCrudApi = (path, watchPage = true, transformItem = null, transfo
       headers: {
         ...atomNuxtConfig.additionalHeaders,
         ...headers
-      }
+      },
+      signal
     };
     const responseData = await fetchRequest(url, options, listPending, listErrors);
+    if (!responseData) {
+      return;
+    }
     if (responseData.currentPage) {
       if (transformItems) {
         responseData.items = transformItems(responseData.items);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom-nuxt",
-  "version": "1.4.10",
+  "version": "1.4.13",
   "description": "My new Nuxt module",
   "repository": "atomengine/atom-nuxt",
   "license": "MIT",