datastake-daf 0.6.819 → 0.6.821

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

@@ -1,11 +1,11 @@
-import React, { useMemo, useState, useEffect } from 'react'
+import React, { useMemo, useState, useEffect, useCallback } 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,7 +14,8 @@ 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,
@@ -54,6 +55,8 @@ const View = ({
 }) => {
     const getNamespaceConfig = (namespace) => namespaceConfiguration?.[namespace] || {};
     const [openRecordsModal, setOpenRecordsModal] = useState(false);
+
+    console.log({partners})
     
     // HANDLES THE URL PARAMS FOR THE VIEW PAGE
     const {
@@ -102,7 +105,7 @@ const View = ({
 		viewConfig,
 	});
 
-    const { canEdit, isSupported } = useViewPermissions({
+    const { canEdit, isSupported, canDelete } = useViewPermissions({
 		data,
 		id,
 		namespace,
@@ -132,6 +135,28 @@ 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"));
+          push(getRedirectLink(`/app/management/subject/${subjects[namespace]}`));
+        } catch (error) {
+          handleError(error);
+          message.error(t("Failed to delete subject"));
+        }
+      }, [namespace, id, t, push, getRedirectLink]);
+      
+
     const { pageActions, extraPageActions } = useViewActions({
 		namespace,
 		data,
@@ -149,6 +174,8 @@ const View = ({
 		t,
 		viewConfig,
 		buttonActions,
+        canDelete,
+        deleteSubject: handleDeleteSubject
 	});
 
     useEffect(() => {
@@ -196,6 +223,7 @@ const View = ({
 	}, [namespace, match, data]);
 
     const sourceOptions = useMemo(() => {
+        if(!partners ) return [];
         return partners.map((partner) => {
            const isOwnData = partner.id === user?.company?.id;
 

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

@@ -17,6 +17,8 @@ class AdminService extends BaseService {
     }
 
 
+
+
   inviteCompanyAccount({ companyId, data }) {
     return this.apiPost({
       url: `/accounts/${companyId}/invite`,
@@ -24,6 +26,21 @@ 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`, 
@@ -38,7 +55,14 @@ class AdminService extends BaseService {
         })
     }
 
-    updateAccount({ data, id }) {
+    updateAccount({ data, id, isPending=false }) {
+      if (isPending) {
+        return this.apiPut({
+          data,
+          url: `/accounts/invitation/${id}`,
+        })
+      }
+
         return this.apiPut({
           data,
           url: `/accounts/${id}`,
@@ -51,9 +75,11 @@ class AdminService extends BaseService {
         })
     }
 
-    transferAdmin({ userId, id }) {
+
+
+    transferAdmin({ companyId, userId }) {
         return this.apiPut({
-          url: `/accounts/transfer-rights/${id}`,
+          url: `/companies/${companyId}/transfer-rights`,
           data: { userId },
         })
     }
@@ -147,7 +173,43 @@ class AdminService extends BaseService {
         url: `/management/subject/${subject}/${id}`,
       });
     }
+  
+    getItems({ item }) {
+      return this.apiGet({
+        url: `/management/items/${item}`,
+      });
+    }
+    getItemForm({ item ,scope="create"}) {
+      return this.apiGet({
+        url: `/forms/${item}`,
+        params: { scope },
+      });
+    }
+
+    getItemData({ item, id }) {
+      return this.apiGet({
+        url: `/management/item/${item}/${id}`,
+      });
+    }
+
+   deleteItem({ item, id }) {
+    return this.apiDelete({
+      url: `/management/item/${item}/${id}`,
+    });
+   }
 
+   updateItem({ item, id, data }) {
+    return this.apiPut({
+      url: `/management/item/${item}/${id}`,
+      data,
+    });
+   }
+
+   viewItem({ item, id }) {
+    return this.apiGet({
+      url: `/management/item/${item}/${id}`,
+    });
+   }
 
     viewLocation({ id }) {
       return this.apiGet({
@@ -166,7 +228,7 @@ class AdminService extends BaseService {
       const type = subject === 'location' ? 'location' : 'stakeholder';
       return this.apiPut({
         url: `/management/subject/${type}/${id}`,
-        data: filterCreateData(data),
+        data: data,
       });
     }
 
@@ -177,15 +239,25 @@ class AdminService extends BaseService {
       });
     }
 
-    getUserGrowth(activeFilter) {
-      return this.apiGet({
+    async getUserGrowth(activeFilter) {
+      const { data } = await 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}`,
+      })
+    }
+  getTopContributors({ params }) {
+    return this.apiGet({
+      url: `/accounts/dashboard/top-contributors`,
+      params,
+    });
+  }
 }
-
 export default createLazyService(AdminService);

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

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

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

@@ -63,29 +63,19 @@ export const getDefaultActiveFilters = (
 };
 
 const NEW_PAGINATION_APPS = ["nashiriki"];
-
 export const filterParams = (value, module) => {
 	const { activeFilters, ...rest } = value;
 
-	const {
-		page = 1,
-		pageSize = 20,
-		sortDir,
-		sortBy,
-		search,
-		searchParams,
-		...filters
-	} = activeFilters || {};
+	const { page, pageSize, sortDir, sortBy, search, searchParams, ...filters } =
+		activeFilters || {};
 
 	const params = {};
-
+	
 	params.pagination = JSON.stringify({
-		page,
-		pageSize,
+		[NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
+		[NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize,
 	});
 
-	params.filters = JSON.stringify(filters);
-
 	if (search && searchParams) {
 		params.search = JSON.stringify({
 			qs: search,
@@ -100,6 +90,14 @@ 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,7 +1,24 @@
 const en = {
+  "admin::events": "Events",
+  "admin::Deleted": "Deleted",
+  "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",
+  "add-new": "Add new",
+  "sbg-admin::remove-user-body":
+      "The user will lose access to the application and to all data created for this account.",
+  "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",
+  "sbg-admin::remove-user-title":"Are you sure you want to remove the user from this account?",
+  "sbg-admin::remove-user-body":"The user will lose access to the application and to all data created for this account.",
   "Administrative-level-1": "Administrative Level 1",
   "Administrative-level-2": "Administrative Level 2",
   "merge-output": "Merge Output",
@@ -1430,6 +1447,7 @@ const en = {
   FB00006: "Account successfully activated",
   FB00007:
     "Make sure that this has been properly communicated, as the account admin holds critical user management privileges.",
+    MD0004: "Are you sure you want to remove this user from this account?",
   admin: {
     "merge-subjects": "Merge Subjects",
     "events": "Events",
@@ -1459,13 +1477,15 @@ const en = {
     "reactivate-content":
       "All associated users will be able to access the application.",
     "transfer-admin-rights": "Transfer admin rights",
+    "transfer-account-admin-rights": "Transfer Account Admin Rights",
     "remove-user-from-acc": "Remove user from account",
     "remove-user-title":
       "Are you sure you want to remove the user from this account?",
-    "remove-user-body":
-      "The user will lose access to the application and to all data created for this account.",
+    
     "curr-admin": "Current Admin",
     "new-admin": "New Admin",
+    "role-after-transfer": "Your New Role",
+    "role-after-transfer-help": "After transferring admin rights, you will be assigned this role",
     "new-user": "New User",
     "add-user": "Add User",
     "edit-user": "Edit User",

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

@@ -1,4 +1,21 @@
 const fr = {
+	"admin::events": "Événements",
+	"admin::document": "Documents",
+	"events": "Événements",
+	"admin::Deleted": "Supprimé",
+	"stakeholders": "Parties prenantes",
+	"merge-locations": "Fusionner les lieux",
+	"edit-account": "Modifier le compte",
+	"Are-you-sure-you-want-to-remove-the-user-from-this-account?": "Êtes-vous sûr de vouloir retirer l'utilisateur de ce compte ?",
+	"The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "L'utilisateur perdra l'accès à l'application et à toutes les données créées pour ce compte.",
+	"merge": "Fusionner",
+	"Are-you-sure-you-want-to-suspend-this-account?": "Êtes-vous sûr de vouloir suspendre ce compte ?",
+	"Associated-users-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "Les utilisateurs associés perdront l'accès à l'application et à toutes les données créées pour ce compte.",
+	"current_subjects": "Sujets actuels",
+	"merged_output": "Résultat fusionné",
+	"merge-subjects": "Fusionner les sujets",
+"FB00007": "Assurez-vous que cela a été correctement communiqué, car l’administrateur du compte détient des privilèges critiques de gestion des utilisateurs.",
+"add-new": "Ajouter un nouveau",
 	"All Data": "Toutes les données",
 	"Site": "Site",
 	"Production Sites": "Sites de production",

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

@@ -1,4 +1,22 @@
 const sp = {
+  "admin::events": "Eventos",
+  "admin::document": "Documentos",
+  "events": "Eventos",
+  "admin::Deleted": "Eliminado",
+  "stakeholders": "Partes interesadas",
+  "merge-locations": "Fusionar ubicaciones",
+  "edit-account": "Editar cuenta",
+  "Are-you-sure-you-want-to-remove-the-user-from-this-account?": "¿Está seguro de que desea eliminar al usuario de esta cuenta?",
+  "The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "El usuario perderá el acceso a la aplicación y a todos los datos creados para esta cuenta.",
+  "merge": "Fusionar",
+  "FB00007": "Asegúrese de que esto se haya comunicado correctamente, ya que el administrador de la cuenta tiene privilegios críticos de gestión de usuarios.",
+"Custodian":"Custodio",
+"add-new": "Añadir nuevo",
+  "Are-you-sure-you-want-to-suspend-this-account?": "¿Está seguro de que desea suspender esta cuenta?",
+  "Associated-users-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "Los usuarios asociados perderán el acceso a la aplicación y a todos los datos creados para esta cuenta.",
+  "current_subjects": "Sujetos actuales",
+  "merged_output": "Resultado fusionado",
+  "merge-subjects": "Fusionar sujetos",
   "All Data": "Todos los datos",
   "Site": "Sitio",
   "Production Sites": "Centros de producción",
@@ -202,7 +220,7 @@ const sp = {
   "Added On": "Agregado en",
   "KYC information has not provided": "La información KYC no ha sido proporcionada",
   "KYC information has been submitted but is incomplete": "La información KYC ha sido enviada pero está incompleta",
-  "Although this criterion was assessed as fully compliant, it includes expired documentation." : "A pesar que este criterio se evaluó como cumplido, incluye documentación con fechas de vencimiento expiradas",
+  "Although this criterion was assessed as fully compliant, it includes expired documentation.": "A pesar que este criterio se evaluó como cumplido, incluye documentación con fechas de vencimiento expiradas",
   "No planning required": "No se requiere planeación",
   "Not Compliant 0%": "No Cumple 0%",
   "In Progress 25% ": "En Proceso 25% ",
@@ -241,8 +259,8 @@ const sp = {
   "Number of Workers": "Número de trabajadores",
   "Sites": "Centros",
   "Site Details": "Datos del centro",
-  "Delete Information" : "Borrar información",
-  "Are you sure you want to delete this information" : "¿Está seguro de que desea eliminar esta información?",
+  "Delete Information": "Borrar información",
+  "Are you sure you want to delete this information": "¿Está seguro de que desea eliminar esta información?",
   "Edit site": "Modificar centro",
   "City": "Ciudad",
   "Stakeholders": "Interesados",
@@ -1936,11 +1954,14 @@ const sp = {
     "reactivate-title": "¿Está seguro de que desea reactivar esta cuenta?",
     "reactivate-content": "Todos los usuarios asociados podrán acceder a la aplicación.",
     "transfer-admin-rights": "Transferir derechos de administrador",
+    "transfer-account-admin-rights": "Transferir Derechos de Administrador de Cuenta",
     "remove-user-from-acc": "Eliminar usuario de la cuenta",
     "remove-user-title": "¿Está seguro de que desea eliminar al usuario de esta cuenta?",
     "remove-user-body": "El usuario perderá el acceso a la aplicación y a todos los datos creados para esta cuenta.",
     "curr-admin": "Administrador Actual",
     "new-admin": "Nuevo Administrador",
+    "role-after-transfer": "Su Nuevo Rol",
+    "role-after-transfer-help": "Después de transferir los derechos de administrador, se le asignará este rol",
     "add-user": "Añadir Usuario",
     "edit-user": "Editar Usuario",
     "edit-account": "Editar Cuenta",
@@ -1952,10 +1973,10 @@ const sp = {
     "new-account": "Nueva Cuenta",
     "add-user-to-acc": "Añadir Usuario a la Cuenta",
     "cancel-inv-title": "¿Está seguro de que desea cancelar esta invitación?",
-    "users" : "Usuarios",
-    "account" : "Cuenta",
-    'subjects' : "Temas",
-    "key-indicators" : "Indicadores Clave",
+    "users": "Usuarios",
+    "account": "Cuenta",
+    'subjects': "Temas",
+    "key-indicators": "Indicadores Clave",
   },
 }
 

package/src/helpers/copyToClipboard.js

@@ -41,3 +41,63 @@ 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;
+}
+
+