datastake-daf 0.6.806 → 0.6.807

package/package.json

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

package/src/@daf/pages/Edit/hooks/usePrepareForm.js

@@ -28,15 +28,16 @@ export const usePrepareForm = ({
     const prepareForm = (setExtra = true) => {
 		if (isSupported) {
 			const dKey = namespaceConfig?.dataKey;
-			if (hasKeyInObject(allData, dKey)) {
-				const d = JSON.parse(JSON.stringify(allData[dKey].data || {}));
+			const nKey = `${APP}-${namespaceConfig?.view}`;
+			if (hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey)) {
+				const d = JSON.parse(JSON.stringify(allData[dKey][nKey].data || {}));
 				Object.keys(d).forEach((k) => {
 					if (d[k] === null) {
 						d[k] = undefined;
 					}
 				});
 				if (d.datastakeId === id || d.applicationId === id || id === "user" || d.id === id) {
-					const formG = mapFormGroup(allData[dKey].form || {}, d);
+					const formG = mapFormGroup(allData[dKey][nKey].form || {}, d);
 					setForm(formG);
 
 					if (setExtra) {
@@ -74,7 +75,7 @@ export const usePrepareForm = ({
 								setEditValues({ ...d });
 								setInputsMeta(d?.meta?.inputs || {});
 								setOriginalData({ ...d });
-								setLinkingForms(allData[dKey].linkingForms);
+								setLinkingForms(allData[dKey][nKey].linkingForms);
 								setLoading(false);
 								return;
 							}
@@ -84,7 +85,7 @@ export const usePrepareForm = ({
 						setEditValues({ ...d });
 						setInputsMeta(d?.meta?.inputs || {});
 						setOriginalData({ ...d });
-						setLinkingForms(allData[dKey].linkingForms);
+						setLinkingForms(allData[dKey][nKey].linkingForms);
 						setLoading(false);
 					}
 				}

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

@@ -33,13 +33,13 @@ const Create = ({
     let {
         form = {},
         data = defaultData || {},
-      } = !edit ? (formData || {}) : {
+      } = !edit ? (formData[`${APP}-${view}`] || {}) : {
         form: formConfig,
         data: formValue
     };
 
     useEffect(() => {
-        if (Object.keys(form).length === 0) {
+        if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
           if (!edit) {
             getData({ namespace, module: APP, view, scope });
           } else {

package/src/@daf/pages/View/hooks/useCallToGetData.js

@@ -1,5 +1,6 @@
 import { useRef, useEffect } from "react";
 import { hasKeyInObject } from "../../../../@daf/utils/object.js";
+import { getNkey } from "../../../../@daf/core/components/ViewForm/helper.js";
 
 export const useCallToGetData = ({
     namespaceConfig,
@@ -18,10 +19,11 @@ export const useCallToGetData = ({
   
     const callToGetData = (_doCall = false) => {
           const dKey = namespaceConfig?.dataKey;
+          const nKey = `${APP}-${getNkey(namespace || "")}`;
           const doCall = _doCall
               ? true
-              : hasKeyInObject(allData, dKey)
-              ? allData[dKey]?.data?.datastakeId !== id
+              : hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey)
+              ? allData[dKey][nKey]?.data?.datastakeId !== id
               : true;
           if (doCall) {
               if (isSupported) {

package/src/@daf/pages/View/hooks/usePrepareForm.js

@@ -17,20 +17,27 @@ export const usePrepareForm = ({
       const [linkingForms, setLinkingForms] = useState({});
       const [loading, setLoading] = useState(true);
       const [notFound, setNotFound] = useState(false);
+
+      console.log({form, data, groups, linkingForms, loading, notFound})
   
     const prepareForm = (currentView) => {
           const dKey = namespaceConfig?.dataKey;
+          const nKey = `${APP}-${currentView}`;
+          console.log({dKey, nKey, allData})
+
+          console.log({condition1: hasKeyInObject(allData, dKey)})
+          console.log({condition2: hasKeyInObject(allData[dKey], nKey)})
   
-          if (hasKeyInObject(allData, dKey)) {
+          if (hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey)) {
               const {
                   form = {},
                   data = {},
                   config = {},
                   linkingForms = {},
-              } = JSON.parse(JSON.stringify(allData[dKey] || {}));
+              } = JSON.parse(JSON.stringify(allData[dKey][nKey] || {}));
+              console.log("here", dKey, nKey)
   
-              if(Object.keys(form).length > 0) {
-                if (data.datastakeId === id || id === "user" || data.id === id) {
+              if (data.datastakeId === id || id === "user" || data.id === id) {
                   if (viewConfig.adminNamespaces.includes(namespace)) {
                     setForm(form);
                   } else {
@@ -57,8 +64,9 @@ export const usePrepareForm = ({
                       setNotFound(true);
                   }
               }
-              }
           }
+
+          console.log('data', data)
       };
   
     const getCertainData = allData?.[namespaceConfig?.dataKey];

package/src/pages.js

@@ -14,6 +14,7 @@ export { default as PlantingCycleSummary } from './@daf/pages/Summary/Activities
 export { default as MonitoringCampaignSummary } from './@daf/pages/Summary/Activities/MonitoringCampaign/index.jsx';
 export { default as MineSummary } from './@daf/pages/Summary/Minesite/index.jsx';
 export { default as MonitoringActivitySummary } from './@daf/pages/Summary/Activities/Monitoring/index.jsx';
+export { default as UsersTable } from './@daf/core/components/Screens/Users/index.jsx';
 
 // View
 export { default as View } from './@daf/pages/View/index.jsx';