datastake-daf 0.6.834 → 0.6.835

package/dist/components/index.js

@@ -43057,7 +43057,38 @@ function AuthForm(_ref) {
       initialValues: isMultiStep ? allFormValues : initialValues,
       onFinish: handleSubmit,
       onValuesChange: handleValuesChange,
-      children: [currentFields.map(renderField), formErrors ? renderErrors(formErrors, t) : null, isMultiStep && currentStep > 0 ? /*#__PURE__*/jsxRuntime.jsxs("div", {
+      children: [(() => {
+        const {
+          step,
+          order
+        } = additionalItemConfig;
+        const shouldShowAdditionalItem = additionalItem && (step === undefined || step === currentStep);
+        if (!shouldShowAdditionalItem) {
+          return currentFields.map(renderField);
+        }
+        const fieldsWithAdditionalItem = [...currentFields];
+        const insertIndex = order !== undefined ? order : fieldsWithAdditionalItem.length;
+        return fieldsWithAdditionalItem.map((field, index) => {
+          const elements = [];
+          if (index === insertIndex) {
+            elements.push( /*#__PURE__*/jsxRuntime.jsx("div", {
+              style: {
+                marginBottom: '16px',
+                marginTop: '16px'
+              },
+              children: additionalItem
+            }, "additional-item"));
+          }
+          elements.push(renderField(field));
+          return elements;
+        }).flat().concat(insertIndex >= fieldsWithAdditionalItem.length ? /*#__PURE__*/jsxRuntime.jsx("div", {
+          style: {
+            marginBottom: '16px',
+            marginTop: '16px'
+          },
+          children: additionalItem
+        }, "additional-item") : []);
+      })(), formErrors ? renderErrors(formErrors, t) : null, isMultiStep && currentStep > 0 ? /*#__PURE__*/jsxRuntime.jsxs("div", {
         className: "flex flex-column gap-2",
         style: {
           width: '100%'

package/dist/pages/index.js

@@ -7575,7 +7575,7 @@ const getRowConfig$2 = ({
     t: t,
     getRedirectLink: getRedirectLink,
     theme: theme,
-    label: "Identified Mine Sites",
+    label: t("Identified Mine Sites"),
     link: APP === 'nashiriki' ? '/app/scl' : '/app/production-sites'
   }),
   render: () => {
@@ -7588,7 +7588,7 @@ const getRowConfig$2 = ({
     t: t,
     getRedirectLink: getRedirectLink,
     theme: theme,
-    label: "Identified Operators",
+    label: t("Identified Operators"),
     link: "/app/operators"
   }),
   render: () => /*#__PURE__*/jsxRuntime.jsx("span", {
@@ -7610,7 +7610,7 @@ const getRowConfig$2 = ({
     t: t,
     getRedirectLink: getRedirectLink,
     theme: theme,
-    label: "Associated Documents",
+    label: t("Associated Documents"),
     link: "/app/documents"
   }),
   render: () => /*#__PURE__*/jsxRuntime.jsx("span", {
@@ -7621,7 +7621,7 @@ const getRowConfig$2 = ({
     t: t,
     getRedirectLink: getRedirectLink,
     theme: theme,
-    label: "Information Sources",
+    label: t("Information Sources"),
     link: "/app/partners"
   }),
   render: () => /*#__PURE__*/jsxRuntime.jsx("span", {
@@ -13807,7 +13807,7 @@ function GenderDistribution$1({
       return renderTooltipJsx({
         title: t("Role"),
         items: [{
-          label: options?.optionPositionSupplyChain?.find(o => {
+          label: (options?.optionPositionSupplyChain || options?.positionSupplyChainOptions || [])?.find(o => {
             return o.value === item.key;
           }).label || item.key,
           value: data[item.key] || 0
@@ -41046,21 +41046,20 @@ const Create = ({
     form: formConfig,
     data: formValue
   };
+  const language = React.useMemo(() => user?.language, [user?.language]);
   React.useEffect(() => {
-    if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
-      if (!edit) {
-        getData({
-          namespace,
-          module: APP,
-          view,
-          scope
-        });
-      } else {
-        form = formConfig;
-        data = formValue;
-      }
+    if (!edit) {
+      getData({
+        namespace,
+        module: APP,
+        view,
+        scope
+      });
+    } else {
+      form = formConfig;
+      data = formValue;
     }
-  }, [edit, user?.language, scope]);
+  }, [edit, language, scope, namespace, APP, view]);
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: "daf-create-form",
     children: /*#__PURE__*/jsxRuntime.jsx(DynamicForm, {
@@ -41707,7 +41706,7 @@ const getColumns$e = ({
         className: "daf-default-cell"
       });
     }
-    const positionSupplyChainOptions = [...(data?.options?.positionSupplyChainOptions || []), ...(options?.positionSupplyChainOptions || []), ...(options?.optionPositionSupplyChain || [])];
+    const positionSupplyChainOptions = [...(options?.positionSupplyChainOptions || []), ...(options?.optionPositionSupplyChain || [])];
     const country = findOptions(v, positionSupplyChainOptions);
     return country ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: country,
@@ -41727,7 +41726,7 @@ const getColumns$e = ({
         className: "daf-default-cell"
       });
     }
-    const subCategoriesOptions = [...(data?.options?.subCategoriesOptions || []), ...(options?.subCategoriesOptions || []), ...(options?.subCategory || [])];
+    const subCategoriesOptions = [...(options?.subCategoriesOptions || []), ...(options?.subCategory || [])];
     const subCategory = findOptions(v, subCategoriesOptions);
     return subCategory ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: subCategory,
@@ -42100,8 +42099,6 @@ const getColumns$d = ({
         className: "daf-default-cell"
       });
     }
-
-    // const country = findOptions(v, data?.options?.positionSupplyChainOptions);
     const mineSite = all?.location?.name;
     return mineSite ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: mineSite,
@@ -42119,7 +42116,7 @@ const getColumns$d = ({
         className: "daf-default-cell"
       });
     }
-    const activityAtSiteOptions = [...(data?.options?.activityAtSiteOptions || []), ...(options?.activityAtSiteOptions || []), ...(options?.activityAtSite || [])];
+    const activityAtSiteOptions = [...(options?.activityAtSiteOptions || []), ...(options?.activityAtSite || [])];
     const activity = findOptions(v, activityAtSiteOptions);
     return activity ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: activity,
@@ -42858,14 +42855,14 @@ const getColumns$b = ({
       if (all.navigationEventType === "other") {
         return "-";
       }
-      const categoryOptions = (data?.options?.categoryOptions || []).map(c => {
+      const categoryOptions = (options?.categoryOptions || []).map(c => {
         const searchTerm = `typeOfEvent is ${all.navigationEventType}`;
         return {
           value: c.value,
           label: c.label[searchTerm]
         };
       });
-      const relaxantOptions = [...categoryOptions, ...(data?.options?.eventsType || []), ...(data?.options?.testimonialsType || [])];
+      const relaxantOptions = [...categoryOptions, ...(options?.eventsType || []), ...(options?.testimonialsType || [])];
       const title = relaxantOptions.find(v => v.value === value)?.label || "-";
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: title,
@@ -43280,8 +43277,6 @@ const getColumns$a = ({
         className: "daf-default-cell"
       });
     }
-
-    // const country = findOptions(v, data?.options?.positionSupplyChainOptions);
     const mineSite = all?.location?.name;
     return mineSite ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: mineSite,
@@ -43337,7 +43332,7 @@ const getColumns$a = ({
       "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 ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: categoryValue,
@@ -43712,8 +43707,6 @@ const getColumns$9 = ({
         className: "daf-default-cell"
       });
     }
-
-    // const country = findOptions(v, data?.options?.positionSupplyChainOptions);
     const mineSite = all?.location?.name;
     return mineSite ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: mineSite,
@@ -43765,7 +43758,7 @@ const getColumns$9 = ({
         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 ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: categoryValue,
@@ -44160,8 +44153,6 @@ const getColumns$8 = ({
         className: "daf-default-cell"
       });
     }
-
-    // const country = findOptions(v, data?.options?.positionSupplyChainOptions);
     const mineSite = all?.location?.name;
     return mineSite ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: mineSite,
@@ -44179,7 +44170,7 @@ const getColumns$8 = ({
         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 ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: categoryValue,
@@ -44794,7 +44785,7 @@ const getColumns$6 = ({
         className: "daf-default-cell"
       });
     }
-    const locationCategories = [...(data?.options?.locationCategories || []), ...(options?.productionSiteCategories || []), ...(options?.locationCategories || [])];
+    const locationCategories = [...(options?.locationCategories || []), ...(options?.productionSiteCategories || []), ...(options?.locationCategories || [])];
     const category = findOptions(v, locationCategories);
     return category ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: category,
@@ -45689,12 +45680,6 @@ const TablePage = ({
   breadcrumbs = [],
   onDownload
 }) => {
-  const _options = React.useMemo(() => {
-    return {
-      ...options,
-      ...data?.options
-    };
-  }, [options, data?.options]);
   const {
     activeTab,
     selectOptions,
@@ -45710,7 +45695,7 @@ const TablePage = ({
     location,
     getData,
     extendingFilters,
-    options: _options,
+    options,
     t,
     goTo,
     user,
@@ -46035,6 +46020,11 @@ const getKeyIndicatorConfig = ({
   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 /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {

package/dist/utils/index.js

@@ -7850,6 +7850,11 @@ function mapUser(user) {
 }
 
 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",
@@ -9121,6 +9126,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: {
     overview: "Overview",
@@ -9215,6 +9221,11 @@ const en = {
 };
 
 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",
@@ -10538,6 +10549,7 @@ const fr = {
   "Please introduce yourself": "Prière de vous présenter",
   "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",
   "Protect your data assets": "Protégez vos données",
@@ -11146,6 +11158,11 @@ const fr = {
 };
 
 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",
@@ -12152,6 +12169,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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.834",
+	"version": "0.6.835",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/AuthForm/index.jsx

@@ -206,7 +206,40 @@ function AuthForm ({
             onFinish={handleSubmit}
             onValuesChange={handleValuesChange}
         >
-            {currentFields.map(renderField)}
+            {(() => {
+              const { step, order } = additionalItemConfig;
+              const shouldShowAdditionalItem = additionalItem && 
+                (step === undefined || step === currentStep);
+              
+              if (!shouldShowAdditionalItem) {
+                return currentFields.map(renderField);
+              }
+              
+              const fieldsWithAdditionalItem = [...currentFields];
+              const insertIndex = order !== undefined ? order : fieldsWithAdditionalItem.length;
+              
+              return fieldsWithAdditionalItem.map((field, index) => {
+                const elements = [];
+                
+                if (index === insertIndex) {
+                  elements.push(
+                    <div key="additional-item" style={{ marginBottom: '16px',  marginTop: '16px' }}>
+                      {additionalItem}
+                    </div>
+                  );
+                }
+                
+                elements.push(renderField(field));
+                
+                return elements;
+              }).flat().concat(
+                insertIndex >= fieldsWithAdditionalItem.length ? (
+                  <div key="additional-item" style={{ marginBottom: '16px',  marginTop: '16px' }}>
+                    {additionalItem}
+                  </div>
+                ) : []
+              );
+            })()}
 
 
         {formErrors ? (

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/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",