@znap/components-vue2 1.1.2 → 1.1.3

package/dist/index.common.js

@@ -50722,8 +50722,11 @@ class CrudViewConfigs {
     };
   }
   validateFiltersKeyHaveChange(filters, currentFilters, keysToValidate = ["search", "primary", "secondary"]) {
+    const filtersToCheck = this.getCurrentFilters(filters);
     return keysToValidate.some(key => {
-      if (Array.isArray(filters[key])) return filters[key].some((filter, index) => filter.value !== currentFilters[key][index] && filter?.type !== "display");
+      if (Array.isArray(filters[key])) {
+        return filtersToCheck[key].some((filterValue, index) => filterValue !== currentFilters[key][index]);
+      }
       return filters[key] !== currentFilters[key];
     });
   }
@@ -50861,30 +50864,63 @@ class CrudViewConfigs {
     this.currentFilters.search = filters.search;
     return this.currentFilters;
   }
-  async fetchTableOptionsData(tableOptions = [], httpFetcher) {
+  getCurrentFilters(filters) {
+    const currentFilters = {
+      primary: [],
+      secondary: [],
+      search: ""
+    };
+    filters?.primary?.forEach(tab => {
+      tab.filters.forEach(filter => {
+        if (filter?.type === "display") return;
+        currentFilters.primary.push(filter.value);
+      });
+    });
+    filters?.secondary?.forEach(tab => {
+      tab.filters.forEach(filter => {
+        if (filter?.type === "display") return;
+        currentFilters.secondary.push(filter.value);
+      });
+    });
+    currentFilters.search = filters.search;
+    return currentFilters;
+  }
+  async fetchTableOption(tableOption, httpFetcher) {
+    if (!tableOption.endpoint?.length || !tableOption?.endpoint[0]) return;
+    try {
+      const response = await httpFetcher.post(tableOption.endpoint[0], tableOption.endpoint[1] ?? {});
+      tableOption.items = response?.data?.rows ?? [];
+    } catch (error) {
+      console.error(error);
+    }
+  }
+  async fetchTableOptionsData(tableOptions, httpFetcher) {
     const optionsPromises = [];
     tableOptions.forEach(option => {
-      if (!option.endpoint?.length || !option?.endpoint[0]) return optionsPromises.push(null);
       if (option?.ignoreOnFetchFunction) return optionsPromises.push(null);
-      optionsPromises.push(httpFetcher.post(option.endpoint[0], option.endpoint[1] ?? null));
-    });
-    const optionsData = await Promise.all(optionsPromises);
-    optionsData.forEach((option, index) => {
-      tableOptions[index].items = option?.data?.rows ?? [];
+      optionsPromises.push(this.fetchTableOption(option, httpFetcher));
     });
+    await Promise.all(optionsPromises);
   }
-  async fetchFormOptionsData(formOptions = [], httpFetcher) {
+  async fetchFormOption(formOption, httpFetcher) {
+    if (!formOption.endpoint?.length || !formOption?.endpoint[0]) return;
+    try {
+      formOption.loading = true;
+      const response = await httpFetcher.post(formOption.endpoint[0], formOption.endpoint[1] ?? {});
+      formOption.items = response?.data?.rows ?? [];
+    } catch (error) {
+      console.error(error);
+    } finally {
+      formOption.loading = false;
+    }
+  }
+  async fetchFormOptionsData(formOptions, httpFetcher) {
     const optionsPromises = [];
     formOptions.forEach(option => {
-      option.loading = true;
-      if (!option.endpoint?.length || option?.ignoreOnFetchFunction) return optionsPromises.push(null);
-      optionsPromises.push(httpFetcher.post(option.endpoint[0], option.endpoint[1] ?? null));
-    });
-    const optionsData = await Promise.all(optionsPromises);
-    optionsData.forEach((option, index) => {
-      formOptions[index].items = option?.data?.rows ?? [];
-      formOptions[index].loading = false;
+      if (option.ignoreOnFetchFunction) return;
+      optionsPromises.push(this.fetchFormOption(option, httpFetcher));
     });
+    await Promise.all(optionsPromises);
   }
   async fetchFilter(filter, httpFetcher) {
     if (!filter.endpoint?.length || !filter.endpoint[0]) return;