@controleonline/ui-default 1.0.280 → 1.0.282

package/src/store/default/actions.js

@@ -1,5 +1,5 @@
-import {api} from '@controleonline/ui-common/src/api';
-import localDB from '@controleonline/ui-common/src/api/localDB';
+import {api} from '@controleonline/ui-common/src/api';
+import localDB from '@controleonline/ui-common/src/api/localDB';
 import {queue} from '@controleonline/ui-common/src/api/queue';
 import * as types from '@controleonline/ui-default/src/store/default/mutation_types';
 
@@ -150,23 +150,23 @@ const commitStoreError = (commit, error, storeMeta) => {
     buildStoreErrorCommitOptions(storeMeta),
   )
 }
-
-export const executeQueue = ({commit, getters}, func, callback) => {
-  queue.executeQueue(func, callback);
-};
-
-export const addToQueue = ({commit, getters}, func) => {
-  queue.addToQueue(func);
-};
-export const initQueue = ({commit, getters}, func) => {
-  queue.initQueue(func);
-  return queue;
-};
-
+
+export const executeQueue = ({commit, getters}, func, callback) => {
+  queue.executeQueue(func, callback);
+};
+
+export const addToQueue = ({commit, getters}, func) => {
+  queue.addToQueue(func);
+};
+export const initQueue = ({commit, getters}, func) => {
+  queue.initQueue(func);
+  return queue;
+};
+
 export const saveOffline = ({commit, getters}, data) => {
   return;
 };
-
+
 export const getOfflineItems = ({commit, getters}, params = {}) => {
   const {storeMeta} = splitStoreActionPayload(params)
   commit(types.SET_ISLOADING, true);
@@ -175,26 +175,26 @@ export const getOfflineItems = ({commit, getters}, params = {}) => {
   commit(types.SET_DEBUG, {});
 
   db = new localDB(getters);
-
-  return db
-    .getItemsByFilters()
-    .then(async data => {
-      if (!data || (Array.isArray(data) && data.length === 0))
-        return getOnlineItems({commit, getters}, params).then(data => {
-          commit(types.SET_ITEM, data);
-          if (getters.offline) saveOffline({commit, getters}, data);
-          return data;
-        });
-    })
+
+  return db
+    .getItemsByFilters()
+    .then(async data => {
+      if (!data || (Array.isArray(data) && data.length === 0))
+        return getOnlineItems({commit, getters}, params).then(data => {
+          commit(types.SET_ITEM, data);
+          if (getters.offline) saveOffline({commit, getters}, data);
+          return data;
+        });
+    })
     .catch(e => {
       commitStoreError(commit, e, storeMeta)
       throw e;
     })
-    .finally(() => {
-      commit(types.SET_ISLOADING, false);
-    });
-};
-
+    .finally(() => {
+      commit(types.SET_ISLOADING, false);
+    });
+};
+
 export const getOnlineItems = ({commit, getters}, params = {}) => {
   const {payload: requestParams, storeMeta} = splitStoreActionPayload(params)
   const {append: shouldAppend = false, ...queryParams} = isPlainObject(requestParams)
@@ -206,11 +206,12 @@ export const getOnlineItems = ({commit, getters}, params = {}) => {
     params: queryParams,
   })
 
+  const preserveQuery = storeMeta.preserveItems === true && getters.lastCompletedRequest?.requestKey === requestKey
   commit(types.SET_ACTIVE_REQUEST_KEY, requestKey)
-  commit(types.SET_ISLOADING, true);
-  commit(types.SET_ISLOADINGLIST, true)
+  commit(types.SET_ISLOADING, !preserveQuery);
+  commit(types.SET_ISLOADINGLIST, !preserveQuery)
   commit(types.SET_ERROR, null);
-  if (!shouldAppend) {
+  if (!shouldAppend && !preserveQuery) {
     if (getters.items != null) commit(types.SET_ITEMS, []);
     commit(types.SET_TOTALITEMS, 0);
     commit(types.SET_SUMMARY, {});
@@ -262,12 +263,12 @@ export const getOnlineItems = ({commit, getters}, params = {}) => {
       }
     });
 };
