datastake-daf 0.6.827 → 0.6.829

package/dist/components/index.js

@@ -25059,13 +25059,6 @@ const Content$1 = _ref => {
       }
       return all;
     }, {});
-    console.log({
-      groups,
-      singleGroupsKeys,
-      addedContent,
-      _length,
-      groupped
-    });
     return Object.keys(groupped).map(key => {
       const groups = groupped[key];
       return /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
@@ -45278,7 +45271,7 @@ const filtersConfig$e = {
   datastakeId: '',
   name: ''
 };
-const selectFiltersConfig$e = {
+const selectFiltersConfig$d = {
   country: {
     type: 'select',
     label: 'Country',
@@ -46055,7 +46048,7 @@ function DataStoreTable$1(_ref) {
     goNext,
     setPagination
   } = useFilters({
-    selectFiltersConfig: selectFiltersConfig$e,
+    selectFiltersConfig: selectFiltersConfig$d,
     view,
     goTo,
     location,
@@ -46149,7 +46142,7 @@ function DataStoreTable$1(_ref) {
           rowKey: "key",
           doEmptyRows: true,
           selectOptions,
-          filtersConfig: selectFiltersConfig$e,
+          filtersConfig: selectFiltersConfig$d,
           onFilterChange: onFiltersChange,
           showFilters,
           defaultFilters,
@@ -53935,7 +53928,7 @@ const checkboxConfig$d = {
   name: "Name",
   datastakeId: "ID"
 };
-const selectFiltersConfig$d = {
+const selectFiltersConfig$c = {
   account: {
     type: "select",
     label: "Account",
@@ -54019,6 +54012,16 @@ const useGetQueryParams = ({
       product,
       ...rest
     } = queryParams;
+    const parsedSearchParams = safeJsonParse(rawSearchParams);
+    const otherParams = {
+      ...rest,
+      ...(product ? {
+        "products.typeOfProduct": product
+      } : {}),
+      ...(status ? {
+        published: status === "submitted"
+      } : {})
+    };
     return {
       paginationQuery: {
         skip: page,
@@ -54026,21 +54029,13 @@ const useGetQueryParams = ({
       },
       searchParams: {
         qs: search,
-        fields: safeJsonParse(rawSearchParams)
-      },
-      otherParams: {
-        ...rest,
-        ...(product && {
-          "products.typeOfProduct": product
-        }),
-        ...(status && {
-          published: status === "submitted" ? true : false
-        })
+        fields: parsedSearchParams
       },
+      otherParams,
       sortBy,
       sortDir
     };
-  }, [queryParams]);
+  }, [JSON.stringify(queryParams)]);
   return params;
 };
 
@@ -54103,7 +54098,6 @@ function useAdminTable({
       const params = filterParams({
         activeFilters: filter.activeFilters
       });
-      console.log(params, "params");
       const {
         data
       } = await getData({
@@ -54156,9 +54150,6 @@ const useGetParams = ({
     activeTab,
     ...rest
   } = otherParams;
-  console.log({
-    hasPagination
-  });
   const params = React.useMemo(() => {
     if (!hasPagination) {
       return {
@@ -54281,7 +54272,7 @@ function UserTable(_ref) {
   } = useAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$d,
+    selectFiltersConfig: selectFiltersConfig$c,
     view: view$2,
     defaultUrlParams: defaultUrlParams$6,
     module,
@@ -54363,7 +54354,7 @@ function UserTable(_ref) {
         pagination: filter.pagination,
         selectOptions: selectOptions,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$d,
+        filtersConfig: selectFiltersConfig$c,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -54691,7 +54682,7 @@ const checkboxConfig$c = {
   name: "Name",
   datastakeId: "ID"
 };
-const selectFiltersConfig$c = {
+const selectFiltersConfig$b = {
   type: {
     type: "select",
     label: "Type",
@@ -55030,7 +55021,7 @@ function AccountTable(_ref) {
   } = useAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$c,
+    selectFiltersConfig: selectFiltersConfig$b,
     view: view$1,
     defaultUrlParams: defaultUrlParams$5,
     module,
@@ -55158,7 +55149,7 @@ function AccountTable(_ref) {
         doEmptyRows: true,
         selectOptions: selectOptions,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$c,
+        filtersConfig: selectFiltersConfig$b,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -55194,7 +55185,7 @@ function AccountTable(_ref) {
   });
 }
 
-const selectFiltersConfig$b = {
+const selectFiltersConfig$a = {
   category: {
     type: "select",
     label: "Category",
@@ -55858,7 +55849,7 @@ function LocationTable(_ref) {
   } = useSubjectsAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$b,
+    selectFiltersConfig: selectFiltersConfig$a,
     view,
     defaultUrlParams: defaultUrlParams$4,
     module,
@@ -55940,7 +55931,7 @@ function LocationTable(_ref) {
         selectOptions: selectOptions,
         doEmptyRows: true,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$b,
+        filtersConfig: selectFiltersConfig$a,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -55970,7 +55961,7 @@ function LocationTable(_ref) {
   });
 }
 
-const selectFiltersConfig$a = {
+const selectFiltersConfig$9 = {
   category: {
     type: "select",
     label: "Category",
@@ -56535,7 +56526,7 @@ function SubjectsTable(_ref) {
   } = useSubjectsAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$a,
+    selectFiltersConfig: selectFiltersConfig$9,
     view,
     defaultUrlParams: defaultUrlParams$3,
     module,
@@ -56616,7 +56607,7 @@ function SubjectsTable(_ref) {
         selectOptions: selectOptions,
         doEmptyRows: true,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$a,
+        filtersConfig: selectFiltersConfig$9,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -57143,7 +57134,7 @@ const getColumns$2 = ({
   return cols.filter(v => v.show);
 };
 const checkboxConfig$9 = {};
-const selectFiltersConfig$9 = {
+const selectFiltersConfig$8 = {
   userRole: {
     type: "select",
     label: "Role",
@@ -57219,7 +57210,7 @@ function Users({
   } = useFilters({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$9,
+    selectFiltersConfig: selectFiltersConfig$8,
     defaultUrlParams: defaultUrlParams$2,
     module,
     filtersConfig: filtersConfig$9,
@@ -57317,7 +57308,7 @@ function Users({
         selectOptions: selectOptions,
         setShowFilters: setShowFilters,
         sourcesKey: "authorId",
-        filtersConfig: selectFiltersConfig$9,
+        filtersConfig: selectFiltersConfig$8,
         onFilterChange: onFiltersChange,
         showFilters: showFilters,
         defaultFilters: defaultFilters,
@@ -57904,10 +57895,15 @@ function AdminView(_ref) {
             })
           });
           try {
-            await updateAccount({
+            const {
+              data
+            } = await updateAccount({
               id: editData.id,
               data: newData
             });
+            console.log({
+              data
+            });
             console.log('Checking for pending users...', {
               hasPendingUsers: pendingUsers.length > 0,
               hasInviteFunction: !!inviteCompanyAccount,
@@ -58627,7 +58623,7 @@ function AdminLocationScreen$1({
   });
 }
 
-const selectFiltersConfig$8 = {
+const selectFiltersConfig$7 = {
   category: {
     type: "select",
     label: "Category",
@@ -58818,7 +58814,7 @@ function DocumentsTable({
   } = useSubjectsAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$8,
+    selectFiltersConfig: selectFiltersConfig$7,
     view,
     defaultUrlParams: defaultUrlParams$1,
     module,
@@ -58905,7 +58901,7 @@ function DocumentsTable({
         selectOptions: selectOptions,
         doEmptyRows: true,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$8,
+        filtersConfig: selectFiltersConfig$7,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -58970,46 +58966,24 @@ function AdminLocationScreen({
   });
 }
 
-const selectFiltersConfig$7 = {
-  category: {
-    type: "select",
-    label: "Category",
-    placeholder: t => t("Category"),
-    style: {
-      flex: 1
-    },
-    labelStyle: {
-      flex: 1
-    },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  },
-  country: {
-    type: "select",
-    label: "Country",
-    placeholder: t => t("Country"),
-    style: {
-      flex: 1
-    },
-    labelStyle: {
-      flex: 1
-    },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  },
-  sources: {
-    type: "select",
-    label: "Sources",
-    placeholder: t => t("Sources"),
-    style: {
-      flex: 1
-    },
-    labelStyle: {
-      flex: 1
-    },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  }
+const getSelectFiltersConfig = ({
+  t
+}) => {
+  return {
+    eventsType: {
+      type: "select",
+      label: "type",
+      placeholder: t("type"),
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    }
+  };
 };
 const filtersConfig$7 = {
   name: "",
@@ -59170,6 +59144,11 @@ function EventsTable({
   const {
     token
   } = useToken();
+  const selectFiltersConfig = React.useMemo(() => {
+    return getSelectFiltersConfig({
+      t
+    });
+  }, [t]);
   const {
     filter,
     activeTab,
@@ -59182,7 +59161,7 @@ function EventsTable({
   } = useSubjectsAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$7,
+    selectFiltersConfig,
     view,
     defaultUrlParams,
     module,
@@ -59266,7 +59245,7 @@ function EventsTable({
         selectOptions: selectOptions,
         doEmptyRows: true,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$7,
+        filtersConfig: selectFiltersConfig,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -59342,9 +59321,6 @@ function getAdminRoutes(config) {
     userIsAdmin
   } = config;
   const APP_PREFIX = "APP_".concat(appName.toUpperCase());
-  console.log({
-    useAdminEventsConfig
-  });
   function DashboardWrapper() {
     const dashboardConfig = useAdminDashboardConfig();
     return /*#__PURE__*/jsxRuntime.jsx(AdminDashboardScreen, {

package/dist/hooks/index.js

@@ -2292,7 +2292,7 @@ const useWidgetFetch = ({
   };
   React.useEffect(() => {
     fetchData();
-  }, [config]);
+  }, [JSON.stringify(rest?.filters)]);
   return {
     data,
     loading,
@@ -2399,6 +2399,16 @@ const useGetQueryParams = ({
       product,
       ...rest
     } = queryParams;
+    const parsedSearchParams = safeJsonParse(rawSearchParams);
+    const otherParams = {
+      ...rest,
+      ...(product ? {
+        "products.typeOfProduct": product
+      } : {}),
+      ...(status ? {
+        published: status === "submitted"
+      } : {})
+    };
     return {
       paginationQuery: {
         skip: page,
@@ -2406,21 +2416,13 @@ const useGetQueryParams = ({
       },
       searchParams: {
         qs: search,
-        fields: safeJsonParse(rawSearchParams)
-      },
-      otherParams: {
-        ...rest,
-        ...(product && {
-          "products.typeOfProduct": product
-        }),
-        ...(status && {
-          published: status === "submitted" ? true : false
-        })
+        fields: parsedSearchParams
       },
+      otherParams,
       sortBy,
       sortDir
     };
-  }, [queryParams]);
+  }, [JSON.stringify(queryParams)]);
   return params;
 };
 

package/dist/pages/index.js

@@ -7491,7 +7491,7 @@ const useWidgetFetch = ({
   };
   React.useEffect(() => {
     fetchData();
-  }, [config]);
+  }, [JSON.stringify(rest?.filters)]);
   return {
     data,
     loading,
@@ -40577,6 +40577,16 @@ const useGetQueryParams = ({
       product,
       ...rest
     } = queryParams;
+    const parsedSearchParams = safeJsonParse(rawSearchParams);
+    const otherParams = {
+      ...rest,
+      ...(product ? {
+        "products.typeOfProduct": product
+      } : {}),
+      ...(status ? {
+        published: status === "submitted"
+      } : {})
+    };
     return {
       paginationQuery: {
         skip: page,
@@ -40584,21 +40594,13 @@ const useGetQueryParams = ({
       },
       searchParams: {
         qs: search,
-        fields: safeJsonParse(rawSearchParams)
-      },
-      otherParams: {
-        ...rest,
-        ...(product && {
-          "products.typeOfProduct": product
-        }),
-        ...(status && {
-          published: status === "submitted" ? true : false
-        })
+        fields: parsedSearchParams
       },
+      otherParams,
       sortBy,
       sortDir
     };
-  }, [queryParams]);
+  }, [JSON.stringify(queryParams)]);
   return params;
 };
 
@@ -41564,7 +41566,7 @@ const getFilterOptions$c = (options, t) => {
 const formConfig$a = {
   namespace: 'OPERATOR',
   view: ['scoping', 'new'],
-  scope: 'global',
+  scope: 'createOperator',
   formType: 'operator'
 };
 const viewConfig$a = {
@@ -41991,7 +41993,7 @@ const getFilterOptions$b = (options, t) => {
 const formConfig$9 = {
   namespace: 'WORKERS',
   view: ['scoping', 'new'],
-  scope: 'global',
+  scope: 'createWorker',
   formType: 'worker'
 };
 const viewConfig$9 = {
@@ -44636,7 +44638,7 @@ const getFilterOptions$4 = (options, t) => {
 const formConfig$2 = {
   namespace: 'PRODUCTION SITES',
   view: ['scoping', 'new'],
-  scope: 'global',
+  scope: 'create',
   formType: 'production-sites'
 };
 const viewConfig$2 = {
@@ -45491,6 +45493,7 @@ const useFetchData = ({
   } = useGetQueryParams({
     location
   });
+  const prevParamsRef = React.useRef();
   React.useEffect(() => {
     const cleanSearchParams = Object.fromEntries(Object.entries(searchParams).filter(([_, value]) => value != null && value !== ''));
     const hasPagination = paginationQuery.skip != null || paginationQuery.take != null;
@@ -45499,7 +45502,7 @@ const useFetchData = ({
     }
     const extendingSortKey = extendingFilters?.sortBy ? Object.keys(extendingFilters.sortBy)[0] : null;
     const extendingSortDir = extendingFilters?.sortBy && extendingSortKey ? extendingFilters.sortBy[extendingSortKey] : null;
-    getData({
+    const currentParams = {
       ...extendingFilters,
       pagination: paginationQuery,
       ...(Object.keys(otherParams).length > 0 && otherParams),
@@ -45510,8 +45513,14 @@ const useFetchData = ({
       sortBy: {
         [sortBy || extendingSortKey || "updatedAt"]: sortDir ? sortDir === "ascend" ? 1 : -1 : extendingSortDir || -1
       }
-    }, subject);
-  }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+    };
+    const currentParamsString = JSON.stringify(currentParams);
+    if (prevParamsRef.current === currentParamsString) {
+      return;
+    }
+    prevParamsRef.current = currentParamsString;
+    getData(currentParams, subject);
+  }, [location.search, JSON.stringify(extendingFilters), activeTab]);
 };
 const useTablePage = ({
   subject,
@@ -50657,13 +50666,6 @@ const Content = ({
       }
       return all;
     }, {});
-    console.log({
-      groups,
-      singleGroupsKeys,
-      addedContent,
-      _length,
-      groupped
-    });
     return Object.keys(groupped).map(key => {
       const groups = groupped[key];
       return /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
@@ -61765,14 +61767,18 @@ const getNamespace = namespace => {
   let _namespace = namespace;
   switch (namespace) {
     case "locations":
+    case "location":
       _namespace = "location";
       break;
     case "stakeholders":
+    case "stakeholder":
       _namespace = "stakeholder";
       break;
     case "documents":
+    case "document":
       _namespace = "document";
       break;
+    case "event":
     case "nashirikiEvent":
     case "events":
       _namespace = "event";
@@ -61815,7 +61821,7 @@ class LinkedSubjectsService extends BaseService {
     version
   }) {
     return this.apiGet({
-      url: `/${namespace === "nashirikiEvent" ? "event" : namespace}/${id}`,
+      url: `/${getNamespace(namespace)}/${id}`,
       isApp: true,
       signal,
       params: {
@@ -62131,7 +62137,7 @@ const View = ({
     "management-location": "location",
     "management-stakeholder": "stakeholder",
     "management-event": "event",
-    "management-incident": "incident"
+    "management-document": "document"
   };
   const handleDeleteSubject = React.useCallback(async () => {
     try {

package/dist/services/index.js

@@ -1535,14 +1535,18 @@ const getNamespace = namespace => {
   let _namespace = namespace;
   switch (namespace) {
     case "locations":
+    case "location":
       _namespace = "location";
       break;
     case "stakeholders":
+    case "stakeholder":
       _namespace = "stakeholder";
       break;
     case "documents":
+    case "document":
       _namespace = "document";
       break;
+    case "event":
     case "nashirikiEvent":
     case "events":
       _namespace = "event";
@@ -1585,7 +1589,7 @@ class LinkedSubjectsService extends BaseService {
     version
   }) {
     return this.apiGet({
-      url: `/${namespace === "nashirikiEvent" ? "event" : namespace}/${id}`,
+      url: `/${getNamespace(namespace)}/${id}`,
       isApp: true,
       signal,
       params: {

package/dist/utils/index.js

@@ -15074,6 +15074,30 @@ const getAdminLevelName = (data, level) => {
   return entry?.name || "-";
 };
 
+const formatDataForTable = (data, options) => {
+  // If data is an array, take the first element
+  const dataObj = Array.isArray(data) ? data[0] : data;
+  return {
+    data: {
+      data: (dataObj.data || []).map(({
+        children,
+        ...rest
+      }) => {
+        if (Array.isArray(children) && children.length === 0) {
+          return rest;
+        }
+        return {
+          ...rest,
+          children
+        };
+      }),
+      meta: dataObj.data
+    },
+    ...(Object.keys(options)?.length > 0 && options),
+    totalItems: Array.isArray(dataObj?.meta) ? dataObj?.meta?.[0]?.total : dataObj?.meta?.total || 0
+  };
+};
+
 exports.ErrorFormat = ErrorFormat;
 exports.MessageTypes = MessageTypes;
 exports.StorageManager = StorageManager;
@@ -15112,6 +15136,7 @@ exports.filterParams = filterParams;
 exports.filterSelectOptions = filterSelectOptions;
 exports.filterString = filterString;
 exports.findOptions = findOptions;
+exports.formatDataForTable = formatDataForTable;
 exports.formatErrors = formatErrors;
 exports.formatToKebabCase = formatToKebabCase$1;
 exports.getAdminLevelName = getAdminLevelName;

package/package.json

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