datastake-daf 0.6.830 → 0.6.832

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
@@ -2251,6 +2277,14 @@ class DashboardService extends BaseService {
       isUserManager: true
     });
   }
+
+  // getWidgetConflictManagement({ url, params = {}, filters = {} }) {
+  //   return this.apiGet({
+  //     url: `/dashboard/conflict-management${url}`,
+  //     params: { ...params, ...filters },
+  //     isApp: true,
+  //   });
+  // }
 }
 var DashboardService$1 = createLazyService(DashboardService);
 
@@ -2284,6 +2318,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
       }, {