datastake-daf 0.6.834 → 0.6.837

package/src/@daf/pages/Dashboards/ConflictManagement/components/RisksWidget/components/ProblemSolver/hook.js

@@ -0,0 +1,83 @@
+import { useEffect, useMemo, useState } from "react";
+import DashboardService from "../../../../../../../services/DashboardService.js";
+
+
+export default function useProblemSolvers({ t = () => {} } = {}) {
+	const [filters, setFilters] = useState({
+		administrativeLevel1: "all",
+	});
+
+	const [filterOptions, setFilterOptions] = useState([]);
+
+
+	useEffect(() => {
+		async function fetchOptions() {
+			try {
+				const { data } = await DashboardService.getWidgetConflictManagement(
+					"/problem-solvers",
+					{},
+					"dashboard/conflict-management"
+				);
+
+				const all = Object.keys(data);
+
+				const options = all
+					.map((key) => {
+						const actions = data[key].actions;
+
+						return actions.map((action) => {
+							if (action.location === undefined) {
+								return;
+							}
+							const administrativeLevel1 = action?.location?.administrativeLevel1;
+							const name =
+								action?.location?.linking?.SCL?.[administrativeLevel1]?.name;
+							return {
+								label: name,
+								value: administrativeLevel1,
+							};
+						});
+					})
+					.flat()
+					.filter((item) => item !== undefined);
+
+				setFilterOptions(options);
+			} catch (err) {
+				console.log(err);
+			}
+		}
+
+		fetchOptions();
+	}, []);
+
+
+	const filtersConfig = useMemo(
+		() => ({
+			filtersConfig: {
+				administrativeLevel1: {
+					type: "select",
+					label: "",
+					placeholder: t("Select"),
+					style: { flex: 1 },
+					labelStyle: { flex: 1 },
+				},
+			},
+			onApply: (val) => setFilters(val),
+			options: {
+				administrativeLevel1: [
+					{ label: t("All"), value: "all" },
+					...filterOptions,
+				],
+			},
+			selectedFilters: filters,
+			type: "small",
+			t,
+		}),
+		[t, filters, filterOptions]
+	);
+
+	return {
+		filters,
+		filtersConfig,
+	};
+}

package/src/@daf/{core/components/Screens → pages/Dashboards}/ConflictManagement/components/RisksWidget/components/ProblemSolver/index.js

@@ -1,20 +1,21 @@
 import React, { useMemo, useCallback } from 'react'
 import PropTypes from 'prop-types';
