datastake-daf 0.6.830 → 0.6.831

package/dist/hooks/index.js

@@ -8,7 +8,7 @@ var g2plot = require('@antv/g2plot');
 require('country-city-location');
 var L = require('leaflet');
 var axios = require('axios');
-require('antd');
+var antd = require('antd');
 var lodash = require('lodash');
 var PropTypes = require('prop-types');
 var reactIs = require('react-is');
@@ -1456,6 +1456,32 @@ class BaseHTTPService {
   }
 }
 
+/**
+ * Check if a successful response contains embedded error data
+ */
+const isErrorResponse = data => {
+  if (!data) return false;
+  return (
+    // Check for Exception names
+    data.name && data.name.includes('Exception') ||
+    // Check for nested response with error status
+    data.response?.statusCode && data.response.statusCode >= 400 ||
+    // Check for top-level error status
+    data.statusCode && data.statusCode >= 400 ||
+    // Check for explicit error flag
+    data.error === true ||
+    // Check for nested error property
+    data.response?.error && data.response.error !== null
+  );
+};
+
+/**
+ * Extract error message from various error response formats
+ */
+const getErrorMessage = data => {
+  return data?.message || data?.response?.message || data?.response?.error || 'An error occurred';
+};
+
 /**
  * Generic error handler factory for axios requests
  * Highly configurable to adapt to different project needs
@@ -2284,6 +2310,11 @@ const useWidgetFetch = ({
         data
       } = await getData(rest);
       setData(data || defaultData);
+      if (isErrorResponse(data)) {
+        const errorMessage = getErrorMessage(data);
+        antd.message.error(errorMessage);
+        return;
+      }
       onFetch();
     } catch (err) {
       console.log(err);

package/dist/layouts/index.js

@@ -4646,7 +4646,7 @@ CustomIcon.propTypes = {
 };
 
 const userIsAdmin = user => {
-  return user?.role?.id === 'APP_ADMIN';
+  return user?.role?.id === 'APP_ADMIN' || user?.role?.id === 'SUPER_ADMIN';
 };
 
 /* eslint-disable no-unused-vars */
