datastake-daf 0.6.813 → 0.6.815

package/src/@daf/pages/View/index.jsx

@@ -1,11 +1,11 @@
-import React, { useMemo, useState, useEffect, useCallback } from 'react'
+import React, { useMemo, useState, useEffect } from 'react'
 import { useViewUrlParams } from './hooks/useViewUrlParams.js'
 import { usePrepareForm } from './hooks/usePrepareForm.js'
 import { useViewPermissions } from './hooks/useViewPermissions.js'
 import { useSubmitSubject } from './hooks/useSubmitSubject.js'
 import { useCallToGetData } from './hooks/useCallToGetData.js'
 import { useViewActions } from './hooks/useViewActions.js'
-import AdminService from '../../services/AdminService.js'
+
 import { groupSubsections } from '../../../@daf/core/components/ViewForm/helper.js'
 import Loading from '../../../@daf/core/components/Loading/index.jsx'
 import Header from '../../../@daf/core/components/Header/index.jsx'
@@ -14,8 +14,7 @@ import ViewFormNavigation from '../../../@daf/core/components/ViewForm/navigatio
 import ViewForm from '../../../@daf/core/components/ViewForm/content.jsx'
 import Records from '../../../@daf/core/components/ViewForm/components/Records/index.jsx'
 import { Template } from '../Template/index.jsx'