-
-export const getItems = ({commit, getters}, params = {}) => {
-  //if (getters.offline) return getOfflineItems({commit, getters}, params); else
-  return getOnlineItems({commit, getters}, params);
-};
-
+
+export const getItems = ({commit, getters}, params = {}) => {
+  //if (getters.offline) return getOfflineItems({commit, getters}, params); else
+  return getOnlineItems({commit, getters}, params);
+};
+
 export const get = ({commit, getters}, id) => {
   const {payload: requestId, storeMeta} = splitStoreActionPayload(id)
   const normalizedId = String(requestId?.id ?? requestId ?? '').replace(/\D/g, '')
@@ -359,15 +360,15 @@ export const remove = ({commit, getters}, id) => {
     .then(() => {
       commit(types.SET_ERROR, null);
       let items = getters.items ? [...getters.items] : [];
-      const index = items.findIndex(i => {
-        if (i && i['@id']) return i['@id'].toString().replace(/\D/g, '') === id;
-      });
-
-      if (index >= 0) items.splice(index, 1);
-      else items = [];
-      commit(types.SET_ITEMS, items);
-      return;
-    })
+      const index = items.findIndex(i => {
+        if (i && i['@id']) return i['@id'].toString().replace(/\D/g, '') === id;
+      });
+
+      if (index >= 0) items.splice(index, 1);
+      else items = [];
+      commit(types.SET_ITEMS, items);
+      return;
+    })
     .catch(e => {
       commitStoreError(commit, e, storeMeta)
       throw e;
@@ -375,39 +376,39 @@ export const remove = ({commit, getters}, id) => {
     .finally(() => {
       commit(types.SET_ISSAVING, false);
     });
-};
-
-export const setFilters = ({commit, getters}, params) => {
-  commit(types.SET_FILTERS, params);
-};
-
-export const setItem = ({commit, getters}, params) => {
-  commit(types.SET_ITEM, params);
-};
-
-export const setItems = ({commit, getters}, params) => {
-  commit(types.SET_ITEMS, params);
-};
-
-export const setPrint = ({commit, getters}, params) => {
-  commit(types.SET_PRINT, params);
-};
-
-export const setReload = ({commit, getters}, reload) => {
-  commit(types.SET_RELOAD, reload);
-};
-
-export const setError = ({commit, getters}, error) => {
-  commit(types.SET_ERROR, error);
-};
-
-export const setIsSaving = ({commit, getters}, IsSaving) => {
-  commit(types.SET_ISSAVING, IsSaving);
-};
-export const setIsLoading = ({commit, getters}, IsLoading) => {
-  commit(types.SET_ISLOADING, IsLoading);
-};
-
+};
+
+export const setFilters = ({commit, getters}, params) => {
+  commit(types.SET_FILTERS, params);
+};
+
+export const setItem = ({commit, getters}, params) => {
+  commit(types.SET_ITEM, params);
+};
+
+export const setItems = ({commit, getters}, params) => {
+  commit(types.SET_ITEMS, params);
+};
+
+export const setPrint = ({commit, getters}, params) => {
+  commit(types.SET_PRINT, params);
+};
+
+export const setReload = ({commit, getters}, reload) => {
+  commit(types.SET_RELOAD, reload);
+};
+
+export const setError = ({commit, getters}, error) => {
+  commit(types.SET_ERROR, error);
+};
+
+export const setIsSaving = ({commit, getters}, IsSaving) => {
+  commit(types.SET_ISSAVING, IsSaving);
+};
+export const setIsLoading = ({commit, getters}, IsLoading) => {
+  commit(types.SET_ISLOADING, IsLoading);
+};
+
 export const setTotalItems = ({commit, getters}, totalItems) => {
   commit(types.SET_TOTALITEMS, totalItems);
 };
@@ -425,20 +426,20 @@ export const setConfigs = ({commit, getters}, configs) => {
 };
 
 export const setResourceEndpoint = (
-  {commit, getters},
-  resourceEndpoint = null,
-) => {
-  commit(types.SET_RESOURCE_ENDPOINT, resourceEndpoint);
-};
-
-export const setSelected = ({commit, getters}, selected) => {
-  commit(types.SET_SELECTED, selected);
-};
-
-export const setMessage = ({commit, getters}, message) => {
-  commit(types.SET_MESSAGE, message);
-};
-
+  {commit, getters},
+  resourceEndpoint = null,
+) => {
+  commit(types.SET_RESOURCE_ENDPOINT, resourceEndpoint);
+};
+
+export const setSelected = ({commit, getters}, selected) => {
+  commit(types.SET_SELECTED, selected);
+};
+
+export const setMessage = ({commit, getters}, message) => {
+  commit(types.SET_MESSAGE, message);
+};
+
 export const setMessages = ({commit, getters}, messages) => {
   commit(types.SET_MESSAGES, messages);
 };
@@ -461,22 +462,22 @@ export const setLastCompletedRequest = (
 ) => {
   commit(types.SET_LAST_COMPLETED_REQUEST, lastCompletedRequest);
 };
-
-export const setVisibleColumns = ({commit, getters}, visibleColumns) => {
-  commit(types.SET_VISIBLECOLUMNS, visibleColumns);
-};
-
-export const setIsLoadingList = ({commit, getters}, isLoadingList) => {
-  commit(types.SET_ISLOADINGLIST, isLoadingList);
-};
-
-export const setStore = ({commit, getters}, store) => {
-  commit(types.SET_STORE, store);
-};
-
-export const setOffline = ({commit, getters}, offline) => {
-  commit(types.SET_OFFLINE, offline);
-};
-export const setPayable = ({commit, getters}, payable) => {
-  commit(types.SET_PAYABLE, payable);
-};
+
+export const setVisibleColumns = ({commit, getters}, visibleColumns) => {
+  commit(types.SET_VISIBLECOLUMNS, visibleColumns);
+};
+
+export const setIsLoadingList = ({commit, getters}, isLoadingList) => {
+  commit(types.SET_ISLOADINGLIST, isLoadingList);
+};
+
+export const setStore = ({commit, getters}, store) => {
+  commit(types.SET_STORE, store);
+};
+
+export const setOffline = ({commit, getters}, offline) => {
+  commit(types.SET_OFFLINE, offline);
+};
+export const setPayable = ({commit, getters}, payable) => {
+  commit(types.SET_PAYABLE, payable);
+};

package/src/tests/react/components/table/defaultTableTestSetup.cjs

@@ -73,6 +73,7 @@ jest.mock('react-native', () => {
 
   return {
     FlatList,
+    KeyboardAvoidingView: createComponent('KeyboardAvoidingView'),
     Modal: createComponent('Modal'),
     Platform: {
       OS: 'web',