@@ -5948,7 +5948,7 @@ function MobileDrawer({
       }, {
         type: 'link',
         name: t('Settings'),
-        path: `/app/${mod}/view/settings`,
+        path: `/app/view/settings`,
         isDashboard: true,
         visible: canViewSettings
       }, {

package/dist/pages/index.js

@@ -7206,6 +7206,32 @@ class BaseHTTPService {
   }
 }
 
+/**
+ * Check if a successful response contains embedded error data
+ */
+const isErrorResponse = data => {
+  if (!data) return false;
+  return (
+    // Check for Exception names
+    data.name && data.name.includes('Exception') ||
+    // Check for nested response with error status
+    data.response?.statusCode && data.response.statusCode >= 400 ||
+    // Check for top-level error status
+    data.statusCode && data.statusCode >= 400 ||
+    // Check for explicit error flag
+    data.error === true ||
+    // Check for nested error property
+    data.response?.error && data.response.error !== null
+  );
+};
+
+/**
+ * Extract error message from various error response formats
+ */
+const getErrorMessage = data => {
+  return data?.message || data?.response?.message || data?.response?.error || 'An error occurred';
+};
+
 /**
  * Generic error handler factory for axios requests
  * Highly configurable to adapt to different project needs
@@ -7483,6 +7509,11 @@ const useWidgetFetch = ({
         data
       } = await getData(rest);
       setData(data || defaultData);
+      if (isErrorResponse(data)) {
+        const errorMessage = getErrorMessage(data);
+        antd.message.error(errorMessage);
+        return;
+      }
       onFetch();
     } catch (err) {
       console.log(err);
@@ -45855,38 +45886,57 @@ const useSummary = ({
     };
   }, [debouncedSearch]);
   React.useEffect(() => {
-    if (_partners !== undefined) {
-      if ((params?.id !== null || isPdf && id !== null) && !hasSelect) {
-        getOne({
-          datastakeId: params?.id || id,
-          sources: _partners
-        });
-      }
-    }
+    // if (_partners !== undefined) {
+    // 	if ((params?.id !== null || (isPdf && id !== null)) && !hasSelect) {
+    // 		getOne({ datastakeId: params?.id || id, sources: _partners });
+    // 	}
+    // }
     if (hasSelect && !params?.id) {
       getMultiple(filters);
     }
-  }, [params?.id, hasSelect, getOne, getMultiple, _partners, isPdf, id, filters]);
+  }, [hasSelect, params?.id, filters]);
+  const activeId = React.useMemo(() => {
+    return selectedItem || params?.id;
+  }, [selectedItem, params?.id]);
+  const memoizedPartners = React.useMemo(() => {
+    return _partners;
+  }, [_partners]);
+  const memoizedService = React.useMemo(() => {
+    return service;
+  }, [service]);
   React.useEffect(() => {
-    if ((selectedItem || params?.id) && _partners !== undefined) {
-      const fetchSingleItem = async () => {
-        setLoading(true);
-        try {
-          const {
-            data
-          } = await service.getOne(selectedItem || params?.id, {
-            sources: _partners
-          });
-          setSingleItemData(data);
-        } catch (error) {
+    if (!activeId || memoizedPartners === undefined) return;
+    let cancelled = false;
+    const fetchSingleItem = async () => {
+      setLoading(true);
+      try {
+        const {
+          data
+        } = await memoizedService.getOne(activeId, {
+          sources: memoizedPartners
+        });
+        if (cancelled) return;
+        setSingleItemData(data);
+        if (isErrorResponse(data)) {
+          const errorMessage = getErrorMessage(data);
+          antd.message.error(errorMessage);
+          return;
+        }
+      } catch (error) {
+        if (!cancelled) {
           console.log(error);
-        } finally {
+        }
+      } finally {
+        if (!cancelled) {
           setLoading(false);
         }
-      };
-      fetchSingleItem();
-    }
-  }, [selectedItem, service, _partners, params?.id]);
+      }
+    };
+    fetchSingleItem();
+    return () => {
+      cancelled = true;
+    };
+  }, [activeId, memoizedPartners, memoizedService]);
   React.useEffect(() => {
     _setPartners(selectedPartners?.partners);
   }, [selectedPartners]);

package/dist/services/index.js

@@ -2022,6 +2022,118 @@ class WorkersService extends BaseService {
 }
 var WorkersService$1 = createLazyService(WorkersService);
 
+class MineSiteService extends BaseService {
+  get(params) {
+    const {
+      datastakeId,
+      ...rest
+    } = params;
+    if (datastakeId) {
+      return this.apiGet({
+        url: `/location/${datastakeId}`,
+        params: {
+          ...rest
+        },
+        isApp: true
+      });
+    }
+    return this.apiGet({
+      url: "/location",
+      params: {
+        ...rest
+      },
+      isApp: true
+    });
+  }
+  getOne(id, params) {
+    return this.apiGet({
+      url: `/location/${id}`,
+      params,
+      isApp: true
+    });
+  }
+  getForm(scope = "create", language = "en") {
+    return this.apiGet({
+      url: `/forms/location`,
+      params: {
+        scope,
+        language
+      },
+      isApp: true
+    });
+  }
+  getAll(params, signal) {
+    return this.apiGet({
+      url: "/location",
+      params,
+      signal,
+      isApp: true
+    });
+  }
+  getData(id, sourceId, source, version) {
+    return this.apiGet({
+      url: `/location/${id}`,
+      isApp: true,
+      params: {
+        authorId: sourceId,
+        source,
+        version
+      }
+    });
+  }
+  submit(payload) {
+    if (payload.id) {
+      // eslint-disable-next-line no-unused-vars
+      const {
+        namespace,
+        ...data
+      } = payload;
+      return this.apiPut({
+        url: `/location/${payload.id}`,
+        data: filterCreateData(data),
+        isApp: true
+      });
+    }
+    if (payload?.form) {
+      delete payload.form;
+      return this.apiPost({
+        url: "/location",
+        data: filterCreateData(payload),
+        isApp: true
+      });
+    }
+    return this.apiPost({
+      url: "/location",
+      data: filterCreateData(payload),
+      isApp: true
+    });
+  }
+  submitStep(data, id) {
+    return this.apiPut({
+      isApp: true,
+      url: `/location/submit/${id}`,
+      data: filterCreateData(data)
+    });
+  }
+  remove(id, data) {
+    return this.apiDelete({
+      url: `/location/${id}/remove`,
+      data: data,
+      isApp: true
+    });
+  }
+  getOptions(id = "countries,minerals") {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/options`,
+      params: {
+        id
+      }
+    });
+  }
+}
+var MineSiteService$1 = createLazyService(MineSiteService);
+
 exports.AdminService = AdminService$1;
 exports.AuthenticationService = AuthenticationService$1;
 exports.BaseHTTPService = BaseHTTPService;
@@ -2033,6 +2145,7 @@ exports.ErrorHandler = ErrorHandler;
 exports.ErrorService = ErrorService;
 exports.EventsService = EventsService$1;
 exports.LinkedSubjectsService = LinkedSubjects;
+exports.MineSiteService = MineSiteService$1;
 exports.NotificationService = NotificationService$1;
 exports.OperatorService = OperatorService$1;
 exports.PartnerService = PartnerService$1;

package/dist/utils/index.js

@@ -7795,7 +7795,7 @@ const userHasInterface = (user, app, intf) => {
   return currentApp && intf.includes(currentApp.interface) ? true : false;
 };
 const userIsAdmin = user => {
-  return user?.role?.id === 'APP_ADMIN';
+  return user?.role?.id === 'APP_ADMIN' || user?.role?.id === 'SUPER_ADMIN';
 };
 const createModule = (selectedModule, role = "user") => {
   return {
@@ -7836,6 +7836,18 @@ function getRedirectPath(user, fallback = '', app, isDatastake) {
   }
   return isDatastake ? `/${app}/app` : '/app';
 }
+function mapUser(user) {
+  return {
+    ...user,
+    company: user.company,
+    verified: user.emailVerified,
+    companyId: user?.company?.id,
+    modules: Array.isArray(user.company?.modules) ? user.company?.modules.reduce((all, item) => {
+      all[item.id] = item;
+      return all;
+    }, {}) : user.company?.modules || {}
+  };
+}
 
 const en = {
   "review-requests": "Review Requests",
@@ -15176,6 +15188,7 @@ exports.mapFormGroup = mapFormGroup;
 exports.mapModulesFromApps = mapModulesFromApps;
 exports.mapSubGroupsInGet = mapSubGroupsInGet;
 exports.mapSubGroupsInSubmit = mapSubGroupsInSubmit;
+exports.mapUser = mapUser;
 exports.modules = modules;
 exports.nowToIso = nowToIso;
 exports.processConfig = processConfig;

package/package.json

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