-import { renderTooltipJsx } from '../../../../../../../../utils/tooltip.js';
-import Widget from '../../../../../../../../core/components/Dashboard/Widget/index.jsx';
-import Chart from '../../../../../../../../core/components/Charts/PieChart/chart.jsx';
-import {useWidgetFetch} from '../../../../../../../../hooks/useWidgetFetch.js';
+import { renderTooltipJsx } from '../../../../../../../utils/tooltip.js';
+import Widget from '../../../../../../../core/components/Dashboard/Widget/index.jsx';
+import Chart from '../../../../../../../core/components/Charts/PieChart/chart.jsx';
+import {useWidgetFetch} from '../../../../../../../hooks/useWidgetFetch.js';
+import DashboardService from '../../../../../../../services/DashboardService.js';
 import useProblemSolvers from './hook.js';
 
 const distributionColors = ["#3061A8", "#6698E4", "#A6C3EF", "#D6E3F8", "#E6EEFB"];
 
 function ProblemSolvers({ selectedPartners = {}, loading: parentLoading = false, t=()=>{}, theme = {}, selectedRange ,goTo = () => {}, getRedirectLink = () => {}}) {
-    const { filters, filtersConfig } = useProblemSolvers();
+    const { filters, filtersConfig } = useProblemSolvers({ t });
 
     const defaultFetchConfig = useMemo(
         () => ({
-            basepath: "conflict-management",  
             url: "/problem-solvers",
+            basepath: "dashboard/conflict-management",
             filters: {
                 ...filters,
                 period: selectedRange,
@@ -26,8 +27,14 @@ function ProblemSolvers({ selectedPartners = {}, loading: parentLoading = false,
         [filters, selectedRange, selectedPartners],
     );
     
+    const getData = useCallback(({ url, filters, basepath }) => {
+        return DashboardService.getWidgetConflictManagement(url, filters, basepath);
+    }, []);
 
-    const { data, loading } = useWidgetFetch({ config: defaultFetchConfig });
+    const { data, loading } = useWidgetFetch({ 
+        config: defaultFetchConfig,
+        getData 
+    });
 
     const pieData = useMemo(() => {
         if (!data || Array.isArray(data)) return []; 

package/src/@daf/pages/Dashboards/ConflictManagement/components/RisksWidget/components/TerritorialDistribution/config.js

@@ -0,0 +1,10 @@
+
+export const getColors = (theme) => {
+  return [
+    theme.colorPrimary8,
+    theme.colorPrimary7,
+    theme.colorPrimary5,
+    theme.colorPrimary6,
+    theme.colorPrimary4,
+  ];
+};

package/src/@daf/{core/components/Screens → pages/Dashboards}/ConflictManagement/components/RisksWidget/components/TerritorialDistribution/index.js

@@ -1,32 +1,38 @@
 import React, { useMemo, useCallback } from 'react'
 import PropTypes from 'prop-types';
-import { renderTooltipJsx } from '../../../../../../../../utils/tooltip.js';
-import Widget from '../../../../../../../../core/components/Dashboard/Widget/index.jsx';
-import Chart from '../../../../../../../../core/components/Charts/PieChart/chart.jsx';
-import {useWidgetFetch} from '../../../../../../../../hooks/useWidgetFetch.js';
+import { renderTooltipJsx } from '../../../../../../../utils/tooltip.js';
+import Widget from '../../../../../../../core/components/Dashboard/Widget/index.jsx';
+import Chart from '../../../../../../../core/components/Charts/PieChart/chart.jsx';
+import {useWidgetFetch} from '../../../../../../../hooks/useWidgetFetch.js';
+import DashboardService from '../../../../../../../services/DashboardService.js';
 import { getColors } from './config.js';
-import useTerritorialDistribution from './config.js';
 
 function TerritorialDistribution({ selectedPartners = {}, loading: parentLoading = false, t = (s) => s, theme = {}, category = "conflict", selectedRange ,goTo = () => {}, getRedirectLink = () => {}}) {
-    const { filters, filtersConfig } = useTerritorialDistribution({ t });
     const colors = getColors(theme);
 
     const defaultFetchConfig = useMemo(
         () => ({
             url: "/territorial-distribution",
+            basepath: "dashboard/conflict-management",
             filters: {
-                ...filters,
                 category,
                 period: selectedRange,
                 sources: selectedPartners?.partners || [],
             },
-            defaultData: [],
+            defaultData: {},
             stop: selectedPartners?.loading,
         }),
-        [filters, category, selectedRange, selectedPartners],
+        [category, selectedRange, selectedPartners],
     );
 
-    const { data, loading } = useWidgetFetch({ config: defaultFetchConfig });
+    const getData = useCallback(({ url, filters, basepath }) => {
+        return DashboardService.getWidgetConflictManagement(url, filters, basepath);
+    }, []);
+
+    const { data, loading } = useWidgetFetch({ 
+        config: defaultFetchConfig,
+        getData 
+    });
 
     const pieData = useMemo(() => {
         if (!data || Array.isArray(data)) return []; 
@@ -50,7 +56,7 @@ function TerritorialDistribution({ selectedPartners = {}, loading: parentLoading
     const isEmpty = !pieData.length;
 
     const getTooltipChildren = useCallback((items) => {
-        const item = items[0]; 
+        const item = Array.isArray(items) ? items[0] : items;
         
         return renderTooltipJsx({
             title: item?.label || t("Undetermined"),
@@ -58,7 +64,7 @@ function TerritorialDistribution({ selectedPartners = {}, loading: parentLoading
             onClickLink: () => {
                  if (item?.label) {
                      goTo(
-                         `/app/incident?administrativeLevel1=${item?.locationData?.administrativeLevel1}&administrativeLevel2=${item?.locationData?.administrativeLevel2}&country=${item?.locationData?.country}`,
+                         `/app/incidents?administrativeLevel1=${item?.locationData?.administrativeLevel1}&administrativeLevel2=${item?.locationData?.administrativeLevel2}&country=${item?.locationData?.country}`,
                      );
                  } else {
                     goTo("/app/incident");
@@ -78,7 +84,6 @@ function TerritorialDistribution({ selectedPartners = {}, loading: parentLoading
             loading={loading || parentLoading}
             title={t("Territorial Distribution")}
             className="with-border-header"
-            filtersConfig={filtersConfig}
         >
             <Chart
                 mouseXOffset={10}

package/src/@daf/{core/components/Screens → pages/Dashboards}/ConflictManagement/components/RisksWidget/index.js

@@ -1,10 +1,10 @@
 import { Select } from "antd";
 import { useState } from "react";
-import Widget from "../../../../Dashboard/Widget/index.jsx";
 import IncidentsTime from "./components/IncidentsTime/index.js";
 import TerritorialDistribution from "./components/TerritorialDistribution/index.js";
 import ProblemSolver from "./components/ProblemSolver/index.js";
 import { filterOptions } from "./config.js";
+import Widget from "../../../../../core/components/Dashboard/Widget/index.jsx";
 
 export default function RisksWidget({ 
     title = "Analytics",

package/src/@daf/{core/components/Screens → pages/Dashboards}/ConflictManagement/index.js

@@ -1,12 +1,12 @@
 import React, { useMemo, useEffect } from "react";
-import Header from "../../Header/index.jsx";
 import KeyIndicators from "./components/KeyIndicators/index.js";
-import Multiselect from "../../Select/MultiSelect/index.jsx";
 import MineSites from "./components/MineSite/index.js";
 import RisksWidget from "./components/RisksWidget/index.js";
-import { useSources } from "../../../../hooks/useSources.js";
-import { renderBreadCrumbs } from "../../../../../helpers/breadCrumbs.js";
-import CustomIcon from "../../Icon/CustomIcon.jsx";
+import { useSources } from "../../../hooks/useSources.js";
+import { renderBreadCrumbs } from "../../../../helpers/breadCrumbs.js";
+import CustomIcon from "../../../core/components/Icon/CustomIcon.jsx";
+import { Header, Multiselect } from "../../../../index.js";
+import DashboardLayout from '../../../core/components/Dashboard/DashboardLayout/index.jsx';
 
 export default function ConflictManagement({ 
     t=()=>{}, 
@@ -15,7 +15,9 @@ export default function ConflictManagement({
     goTo = () => {}, 
     getRedirectLink = (s) => s, 
     theme = {},
-    options = {}
+    options = {},
+	breadcrumbs = [],
+
 }) {
 	const { partners, selectedPartners, setSelectedPartners, informationSources } =
 		useSources({ user, t });
@@ -45,8 +47,11 @@ export default function ConflictManagement({
 	}, [partners, user, theme]);
 
 	return (
-		<div className="daf-analysis">
-			<Header
+		
+        <DashboardLayout
+		
+		header={
+		<Header
 				title={t("conflict-management")}
 				breadcrumbs={breadCrumbs}
 				supportText={
@@ -63,7 +68,6 @@ export default function ConflictManagement({
 				}
 				addedHeader={
 					<div>
-						<div className="flex-1" />
 						<Multiselect
 							options={[...sourceOptions]}
 							isAvatarGroup
@@ -82,12 +86,9 @@ export default function ConflictManagement({
 						/>
 					</div>
 				}
-			/>
+			/>}
+			>
 
-			<div className="content">
-				<div className="view-content">
-					<div className="daf-analysis-layout">
-						<div className="sections-cont w-pt">
 							<section>
 								<KeyIndicators
 									selectedPartners={selectedPartners}
@@ -126,11 +127,8 @@ export default function ConflictManagement({
                                     options={options}
 								/>
 							</section>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
+			
+        </DashboardLayout>
 	);
 }
 

package/src/@daf/pages/Dashboards/SupplyChain/components/ChartsContainer/components/GenderDistribution/index.js

@@ -51,7 +51,7 @@ function GenderDistribution({
 					items: [
 						{
 							label:
-								options?.optionPositionSupplyChain?.find((o) => {
+								(options?.optionPositionSupplyChain || options?.positionSupplyChainOptions || [])?.find((o) => {
 									return o.value === item.key;
 								}).label || item.key,
 							value: data[item.key] || 0,

package/src/@daf/pages/Dashboards/SupplyChain/components/KeyIndicators/config.js

@@ -9,7 +9,7 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {},
 				t={t} 
 				getRedirectLink={getRedirectLink} 
 				theme={theme} 
-				label="Identified Mine Sites" 
+				label={t("Identified Mine Sites")} 
 				link={APP === 'nashiriki' ? '/app/scl' : '/app/production-sites'} 
 			/>
 		),
@@ -23,7 +23,7 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {},
 				t={t} 
 				getRedirectLink={getRedirectLink} 
 				theme={theme} 
-				label="Identified Operators" 
+				label={t("Identified Operators")} 
 				link="/app/operators" 
 			/>
 		),
@@ -43,7 +43,7 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {},
 				t={t} 
 				getRedirectLink={getRedirectLink} 
 				theme={theme} 
-				label="Associated Documents" 
+				label={t("Associated Documents")}
 				link="/app/documents" 
 			/>
 		),
@@ -55,7 +55,7 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {},
 				t={t} 
 				getRedirectLink={getRedirectLink} 
 				theme={theme} 
-				label="Information Sources" 
+				label={t("Information Sources")} 
 				link="/app/partners" 
 			/>
 		),

package/src/@daf/pages/Data/Channels/columns.js

@@ -52,7 +52,7 @@ const getLinkValue = (value, linkingObject) => {
               return <div className="daf-default-cell" />
             }
   
-            const category = findOptions(v, data?.options?.locationCategories);
+            const category = findOptions(v, options?.locationCategories);
       
             return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
           },

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

@@ -64,7 +64,6 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          // const country = findOptions(v, data?.options?.positionSupplyChainOptions);
           const mineSite = all?.location?.name
 
           return mineSite ? <Tooltip title={mineSite}>{mineSite}</Tooltip> : '-';
@@ -113,7 +112,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             "corrective-actions": "correctiveActions",
             "activities": "activity",
           }
-          const eventCategory = findOptions(v, data?.options?.eventCategoryOptions || data?.options?.categoryOptions);
+          const eventCategory = findOptions(v, options?.eventCategoryOptions || options?.categoryOptions);
           const categoryValue = getEventCategoryBySubject(eventCategory, subjectMap[subject], true);
           
           return categoryValue ? <Tooltip title={categoryValue}>{categoryValue}</Tooltip> : '-';

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

@@ -64,7 +64,6 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          // const country = findOptions(v, data?.options?.positionSupplyChainOptions);
           const mineSite = all?.location?.name
 
           return mineSite ? <Tooltip title={mineSite}>{mineSite}</Tooltip> : '-';
@@ -110,7 +109,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const eventCategory = findOptions(v, data?.options?.eventCategoryOptions || data?.options?.categoryOptions);
+          const eventCategory = findOptions(v, options?.eventCategoryOptions || options?.categoryOptions);
           const categoryValue = getEventCategoryBySubject(eventCategory, subject);
           
           return categoryValue ? <Tooltip title={categoryValue}>{categoryValue}</Tooltip> : '-';

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

@@ -81,7 +81,6 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          // const country = findOptions(v, data?.options?.positionSupplyChainOptions);
           const mineSite = all?.location?.name
 
           return mineSite ? <Tooltip title={mineSite}>{mineSite}</Tooltip> : '-';
@@ -97,7 +96,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const eventCategory = findOptions(v, data?.options?.eventCategoryOptions || data?.options?.categoryOptions);
+          const eventCategory = findOptions(v, options?.eventCategoryOptions || options?.categoryOptions);
           const categoryValue = getEventCategoryBySubject(eventCategory, subject);
           
           return categoryValue ? <Tooltip title={categoryValue}>{categoryValue}</Tooltip> : '-';

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

@@ -116,7 +116,7 @@ export const getColumns = ({ t, goTo, user, options, activeTab, getRedirectLink,
           return "-";
         }
 
-        const categoryOptions = (data?.options?.categoryOptions || []).map((c) => {
+        const categoryOptions = (options?.categoryOptions || []).map((c) => {
           const searchTerm = `typeOfEvent is ${all.navigationEventType}`;
 
           return {
@@ -127,8 +127,8 @@ export const getColumns = ({ t, goTo, user, options, activeTab, getRedirectLink,
 
         const relaxantOptions = [
           ...categoryOptions,
-          ...(data?.options?.eventsType || []),
-          ...(data?.options?.testimonialsType || []),
+          ...(options?.eventsType || []),
+          ...(options?.testimonialsType || []),
         ];
 
         const title = relaxantOptions.find((v) => v.value === value)?.label || "-";

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

@@ -52,7 +52,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         }
 
         const locationCategories = [
-          ...(data?.options?.locationCategories || []), 
+          ...(options?.locationCategories || []), 
           ...(options?.productionSiteCategories || []), 
           ...(options?.locationCategories || [])
         ]

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

@@ -50,7 +50,6 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           }
 
           const positionSupplyChainOptions = [
-            ...(data?.options?.positionSupplyChainOptions || []), 
             ...(options?.positionSupplyChainOptions || []),
             ...(options?.optionPositionSupplyChain || [])
           ]
@@ -73,7 +72,6 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           }
 
           const subCategoriesOptions = [
-            ...(data?.options?.subCategoriesOptions || []), 
             ...(options?.subCategoriesOptions || []),
             ...(options?.subCategory || [])
           ]

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

@@ -50,7 +50,6 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          // const country = findOptions(v, data?.options?.positionSupplyChainOptions);
           const mineSite = all?.location?.name
 
           return mineSite ? <Tooltip title={mineSite}>{mineSite}</Tooltip> : '-';
@@ -67,8 +66,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           }
 
           const activityAtSiteOptions = [
-            ...(data?.options?.activityAtSiteOptions || []), 
-            ...(options?.activityAtSiteOptions || []),
+            ...(options?.activityAtSiteOptions || []), 
             ...(options?.activityAtSite || [])
           ]
 

package/src/@daf/pages/Summary/Operator/components/KeyInformation/config.js

@@ -43,6 +43,7 @@ export const getKeyIndicatorConfig = ({ t, data = {}, options = {} }) => [
 		label: t("Legal Form"),
 		render: () => {
             const subCategory = findOptions(data?.subCategory, options?.subCategoriesOptions || options?.subCategory);
+			console.log({subCategory, initialSub: data?.subCategory, options: options?.subCategoriesOptions || options?.subCategory})
 			if(subCategory?.length > 22) {
 				const _subCategory = truncateString(subCategory, 22);
 				return <Tooltip title={subCategory}>

package/src/@daf/pages/TablePage/create.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect} from 'react'
+import React, { useEffect, useMemo} from 'react'
 import { message } from 'antd';
 import { MessageTypes } from '../../../helpers/messages.js';
 import DynamicForm from '../../core/components/DynamicForm/index.jsx';
@@ -38,16 +38,16 @@ const Create = ({
         data: formValue
     };
 
+    const language = useMemo(() => user?.language, [user?.language]);
+
     useEffect(() => {
-        if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
-          if (!edit) {
+        if (!edit) {
             getData({ namespace, module: APP, view, scope });
-          } else {
+        } else {
             form = formConfig;
             data = formValue;
-          }
         }
-    }, [edit, user?.language, scope]);
+    }, [edit, language, scope, namespace, APP, view]);
 
     return (
         <div className="daf-create-form">

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

@@ -41,12 +41,6 @@ const TablePage = ({
     breadcrumbs = [],
     onDownload,
 }) => {
-    const _options = useMemo(() => {
-        return {
-            ...options,
-            ...data?.options,
-        }
-    },[options, data?.options])
     
     const {
         activeTab,
@@ -63,7 +57,7 @@ const TablePage = ({
         location,
         getData,
         extendingFilters,
-        options: _options,
+        options,
         t,
         goTo,
         user,

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

@@ -25,14 +25,14 @@ class DashboardService extends BaseService {
       });
     }
 
-    // getWidgetConflictManagement({ url, params = {}, filters = {} }) {
-    //   return this.apiGet({
-    //     url: `/dashboard/conflict-management${url}`,
-    //     params: { ...params, ...filters },
-    //     isApp: true,
-    //   });
-    // }
-    
+    getWidgetConflictManagement(url, params, basepath = "dashboard/conflict-management") {
+      return this.apiGet({
+        url: `/${basepath}${url}`,
+        params,
+        isApp: true,
+      });
+    }
+  
 }
 
 export default createLazyService(DashboardService);

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

@@ -1,4 +1,9 @@
 const en = {
+  "Identified Mine Sites": "Identified Mine Sites",
+  "Associated Documents": "Associated Documents",
+  "Male": "Male",
+  "Female": "Female",
+  "Invalid input": "Invalid input",
   "conflict-management": "Conflict Management",
   "review-requests": "Review Requests",
   "create-account": "Create Account",
@@ -1430,6 +1435,7 @@ const en = {
   "max-char": "Maximum {{filled}}/{{chars}} characters.",
   "max-items": "Maximum {{chars}} items.",
   "max-item": "Maximum {{chars}} item.",
+  "organisation-already-exist": "If your organisation is already active on {{appName}}, your application will not be reviewed. Instead, please contact the account's main user and request an invitation.",
   projectInviteBackDesc:
     "Are you sure you want to invite this source again?This user will receive a new notification",
   DataStore: {

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

@@ -1,4 +1,9 @@
 const fr = {
+	"Identified Mine Sites": "Sites miniers identifiés",
+	"Associated Documents": "Documents associés",
+	"Male": "Masculin",
+	"Female": "Féminin",
+	"Invalid input": "Entrée invalide",
 	"review-requests": "Examiner les demandes",
 	"create-account": "Créer un compte",
 	"manage-users": "Gérer les utilisateurs",
@@ -1444,6 +1449,7 @@ const fr = {
 	"Almost There": "On y est presque",
 	"Help us guide you to the right application":
 		"Aidez-nous à vous guider vers la bonne application",
+		"organisation-already-exist": "Si votre organisation est déjà active dans {{appName}}, votre requête ne sera pas revue. Prière de contacter l’utilisateur principal et solliciter une invitation.",
 	"If your organisation is already active on Datastake, your application will not be reviewed. Instead, please contact the account's main user and request an invitation":
 		"Si votre organisation est déjà active dans Datastake, votre requête ne sera pas revue. Prière de contacter l’utilisateur principal et solliciter une invitation",
 	"Yes, I understand": "Oui, je comprends",

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

@@ -1,4 +1,9 @@
 const sp = {
+  "Identified Mine Sites": "Sitios mineros identificados",
+  "Associated Documents": "Documentos asociados",
+  "Male": "Masculino",
+  "Female": "Femenino",
+  "Invalid input": "Entrada inválida",
   "review-requests": "Revisar solicitudes",
 "create-account": "Crear cuenta",
 "manage-users": "Gestionar usuarios",
@@ -1005,6 +1010,7 @@ const sp = {
   "Please introduce yourself": "Preséntese",
   "Almost There": "Ya casi está",
   "Help us guide you to the right application": "Ayúdenos a guiarle hacia la solicitud correcta",
+  "organisation-already-exist": "Si su organización ya está activa en {{appName}}, su solicitud no será revisada. En su lugar, póngase en contacto con el usuario principal de la cuenta y solicite una invitación.",
   "If your organisation is already active on Datastake, your application will not be reviewed. Instead, please contact the account's main user and request an invitation": "Si su organización ya está activa en Datastake, su solicitud no será revisada. En su lugar, póngase en contacto con el usuario principal de la cuenta y solicite una invitación.",
   "Yes, I understand": "Sí, entiendo",
   "Protect your data assets": "Proteja sus activos de datos",

package/src/pages.js

@@ -23,4 +23,4 @@ export { default as View } from './@daf/pages/View/index.jsx';
 export { default as Edit } from './@daf/pages/Edit/index.jsx';
 
 // Conflict Management
-export { default as ConflictManagement } from './@daf/core/components/Screens/ConflictManagement/index.js';
+export { default as ConflictManagement } from './@daf/pages/Dashboards/ConflictManagement/index.js'