-import {message} from 'antd'
-import { handleError } from '../../services/ErrorService.js'
+
 const View = ({
     push,
     getRedirectLink,
@@ -103,7 +102,7 @@ const View = ({
 		viewConfig,
 	});
 
-    const { canEdit, isSupported, canDelete } = useViewPermissions({
+    const { canEdit, isSupported } = useViewPermissions({
 		data,
 		id,
 		namespace,
@@ -133,28 +132,6 @@ const View = ({
         serviceMap,
     });
 
-
-    const subjects = {
-        "management-location": "location",
-        "management-stakeholder": "stakeholder",
-    }
-
-
-    const handleDeleteSubject = useCallback(async () => {
-        try {
-            await AdminService.deleteSubject({
-                subject: subjects[namespace],
-                id: id,
-            })
-            message.success(t("Subject deleted successfully"))
-            goTo(getRedirectLink(`/app/management/subject/${subjects[namespace]}`))
-        } catch (error) {
-            handleError(error)
-            message.error(t("Failed to delete subject"))
-        }
-          
-    }, [namespace, id, t])
-
     const { pageActions, extraPageActions } = useViewActions({
 		namespace,
 		data,
@@ -172,8 +149,6 @@ const View = ({
 		t,
 		viewConfig,
 		buttonActions,
-        canDelete,
-        deleteSubject: handleDeleteSubject
 	});
 
     useEffect(() => {

package/src/@daf/services/AdminService.js

@@ -17,8 +17,6 @@ class AdminService extends BaseService {
     }
 
 
-
-
   inviteCompanyAccount({ companyId, data }) {
     return this.apiPost({
       url: `/accounts/${companyId}/invite`,
@@ -26,21 +24,6 @@ class AdminService extends BaseService {
     })
   }
 
-  resendInvitation({invitationToken
-  }){
-    return this.apiPost({
-      url: `/accounts/resendInvitation/${invitationToken}`,
-    })
-  }
-  
-  copyInvitation({invitationToken
-  }){
-    return this.apiPost({
-      url: `/accounts/copyInvitation/${invitationToken}`,
-    })
-  }
-
-
     inviteAccount(data) {
         return this.apiPost({
           url: `/accounts/inviteAccount`, 
@@ -55,14 +38,7 @@ class AdminService extends BaseService {
         })
     }
 
-    updateAccount({ data, id, isPending=false }) {
-      if (isPending) {
-        return this.apiPut({
-          data,
-          url: `/accounts/invitation/${id}`,
-        })
-      }
-
+    updateAccount({ data, id }) {
         return this.apiPut({
           data,
           url: `/accounts/${id}`,
@@ -171,19 +147,6 @@ class AdminService extends BaseService {
         url: `/management/subject/${subject}/${id}`,
       });
     }
-  
-    getItems({ item }) {
-      return this.apiGet({
-        url: `/management/items/${item}`,
-      });
-    }
-
-    getItemData({ item, id }) {
-      return this.apiGet({
-        url: `/management/item/${item}/${id}`,
-      });
-    }
-
 
 
     viewLocation({ id }) {
@@ -203,7 +166,7 @@ class AdminService extends BaseService {
       const type = subject === 'location' ? 'location' : 'stakeholder';
       return this.apiPut({
         url: `/management/subject/${type}/${id}`,
-        data: data,
+        data: filterCreateData(data),
       });
     }
 
@@ -214,20 +177,15 @@ class AdminService extends BaseService {
       });
     }
 
-    async getUserGrowth(activeFilter) {
-      const { data } = await this.apiGet({
+    getUserGrowth(activeFilter) {
+      return this.apiGet({
         url: `/accounts/dashboard/user-growth`,
         isUserManager: true,
         params: { activeFilter },
       });
-      return data;
     }
 
-    removeUserFromAccount({ accountId, userId }) {
-      return this.apiPut({
-        url: `/companies/${accountId}/remove-user/${userId}`,
-      })
-    }
+    
 }
 
 export default createLazyService(AdminService);

package/src/@daf/services/DashboardService.js

@@ -9,13 +9,13 @@ class DashboardService extends BaseService {
           isApp: true,
         });
     }
-    async getUserGrowth(activeFilter) {
-      const { data } = await this.apiGet({
+
+    getUserGrowth(activeFilter) {
+      return this.apiGet({
         url: `/accounts/dashboard/user-growth`,
         isUserManager: true,
         params: { activeFilter },
       });
-      return data;
     }
 
     getAdminDashboard() { 

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

@@ -63,19 +63,29 @@ export const getDefaultActiveFilters = (
 };
 
 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 = 1,
+		pageSize = 20,
+		sortDir,
+		sortBy,
+		search,
+		searchParams,
+		...filters
+	} = activeFilters || {};
 
 	const params = {};
-	
+
 	params.pagination = JSON.stringify({
-		[NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
-		[NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize,
+		page,
+		pageSize,
 	});
 
+	params.filters = JSON.stringify(filters);
+
 	if (search && searchParams) {
 		params.search = JSON.stringify({
 			qs: search,
@@ -90,14 +100,6 @@ export const filterParams = (value, module) => {
 		});
 	}
 
-	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 };
 };
 

package/src/constants/locales/en/translation.js

@@ -1,17 +1,4 @@
 const en = {
-  "admin::events": "Events",
-  "admin::document": "Documents",
-  "events": "Events",
-  "merge-locations": "Merge Locations",
-  "edit-account": "Edit Account",
-  "Are-you-sure-you-want-to-remove-the-user-from-this-account?": "Are you sure you want to remove the user from this account?",
-  "The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "The user will lose access to the application and to all data created for this account.",
-  "merge": "Merge",
-  "Are-you-sure-you-want-to-suspend-this-account?": "Are you sure you want to suspend this account?",
-  "Associated-users-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "Associated users will lose access to the application and to all data created for this account.",
-  "current_subjects": "Current Subjects",
-  "merged_output": "Merged Output",
-  "merge-subjects": "Merge Subjects",
   "All Data": "All Data",
   "sbg-admin::remove-user-title":"Remove User Title",
   "sbg-admin::remove-user-body":"Remove User Body",

package/src/helpers/copyToClipboard.js

@@ -41,63 +41,3 @@ export const copyToClipboard = (id) => {
     }
   }
 }
-
-/**
- * Copies a string directly to the clipboard.
- * 
- * This function takes a string and copies it to the clipboard.
- * It handles browser compatibility issues between IE and modern browsers.
- * 
- * @param {string} text - The string to copy to clipboard
- * @returns {Promise<boolean>} - Returns true if copying succeeded, false otherwise
- * 
- * @example
- * copyStringToClipboard('Text to copy'); // Copies "Text to copy" to clipboard
- */
-export const copyStringToClipboard = async (text) => {
-  if (!text) {
-    console.warn("No text provided to copy");
-    return false;
-  }
-
-  // Try modern Clipboard API first
-  if (navigator.clipboard && navigator.clipboard.writeText) {
-    try {
-      await navigator.clipboard.writeText(text);
-      return true;
-    } catch (ex) {
-      console.warn("Clipboard API failed, trying fallback:", ex);
-      // Fall through to fallback methods
-    }
-  }
-
-  // Fallback for older browsers or when Clipboard API fails
-  if (window.clipboardData && window.clipboardData.setData) {
-    // IE: prevent textarea being shown while dialog is visible
-    return window.clipboardData.setData("Text", text);
-  } else if (document.queryCommandSupported &&
-    document.queryCommandSupported("copy")) {
-    var textarea = document.createElement("textarea");
-    textarea.textContent = text;
-    // Prevent scrolling to bottom of page in MS Edge
-    textarea.style.position = "fixed";
-    textarea.style.opacity = "0";
-    textarea.style.left = "-9999px";
-    document.body.appendChild(textarea);
-    textarea.select();
-    try {
-      // Security exception may be thrown by some browsers
-      const success = document.execCommand("copy");
-      return success;
-    } catch (ex) {
-      console.warn("Copy to clipboard failed.", ex);
-      return false;
-    } finally {
-      document.body.removeChild(textarea);
-    }
-  }
-  
-  return false;
-}
-
-

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';
 

package/src/@daf/core/components/Screens/Admin/AdminScreens/Documents.jsx

@@ -1,81 +0,0 @@
-import React, { useCallback } from "react";
-import { message } from "antd";
-import DocumentsTable from "../AdminTables/DocumentsTable/index.jsx";
-/**
- * Admin Location Screen Wrapper
- * This is a ready-to-use route component that can be configured per application
- * 
- * @param {Object} config - Application configuration
- * @param {string} config.appName - Application name
- * @param {string} config.module - Module identifier (APP constant)
- * @param {Function} config.goTo - Navigation function
- * @param {Function} config.t - Translation function
- * @param {Object} config.location - Router location object
- * @param {boolean} config.isMobile - Is mobile viewport
- * @param {Function} config.getRedirectLink - Function to get redirect links
- * @param {Object} config.AdminService - Admin service with methods
- * @param {Object} config.options - Options object with categories, countries, etc.
- * @param {Function} config.handleError - Error handling function
- * @param {number} config.defaultPageSize - Default pagination page size
- * @param {string} config.view - View identifier
- * @param {string} config.headerTitle - Header title for the table
- * @param {Array} config.breadcrumbs - Breadcrumbs configuration
- * @param {any} config.refetchTrigger - Trigger to refetch data
- * @param {Function} config.getData - Optional custom getData function
- */
-export default function AdminLocationScreen({ config }) {
-	const {
-		appName = "app",
-		module,
-		goTo,
-		t,
-		location,
-		isMobile,
-		getRedirectLink,
-		AdminService,
-		options,
-		handleError,
-		defaultPageSize = 20,
-		view,
-		headerTitle = "documents",
-		breadcrumbs,
-		refetchTrigger,
-		getData,
-		user,
-	} = config;
-
-
-
-	const getSubjects = useCallback((params) => {
-		if (getData) {
-			return getData(params);
-		}
-		return AdminService.getItems({ item: 'document', params });
-	}, [getData, AdminService]);
-
-	return (
-		<DocumentsTable
-			t={t}
-			goTo={goTo}
-			getRedirectLink={getRedirectLink}
-			location={location}
-			module={module}
-			headerTitle={headerTitle}
-			getData={getSubjects}
-			isMobile={isMobile}
-			defaultPageSize={defaultPageSize}
-			view={view}
-			breadcrumbs={breadcrumbs}
-			refetchTrigger={refetchTrigger}
-			config={{
-				options: {
-					category: options?.category,
-					countries: options?.countries,
-				},
-			}}
-			user={user}
-			options={options}
-		/>
-	);
-}
-