datastake-daf 0.6.402 → 0.6.404

package/dist/components/index.js

@@ -46938,13 +46938,13 @@ const getType = namespace => {
   }
 };
 
-const defaultFilterKeys = ['search', 'sortDir', 'sortBy', 'timeframe', 'activeTab'];
+const defaultFilterKeys = ["search", "sortDir", "sortBy", "timeframe", "activeTab"];
 function hasJsonStructure(str) {
-  if (typeof str !== 'string') return false;
+  if (typeof str !== "string") return false;
   try {
     const result = JSON.parse(str);
     const type = Object.prototype.toString.call(result);
-    return type === '[object Object]' || type === '[object Array]';
+    return type === "[object Object]" || type === "[object Array]";
   } catch (err) {
     return false;
   }
@@ -46966,16 +46966,16 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
       }
     }
   });
-  if (params.has('searchParams')) {
+  if (params.has("searchParams")) {
     try {
-      o.searchParams = JSON.parse(params.get('searchParams'));
+      o.searchParams = JSON.parse(params.get("searchParams"));
     } catch (e) {
-      o.searchParams = params.get('searchParams').split(',');
+      o.searchParams = params.get("searchParams").split(",");
     }
   }
   if (doPagination) {
-    o.page = Number(params.get('page')) || 1;
-    o.pageSize = Number(params.get('pageSize')) || defaultPageSize;
+    o.page = Number(params.get("page")) || 1;
+    o.pageSize = Number(params.get("pageSize")) || defaultPageSize;
   }
   Object.keys(selectFiltersConfig).forEach(k => {
     if (params.has(k)) {
@@ -46988,7 +46988,8 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
-const filterParams = value => {
+const NEW_PAGINATION_APPS = ["nashiriki"];
+const filterParams = (value, module) => {
   const {
     activeFilters,
     ...rest
@@ -47004,8 +47005,8 @@ const filterParams = value => {
   } = activeFilters || {};
   const params = {};
   params.pagination = JSON.stringify({
-    skip: page,
-    take: pageSize
+    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
+    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
   });
   if (search && searchParams) {
     params.search = JSON.stringify({
@@ -47020,7 +47021,7 @@ const filterParams = value => {
     });
   }
   if (Object.keys(filters).length) {
-    if (value.sourceId && value.sourceId === 'overview') {
+    if (value.sourceId && value.sourceId === "overview") {
       params.filters = JSON.stringify(filters);
     } else {
       params.filters = JSON.stringify({

package/dist/hooks/index.js

@@ -12,13 +12,13 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var L__default = /*#__PURE__*/_interopDefaultLegacy(L);
 
-const defaultFilterKeys = ['search', 'sortDir', 'sortBy', 'timeframe', 'activeTab'];
+const defaultFilterKeys = ["search", "sortDir", "sortBy", "timeframe", "activeTab"];
 function hasJsonStructure(str) {
-  if (typeof str !== 'string') return false;
+  if (typeof str !== "string") return false;
   try {
     const result = JSON.parse(str);
     const type = Object.prototype.toString.call(result);
-    return type === '[object Object]' || type === '[object Array]';
+    return type === "[object Object]" || type === "[object Array]";
   } catch (err) {
     return false;
   }
@@ -40,16 +40,16 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
       }
     }
   });
-  if (params.has('searchParams')) {
+  if (params.has("searchParams")) {
     try {
-      o.searchParams = JSON.parse(params.get('searchParams'));
+      o.searchParams = JSON.parse(params.get("searchParams"));
     } catch (e) {
-      o.searchParams = params.get('searchParams').split(',');
+      o.searchParams = params.get("searchParams").split(",");
     }
   }
   if (doPagination) {
-    o.page = Number(params.get('page')) || 1;
-    o.pageSize = Number(params.get('pageSize')) || defaultPageSize;
+    o.page = Number(params.get("page")) || 1;
+    o.pageSize = Number(params.get("pageSize")) || defaultPageSize;
   }
   Object.keys(selectFiltersConfig).forEach(k => {
     if (params.has(k)) {

package/dist/utils/index.js

@@ -6045,13 +6045,13 @@ const editErrorHandler = ({
   }
 };
 
-const defaultFilterKeys = ['search', 'sortDir', 'sortBy', 'timeframe', 'activeTab'];
+const defaultFilterKeys = ["search", "sortDir", "sortBy", "timeframe", "activeTab"];
 function hasJsonStructure(str) {
-  if (typeof str !== 'string') return false;
+  if (typeof str !== "string") return false;
   try {
     const result = JSON.parse(str);
     const type = Object.prototype.toString.call(result);
-    return type === '[object Object]' || type === '[object Array]';
+    return type === "[object Object]" || type === "[object Array]";
   } catch (err) {
     return false;
   }
@@ -6073,16 +6073,16 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
       }
     }
   });
-  if (params.has('searchParams')) {
+  if (params.has("searchParams")) {
     try {
-      o.searchParams = JSON.parse(params.get('searchParams'));
+      o.searchParams = JSON.parse(params.get("searchParams"));
     } catch (e) {
-      o.searchParams = params.get('searchParams').split(',');
+      o.searchParams = params.get("searchParams").split(",");
     }
   }
   if (doPagination) {
-    o.page = Number(params.get('page')) || 1;
-    o.pageSize = Number(params.get('pageSize')) || defaultPageSize;
+    o.page = Number(params.get("page")) || 1;
+    o.pageSize = Number(params.get("pageSize")) || defaultPageSize;
   }
   Object.keys(selectFiltersConfig).forEach(k => {
     if (params.has(k)) {
@@ -6095,7 +6095,8 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
-const filterParams = value => {
+const NEW_PAGINATION_APPS = ["nashiriki"];
+const filterParams = (value, module) => {
   const {
     activeFilters,
     ...rest
@@ -6111,8 +6112,8 @@ const filterParams = value => {
   } = activeFilters || {};
   const params = {};
   params.pagination = JSON.stringify({
-    skip: page,
-    take: pageSize
+    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
+    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
   });
   if (search && searchParams) {
     params.search = JSON.stringify({
@@ -6127,7 +6128,7 @@ const filterParams = value => {
     });
   }
   if (Object.keys(filters).length) {
-    if (value.sourceId && value.sourceId === 'overview') {
+    if (value.sourceId && value.sourceId === "overview") {
       params.filters = JSON.stringify(filters);
     } else {
       params.filters = JSON.stringify({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.402",
+	"version": "0.6.404",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/utils/filters.js

@@ -1,106 +1,102 @@
-export const defaultFilterKeys = ['search', 'sortDir', 'sortBy', 'timeframe', 'activeTab'];
+export const defaultFilterKeys = ["search", "sortDir", "sortBy", "timeframe", "activeTab"];
 
 function hasJsonStructure(str) {
-  if (typeof str !== 'string') return false;
-  try {
-    const result = JSON.parse(str);
-    const type = Object.prototype.toString.call(result);
-    return type === '[object Object]'
-      || type === '[object Array]';
-  } catch (err) {
-    return false;
-  }
+	if (typeof str !== "string") return false;
+	try {
+		const result = JSON.parse(str);
+		const type = Object.prototype.toString.call(result);
+		return type === "[object Object]" || type === "[object Array]";
+	} catch (err) {
+		return false;
+	}
 }
 
-export const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, defaultFilters = {}, doPagination) => {
-  const o = {};
+export const getDefaultActiveFilters = (
+	params,
+	selectFiltersConfig,
+	defaultPageSize,
+	defaultFilters = {},
+	doPagination,
+) => {
+	const o = {};
 
-  defaultFilterKeys.forEach((k) => {
-    if (params.has(k)) {
-      if (hasJsonStructure(params.get(k))) {
-        o[k] = JSON.parse(params.get(k));
-      } else {
-        o[k] = params.get(k);
-      }
-    } else if (defaultFilters[k]) {
-      if (hasJsonStructure(defaultFilters[k])) {
-        o[k] = JSON.parse(defaultFilters[k]);
-      } else {
-        o[k] = defaultFilters[k];
-      }
-    }
-  });
+	defaultFilterKeys.forEach((k) => {
+		if (params.has(k)) {
+			if (hasJsonStructure(params.get(k))) {
+				o[k] = JSON.parse(params.get(k));
+			} else {
+				o[k] = params.get(k);
+			}
+		} else if (defaultFilters[k]) {
+			if (hasJsonStructure(defaultFilters[k])) {
+				o[k] = JSON.parse(defaultFilters[k]);
+			} else {
+				o[k] = defaultFilters[k];
+			}
+		}
+	});
 
-  if (params.has('searchParams')) {
-    try {
-      o.searchParams = JSON.parse(params.get('searchParams'))
-    } catch (e) {
-      o.searchParams = params.get('searchParams').split(',');
-    }
-  }
+	if (params.has("searchParams")) {
+		try {
+			o.searchParams = JSON.parse(params.get("searchParams"));
+		} catch (e) {
+			o.searchParams = params.get("searchParams").split(",");
+		}
+	}
 
-  if (doPagination) {
-    o.page = Number(params.get('page')) || 1;
-    o.pageSize = Number(params.get('pageSize')) || defaultPageSize;
-  }
+	if (doPagination) {
+		o.page = Number(params.get("page")) || 1;
+		o.pageSize = Number(params.get("pageSize")) || defaultPageSize;
+	}
 
-  Object.keys(selectFiltersConfig).forEach((k) => {
-    if (params.has(k)) {
-      if (hasJsonStructure(params.get(k))) {
-        o[k] = JSON.parse(params.get(k));
-      } else {
-        o[k] = params.get(k);
-      }
-    }
-  });
+	Object.keys(selectFiltersConfig).forEach((k) => {
+		if (params.has(k)) {
+			if (hasJsonStructure(params.get(k))) {
+				o[k] = JSON.parse(params.get(k));
+			} else {
+				o[k] = params.get(k);
+			}
+		}
+	});
 
-  return o;
-}
+	return o;
+};
 
-export const filterParams = (value) => {
-  const {
-    activeFilters,
-    ...rest
-  } = value;
+const NEW_PAGINATION_APPS = ["nashiriki"];
+export const filterParams = (value, module) => {
+	const { activeFilters, ...rest } = value;
 
-  const {
-    page,
-    pageSize,
-    sortDir,
-    sortBy,
-    search,
-    searchParams,
-    ...filters
-  } = activeFilters || {};
+	const { page, pageSize, sortDir, sortBy, search, searchParams, ...filters } =
+		activeFilters || {};
 
-  const params = {};
+	const params = {};
 
-  params.pagination = JSON.stringify({
-		skip: page,
-		take: pageSize,
-  });
+	params.pagination = JSON.stringify({
+		[NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
+		[NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize,
+	});
 
-  if (search && searchParams) {
-    params.search = JSON.stringify({
-      qs: search,
-      fields: searchParams,
-    });
-  }
+	if (search && searchParams) {
+		params.search = JSON.stringify({
+			qs: search,
+			fields: searchParams,
+		});
+	}
 
-  if (sortDir && sortBy) {
-    params.sort = JSON.stringify({
-      dir: sortDir,
-      by: sortBy,
-    });
-  }
+	if (sortDir && sortBy) {
+		params.sort = JSON.stringify({
+			dir: sortDir,
+			by: sortBy,
+		});
+	}
 
-  if (Object.keys(filters).length) {
-    if (value.sourceId && value.sourceId === 'overview') {
-      params.filters = JSON.stringify(filters);
-    } else {
-      params.filters = JSON.stringify({ ...filters, authorId: undefined });
-    }
-  }
+	if (Object.keys(filters).length) {
+		if (value.sourceId && value.sourceId === "overview") {
+			params.filters = JSON.stringify(filters);
+		} else {
+			params.filters = JSON.stringify({ ...filters, authorId: undefined });
+		}
+	}
 
-  return { ...rest, ...params };
-};
+	return { ...rest, ...params };
+};