datastake-daf 0.6.814 → 0.6.815

package/src/@daf/pages/Events/Testimonials/config.js

@@ -0,0 +1,175 @@
+import { getStatusOptions } from '../../../utils/filters';
+
+export const getFiltersConfig = ({t}) => {
+    return {
+		timeframe: {
+			type: "timeframe",
+			label: "Timeframe",
+			style: { flex: 1 },
+			t: t,
+		},
+		country: {
+			type: 'select',
+			label: 'Country',
+			placeholder: () => `${t('Filter by')} ${t('Country').toLowerCase()}`,
+			style: { flex: 1 },
+			labelStyle: { flex: 1 },
+			getLabel: (option) => option.label,
+			getValue: (option) => option.value,
+		  },
+		administrativeLevel1: {
+		  type: 'ajaxSelect',
+		  label: ({ t = (s) => s, options = {}, filters = {}, language = 'en' }) => {
+			const { administrativeLevel1 } = options;
+	  
+			if (administrativeLevel1) {
+			  if (options.country) {
+				const _item = administrativeLevel1[filters.country];
+				if (_item) {
+				  if (_item[language]) {
+					return _item[language]
+				  }
+				}
+			  }
+			}
+	  
+			return t('Province');
+		  },
+		  placeholder: () => `${t('Filter by')} ${t('Province').toLowerCase()}`,
+		  filters: (data) => ({
+			country: data.country,
+			level: 'level_1',
+		  }),
+		  show: (data) => !data.country,
+		  disabled: (data) => !data.country,
+		  mapper: { label: "name", value: "id" },
+		  method: 'getOptions',
+		  entity: 'AdministrativeLevel',
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		},
+		administrativeLevel2: {
+		  type: 'ajaxSelect',
+		  label: ({ t = (s) => s, options = {}, filters = {}, language = 'en' }) => {
+			const { administrativeLevel2 } = options;
+	  
+			if (administrativeLevel2) {
+			  if (options.country) {
+				const _item = administrativeLevel2[filters.country];
+				if (_item) {
+				  if (_item[language]) {
+					return _item[language]
+				  }
+				}
+			  }
+			}
+	  
+			return t('Province');
+		  },
+		  show: (data) => !(data.country && data.administrativeLevel1),
+		  placeholder: () => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
+		  filters: (data) => ({
+			country: data.country,
+			level: 'level_2',
+			administrativeLevel1: data.administrativeLevel1,
+		  }),
+		  disabled: (data) => !(data.country && data.administrativeLevel1),
+		  mapper: { label: "name", value: "id" },
+		  method: 'getOptions',
+		  entity: 'AdministrativeLevel',
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		},
+		eventCategory: {
+		  type: 'select',
+		  label: 'Category',
+		  placeholder: () => `${t('Filter by')} ${t('Category').toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		  filterOptions: (val) => {
+			if (val) {
+			  const { option, filters } = val
+			  if (filters && option) {
+				const { filters: optionFilters } = option;
+				if (Array.isArray(optionFilters) && optionFilters.length) {
+				  const { value, condition } = optionFilters[0];
+				  if (condition === 'includes') {
+					return value.includes('corporation');
+				  }
+				}
+			  }
+			}
+			return true;
+		  },
+		},
+		// positionInTheMineralSupplyChain: {
+		//   type: 'select',
+		//   label: 'Position',
+		//   placeholder: () => `${t('Filter by')} ${t('Position').toLowerCase()}`,
+		//   style: { flex: 1 },
+		//   labelStyle: { flex: 1 },
+		//   getLabel: (option) => option.label,
+		//   getValue: (option) => option.value,
+		// },
+		status: {
+		  type: "select",
+		  label: "Status",
+		  placeholder: () => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { fley: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+	}
+}
+
+export const getFilterOptions = (options, t) => {
+	const {
+		timeframe = [],
+		statusOptions,
+		categoryOptions,
+		countries,
+		subCategory,
+		category,
+		stakeholderCategoryOptions,
+		stakeholderSubCategoriesOptions,
+		administrativeLevel1,
+		administrativeLevel2,
+		positionInMineralSupplyChainOptions,
+		subCategoriesOptions,
+		eventCategoryOptions,
+	} = options || {};
+
+	const _categoryOptions = (eventCategoryOptions || categoryOptions || [])?.map((item) => ({
+		value: item.value,
+		label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
+	}))
+
+	const _default  = {
+		timeframe: timeframe,
+		status: getStatusOptions(t) || [],
+		eventCategory: _categoryOptions || [],
+		country: countries || [],
+		subCategory: subCategoriesOptions || [],
+		// category: category,
+		administrativeLevel1,
+		administrativeLevel2,
+		// positionInTheMineralSupplyChain: positionInMineralSupplyChainOptions || [],
+	}
+
+	return _default;
+}
+
+export const formConfig = {
+	namespace: 'testimonials',
+	view: 'testimonials',
+	scope: 'create',
+	formType: 'testimonial',
+}
+
+export const viewConfig = {
+	title: "Testimonials",
+	createTitle: "New Testimonial",
+}

package/src/@daf/pages/Events/columns.js

@@ -147,13 +147,17 @@ export const getColumns = ({ t, goTo, user, options, activeTab, getRedirectLink,
     key: "sources",
     show: activeTab !== "own",
     render: (val, all) => {
-      if (all.empty) {
-        return <div className="daf-default-cell" />;
+        if (all.empty) {
+            return <div className="daf-default-cell" />;
+        }
+
+      if (!val || val?.length === 0) {
+        return "-";
       }
 
       const sources = sourceAvatarConfig(val, user, applications);
 
-      return <AvatarGroup items={sources}></AvatarGroup>;
+      return <AvatarGroup items={sources} />;
     },
   },
   {

package/src/@daf/pages/Locations/MineSite/columns.js

@@ -145,20 +145,25 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return renderStatusTag({ value: _val, t });
         },
     },
-    
-      {
-        title: t("Sources"),
-        dataIndex: 'sources',
-        ellipsis: true,
-        show: activeTab !== "own",
-        render: (v, all) => {
+    {
+      title: t("Sources"),
+      dataIndex: "sources",
+      key: "sources",
+      show: activeTab !== "own",
+      render: (val, all) => {
           if (all.empty) {
-            return <div className="daf-default-cell" />
+              return <div className="daf-default-cell" />;
           }
-          const sources = sourceAvatarConfig(v, user, applications);
-          return <AvatarGroup items={sources}></AvatarGroup>;
-        },
+
+        if (!val || val?.length === 0) {
+          return "-";
+        }
+
+        const sources = sourceAvatarConfig(val, user, applications);
+
+        return <AvatarGroup items={sources} />;
       },
+    },
       {
         id: 'actions',
         title: "",

package/src/@daf/pages/Locations/columns.js

@@ -105,11 +105,15 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
               return <div className="daf-default-cell" />;
           }
 
-          const sources = sourceAvatarConfig(val, user, applications);
+        if (!val || val?.length === 0) {
+          return "-";
+        }
+
+        const sources = sourceAvatarConfig(val, user, applications);
 
-          return <AvatarGroup items={sources}></AvatarGroup>;
+        return <AvatarGroup items={sources} />;
       },
-  },
+    },
     {
         title: t("Last Update"),
         dataIndex: "updatedAt",

package/src/@daf/pages/Stakeholders/Operators/columns.js

@@ -116,21 +116,25 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
       },
       ellipsis: true,
   }, 
-    {
-        title: t("Sources"),
-        dataIndex: "sources",
-        key: "sources",
-        show: activeTab !== "own",
-        render: (val, all) => {
-            if (all.empty) {
-                return <div className="daf-default-cell" />;
-            }
+  {
+    title: t("Sources"),
+    dataIndex: "sources",
+    key: "sources",
+    show: activeTab !== "own",
+    render: (val, all) => {
+        if (all.empty) {
+            return <div className="daf-default-cell" />;
+        }
 
-            const sources = sourceAvatarConfig(val, user, applications);
+      if (!val || val?.length === 0) {
+        return "-";
+      }
 
-            return <AvatarGroup items={sources}></AvatarGroup>;
-        },
+      const sources = sourceAvatarConfig(val, user, applications);
+
+      return <AvatarGroup items={sources} />;
     },
+  },
     {
         title: t("Status"),
         dataIndex: 'status',

package/src/@daf/pages/Stakeholders/Workers/columns.js

@@ -101,20 +101,24 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         ellipsis: true,
     },   
     {
-        title: t("Sources"),
-        dataIndex: "sources",
-        key: "sources",
-        show: activeTab !== "own",
-        render: (val, all) => {
-            if (all.empty) {
-                return <div className="daf-default-cell" />;
-            }
+      title: t("Sources"),
+      dataIndex: "sources",
+      key: "sources",
+      show: activeTab !== "own",
+      render: (val, all) => {
+          if (all.empty) {
+              return <div className="daf-default-cell" />;
+          }
 
-            const sources = sourceAvatarConfig(val, user, applications);
+        if (!val || val?.length === 0) {
+          return "-";
+        }
 
-          return <AvatarGroup items={sources}></AvatarGroup>;
-        },
-    },    
+        const sources = sourceAvatarConfig(val, user, applications);
+
+        return <AvatarGroup items={sources} />;
+      },
+    },   
     {
         title: t("Status"),
         dataIndex: "status",

package/src/@daf/pages/Stakeholders/columns.js

@@ -43,7 +43,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const category = findOptions(v, options?.categoriesOptions);
+          const categoriesOptions = [...(options?.categoriesOptions || []), ...(options?.category || [])]
+
+          const category = findOptions(v, categoriesOptions);
     
           return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
         },
@@ -58,7 +60,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const subCategory = findOptions(v, options?.subCategoriesOptions);
+          const subCategoriesOptions = [...(options?.subCategoriesOptions || []), ...(options?.subCategory || [])];
+
+          const subCategory = findOptions(v, subCategoriesOptions);
     
           return subCategory ? <Tooltip title={subCategory}>{subCategory}</Tooltip> : '-';
         },
@@ -89,12 +93,12 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
                 return <div className="daf-default-cell" />;
             }
             if (!val || val?.length === 0) {
-                return "--";
+                return "-";
             }
 
             const sources = sourceAvatarConfig(val, user, applications);
 
-            return <AvatarGroup items={sources}></AvatarGroup>;
+            return <AvatarGroup items={sources} />;
         },
     },
     {

package/src/@daf/pages/TablePage/helper.js

@@ -45,6 +45,14 @@ import {
     viewConfig as viewConfigIncidents
 } from '../Events/Incidents/config.js';
 import { getColumns as getColumnsIncidents } from "../Events/Incidents/columns.js";
+
+import { 
+    getFiltersConfig as getFiltersConfigTestimonials, 
+    getFilterOptions as getFilterOptionsTestimonials,
+    formConfig as formConfigTestimonials,
+    viewConfig as viewConfigTestimonials
+} from '../Events/Testimonials/config.js';
+import { getColumns as getColumnsTestimonials } from "../Events/Testimonials/columns.js";
   
 import { 
     getFiltersConfig as getFiltersConfigLocations, 
@@ -123,6 +131,13 @@ export const FILTER_REGISTRY = {
       viewConfig: viewConfigIncidents,
       columns: getColumnsIncidents,
     },
+    testimonials: {
+      config: getFiltersConfigTestimonials,
+      options: getFilterOptionsTestimonials,
+      formConfig: formConfigTestimonials,
+      viewConfig: viewConfigTestimonials,
+      columns: getColumnsTestimonials,
+    },
     locations: {
       config: getFiltersConfigLocations,
       options: getFilterOptionsLocations,

package/src/helpers/errorHandling.js

@@ -1,67 +1,135 @@
 import { message } from 'antd';
 
+/**
+ * Check if a successful response contains embedded error data
+ */
+export 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
+ */
+export 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
  */
 export const createErrorHandler = (config = {}) => {
-    const {
-      onUnauthorized,
-      handleError,
-      getStorageManager,
-      checkTokenValidity = true,
-      unauthorizedRedirect = '/',
-      tokenStorageKey = 'token',
-      handleNetworkError = true,
-    } = config;
-  
-    return (error, customOnUnauthorized) => {
-      // Handle cases where error.response doesn't exist (network errors)
-      if (!error.response) {
-        if (handleNetworkError && handleError) {
-          handleError({
-            status: 0,
-            statusText: "Network Error",
-            data: ["Please check your internet connection."],
-          });
-        }
-        return Promise.reject(error);
+  const {
+    onUnauthorized,
+    handleError,
+    getStorageManager,
+    checkTokenValidity = true,
+    unauthorizedRedirect = '/',
+    tokenStorageKey = 'token',
+    handleNetworkError = true,
+  } = config;
+
+  return (error, customOnUnauthorized) => {
+    // Handle cases where error.response doesn't exist (network errors)
+    if (!error.response) {
+      if (handleNetworkError && handleError) {
+        handleError({
+          status: 0,
+          statusText: "Network Error",
+          data: ["Please check your internet connection."],
+        });
       }
-  
-      const { status, statusText, data: { errors, message } = {} } = error.response || { data: {} };
-      
-      // Handle 401 Unauthorized
-      if (status === 401) {
-        if (checkTokenValidity && getStorageManager) {
-          const token = getStorageManager().get(tokenStorageKey);
-          if (token) {
-            if (typeof customOnUnauthorized === 'function') {
-              customOnUnauthorized();
-            } else if (typeof onUnauthorized === 'function') {
-              onUnauthorized();
-            } else {
-              getStorageManager().clearOne(tokenStorageKey);
-              if (typeof window !== 'undefined') {
-                window.location.href = unauthorizedRedirect;
-              }
+      return Promise.reject(error);
+    }
+
+    const { status, statusText, data: { errors, message } = {} } = error.response || { data: {} };
+    
+    // Handle 401 Unauthorized
+    if (status === 401) {
+      if (checkTokenValidity && getStorageManager) {
+        const token = getStorageManager().get(tokenStorageKey);
+        if (token) {
+          if (typeof customOnUnauthorized === 'function') {
+            customOnUnauthorized();
+          } else if (typeof onUnauthorized === 'function') {
+            onUnauthorized();
+          } else {
+            getStorageManager().clearOne(tokenStorageKey);
+            if (typeof window !== 'undefined') {
+              window.location.href = unauthorizedRedirect;
             }
           }
         }
       }
-      
-      // Handle 4xx and 5xx errors
-      if (status >= 400 && status <= 500) {
-        if (handleError) {
-          handleError({ 
-            status, 
-            statusText: message || statusText, 
-            data: errors || [] 
-          });
+    }
+    
+    // Handle 4xx and 5xx errors
+    if (status >= 400 && status <= 500) {
+      if (handleError) {
+        handleError({ 
+          status, 
+          statusText: message || statusText, 
+          data: errors || [] 
+        });
+      }
+    }
+    
+    return Promise.reject(error);
+  };
+};
+
+/**
+ * Create axios response interceptor to catch embedded errors in successful responses
+ */
+export const createResponseInterceptor = (config = {}) => {
+  const { showNotification = true } = config;
+  
+  return {
+    onSuccess: (response) => {
+      // Check if the response data contains an error
+      if (isErrorResponse(response.data)) {
+        const errorMessage = getErrorMessage(response.data);
+        
+        if (showNotification) {
+          message.error(errorMessage);
         }
+        
+        // Convert to a rejected promise so catch blocks handle it
+        const error = new Error(errorMessage);
+        error.response = {
+          data: response.data,
+          status: response.data.statusCode || response.data.response?.statusCode || 200,
+          statusText: errorMessage,
+        };
+        error.isEmbeddedError = true; // Flag to identify these special errors
+        
+        return Promise.reject(error);
       }
       
+      return response;
+    },
+    onError: (error) => {
       return Promise.reject(error);
-    };
+    }
+  };
 };
 
 /**
@@ -69,29 +137,29 @@ export const createErrorHandler = (config = {}) => {
  * Useful for quick error notifications
  */
 export const handleError = (err) => {
-    const errorMessage = err?.response?.data?.message || 
-                         err?.message || 
-                         'An error occurred';
-    message.error(errorMessage);
-  };
-  
-  /**
-   * Success message handler
-   */
-  export const handleSuccess = (msg) => {
-    message.success(msg || 'Operation successful');
-  };
-  
-  /**
-   * Warning message handler
-   */
-  export const handleWarning = (msg) => {
-    message.warning(msg || 'Warning');
-  };
-  
-  /**
-   * Info message handler
-   */
-  export const handleInfo = (msg) => {
-    message.info(msg);
-  };
+  const errorMessage = err?.response?.data?.message || 
+                       err?.message || 
+                       'An error occurred';
+  message.error(errorMessage);
+};
+
+/**
+ * Success message handler
+ */
+export const handleSuccess = (msg) => {
+  message.success(msg || 'Operation successful');
+};
+
+/**
+ * Warning message handler
+ */
+export const handleWarning = (msg) => {
+  message.warning(msg || 'Warning');
+};
+
+/**
+ * Info message handler
+ */
+export const handleInfo = (msg) => {
+  message.info(msg);
+};

package/src/utils.js

@@ -46,7 +46,7 @@ export { StorageManager } from './helpers/StorageManager.js';
 
 export { assignParamsToUrl, buildQueryString } from './helpers/urlHelpers.js';
 
-export { createErrorHandler, handleError, handleSuccess, handleWarning, handleInfo } from './helpers/errorHandling.js';
+export { createErrorHandler, handleError, handleSuccess, handleWarning, handleInfo, isErrorResponse, getErrorMessage } from './helpers/errorHandling.js';
 
 export { createTheme, createAdminTheme } from './helpers/theme.js';