datastake-daf 0.6.802 → 0.6.803

package/dist/pages/index.js

@@ -14855,10 +14855,6 @@ const useContributionsGraph = ({
     });
   }, [data, t]);
   const isEmpty = React.useMemo(() => _data?.length === 0, [_data]);
-  console.log({
-    _data,
-    isEmpty
-  });
   const chartConfig = React.useMemo(() => {
     return {
       data: _data,
@@ -19333,12 +19329,6 @@ const showHideInput$3 = (input, formsValue, repeatValues) => {
   }
   return true;
 };
-const getNkey = namespace => {
-  if (['location', 'scl', 'village', 'event', 'incidents', 'corrective-actions', 'testimonials', 'initiatives', 'victims', 'pictures', 'documents', 'lir', 'sp', 'im', 'sci', 'bpe', 'gm'].includes(namespace)) {
-    return 'scoping';
-  }
-  return namespace;
-};
 const groupSubsections = (form, onlyConf = false) => {
   return Object.keys(form).reduce((f, fKey) => {
     if (form[fKey].subSection) {
@@ -57720,39 +57710,40 @@ const usePrepareForm$1 = ({
   const [notFound, setNotFound] = React.useState(false);
   const prepareForm = currentView => {
     const dKey = namespaceConfig?.dataKey;
-    const nKey = `${APP}-${currentView}`;
-    if (hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey)) {
+    if (hasKeyInObject(allData, dKey)) {
       const {
         form = {},
         data = {},
         config = {},
         linkingForms = {}
-      } = JSON.parse(JSON.stringify(allData[dKey][nKey] || {}));
-      if (data.datastakeId === id || id === "user" || data.id === id) {
-        if (viewConfig.adminNamespaces.includes(namespace)) {
-          setForm(form);
-        } else {
-          setForm({
-            ...form,
-            linking: {
-              position: 100,
-              excludeFromEdit: true,
-              label: t("Linked Subjects"),
-              template: "linkingSubjects"
-            }
-          });
-        }
-        setData(data);
-        setGroups(config.groups || {});
-        setLinkingForms(linkingForms);
-        setLoading(false);
-        setNotFound(false);
-      } else if (!data.id) {
-        if (mode === "proxy") {
-          window.location.reload();
-        } else {
+      } = JSON.parse(JSON.stringify(allData[dKey] || {}));
+      if (Object.keys(form).length > 0) {
+        if (data.datastakeId === id || id === "user" || data.id === id) {
+          if (viewConfig.adminNamespaces.includes(namespace)) {
+            setForm(form);
+          } else {
+            setForm({
+              ...form,
+              linking: {
+                position: 100,
+                excludeFromEdit: true,
+                label: t("Linked Subjects"),
+                template: "linkingSubjects"
+              }
+            });
+          }
+          setData(data);
+          setGroups(config.groups || {});
+          setLinkingForms(linkingForms);
           setLoading(false);
-          setNotFound(true);
+          setNotFound(false);
+        } else if (!data.id) {
+          if (mode === "proxy") {
+            window.location.reload();
+          } else {
+            setLoading(false);
+            setNotFound(true);
+          }
         }
       }
     }
@@ -57887,8 +57878,7 @@ const useCallToGetData = ({
   const isFirstRender = React.useRef(true);
   const callToGetData = (_doCall = false) => {
     const dKey = namespaceConfig?.dataKey;
-    const nKey = `${APP}-${getNkey(namespace || "")}`;
-    const doCall = _doCall ? true : hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey) ? allData[dKey][nKey]?.data?.datastakeId !== id : true;
+    const doCall = _doCall ? true : hasKeyInObject(allData, dKey) ? allData[dKey]?.data?.datastakeId !== id : true;
     if (doCall) {
       if (isSupported) {
         namespaceGet[namespace]();
@@ -58609,19 +58599,6 @@ const View = ({
   const actionButtons = React.useMemo(() => {
     return groupForm?.template === "linkingSubjects" ? pageActions.filter(v => v.key !== "edit") : pageActions;
   }, [groupForm, pageActions]);
-  console.log({
-    namespaceConfiguration,
-    namespaceConfig,
-    allData,
-    namespace,
-    id,
-    group,
-    subsection,
-    version,
-    source,
-    isSupported,
-    notFound
-  });
   if (!isSupported || notFound) {
     return /*#__PURE__*/jsxRuntime.jsx(Loading, {});
   }
@@ -58747,16 +58724,15 @@ const usePrepareForm = ({
   const prepareForm = (setExtra = true) => {
     if (isSupported) {
       const dKey = namespaceConfig?.dataKey;
-      const nKey = `${APP}-${namespaceConfig?.view}`;
-      if (hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey)) {
-        const d = JSON.parse(JSON.stringify(allData[dKey][nKey].data || {}));
+      if (hasKeyInObject(allData, dKey)) {
+        const d = JSON.parse(JSON.stringify(allData[dKey].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][nKey].form || {}, d);
+          const formG = mapFormGroup(allData[dKey].form || {}, d);
           setForm(formG);
           if (setExtra) {
             if ((d || {}).risk && Array.isArray(formG) && formG.find(r => r.id === "risk")) {
@@ -58792,7 +58768,7 @@ const usePrepareForm = ({
                 setOriginalData({
                   ...d
                 });
-                setLinkingForms(allData[dKey][nKey].linkingForms);
+                setLinkingForms(allData[dKey].linkingForms);
                 setLoading(false);
                 return;
               }
@@ -58808,7 +58784,7 @@ const usePrepareForm = ({
             setOriginalData({
               ...d
             });
-            setLinkingForms(allData[dKey][nKey].linkingForms);
+            setLinkingForms(allData[dKey].linkingForms);
             setLoading(false);
           }
         }

package/package.json

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

package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/column.js

@@ -86,7 +86,7 @@ export const getColumns = ({
 					return <div className="daf-default-cell" />;
 				}
 
-				const category = findOptions(value, selectOptions?.category || []) || "--";
+				const category = findOptions(value, options?.locationCategories || []) || "--";
 
 				return <Tooltip title={category}>{category}</Tooltip>;
 			},

package/src/@daf/pages/Dashboards/UserDashboard/components/ContributionsGraph/hook.js

@@ -12,7 +12,6 @@ export const useContributionsGraph = ({
 	}, [data, t]);
 
     const isEmpty = useMemo(() => _data?.length === 0, [_data]);
-    console.log({_data, isEmpty})
 
     const chartConfig = useMemo(() => {
         return {

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

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

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

@@ -1,6 +1,5 @@
 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,
@@ -19,11 +18,10 @@ export const useCallToGetData = ({
   
     const callToGetData = (_doCall = false) => {
           const dKey = namespaceConfig?.dataKey;
-          const nKey = `${APP}-${getNkey(namespace || "")}`;
           const doCall = _doCall
               ? true
-              : hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey)
-              ? allData[dKey][nKey]?.data?.datastakeId !== id
+              : hasKeyInObject(allData, dKey)
+              ? allData[dKey]?.data?.datastakeId !== id
               : true;
           if (doCall) {
               if (isSupported) {

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

@@ -20,17 +20,17 @@ export const usePrepareForm = ({
   
     const prepareForm = (currentView) => {
           const dKey = namespaceConfig?.dataKey;
-          const nKey = `${APP}-${currentView}`;
   
-          if (hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey)) {
+          if (hasKeyInObject(allData, dKey)) {
               const {
                   form = {},
                   data = {},
                   config = {},
                   linkingForms = {},
-              } = JSON.parse(JSON.stringify(allData[dKey][nKey] || {}));
+              } = JSON.parse(JSON.stringify(allData[dKey] || {}));
   
-              if (data.datastakeId === id || id === "user" || data.id === id) {
+              if(Object.keys(form).length > 0) {
+                if (data.datastakeId === id || id === "user" || data.id === id) {
                   if (viewConfig.adminNamespaces.includes(namespace)) {
                     setForm(form);
                   } else {
@@ -57,6 +57,7 @@ export const usePrepareForm = ({
                       setNotFound(true);
                   }
               }
+              }
           }
       };
   

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

@@ -215,12 +215,6 @@ const View = ({
         : pageActions;
     }, [groupForm, pageActions]);
 
-    console.log({namespaceConfiguration, namespaceConfig, allData, namespace, id, group, subsection,
-        version,
-        source,
-        isSupported,
-        notFound
-    })
 
     if(!isSupported || notFound) {
         return <Loading />

package/dist/style/datastake/mapbox-gl.css

@@ -1,330 +0,0 @@
-/* Isolated Mapbox GL CSS - Scoped to prevent Leaflet conflicts */
-
-/* Mapbox GL Core Styles - Scoped with .mapbox-gl-scope */
-.mapbox-gl-scope .mapboxgl-map {
-  font: 12px/20px Helvetica Neue, Arial, Helvetica, sans-serif;
-  overflow: hidden;
-  position: relative;
-  -webkit-tap-highlight-color: rgb(0 0 0/0);
-}
-
-.mapbox-gl-scope .mapboxgl-canvas {
-  left: 0;
-  position: absolute;
-  top: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-map:-webkit-full-screen {
-  height: 100%;
-  width: 100%;
-}
-
-.mapbox-gl-scope .mapboxgl-canary {
-  background-color: salmon;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive,
-.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass {
-  cursor: grab;
-  -webkit-user-select: none;
-  user-select: none;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive.mapboxgl-track-pointer {
-  cursor: pointer;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive:active,
-.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass:active {
-  cursor: grabbing;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate,
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate .mapboxgl-canvas {
-  touch-action: pan-x pan-y;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan,
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan .mapboxgl-canvas {
-  touch-action: pinch-zoom;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan,
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan .mapboxgl-canvas {
-  touch-action: none;
-}
-
-/* Control positioning */
-.mapbox-gl-scope .mapboxgl-ctrl-bottom,
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-left,
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-right,
-.mapbox-gl-scope .mapboxgl-ctrl-left,
-.mapbox-gl-scope .mapboxgl-ctrl-right,
-.mapbox-gl-scope .mapboxgl-ctrl-top,
-.mapbox-gl-scope .mapboxgl-ctrl-top-left,
-.mapbox-gl-scope .mapboxgl-ctrl-top-right {
-  pointer-events: none;
-  position: absolute;
-  z-index: 2;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-left {
-  left: 0;
-  top: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top {
-  left: 50%;
-  top: 0;
-  transform: translateX(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-right {
-  right: 0;
-  top: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-right {
-  right: 0;
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-right {
-  bottom: 0;
-  right: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom {
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-left {
-  bottom: 0;
-  left: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-left {
-  left: 0;
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl {
-  clear: both;
-  pointer-events: auto;
-  transform: translate(0);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-left .mapboxgl-ctrl {
-  float: left;
-  margin: 10px 0 0 10px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top .mapboxgl-ctrl {
-  float: left;
-  margin: 10px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-right .mapboxgl-ctrl {
-  float: right;
-  margin: 10px 10px 0 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-right .mapboxgl-ctrl,
-.mapbox-gl-scope .mapboxgl-ctrl-right .mapboxgl-ctrl {
-  float: right;
-  margin: 0 10px 10px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom .mapboxgl-ctrl {
-  float: left;
-  margin: 10px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-left .mapboxgl-ctrl,
-.mapbox-gl-scope .mapboxgl-ctrl-left .mapboxgl-ctrl {
-  float: left;
-  margin: 0 0 10px 10px;
-}
-
-/* Control group styling */
-.mapbox-gl-scope .mapboxgl-ctrl-group {
-  background: #fff;
-  border-radius: 4px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group:not(:empty) {
-  box-shadow: 0 0 0 2px #0000001a;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button {
-  background-color: initial;
-  border: 0;
-  box-sizing: border-box;
-  cursor: pointer;
-  display: block;
-  height: 29px;
-  outline: none;
-  overflow: hidden;
-  padding: 0;
-  width: 29px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button+button {
-  border-top: 1px solid #ddd;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button .mapboxgl-ctrl-icon {
-  background-position: 50%;
-  background-repeat: no-repeat;
-  display: block;
-  height: 100%;
-  width: 100%;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attrib-button:focus,
-.mapbox-gl-scope .mapboxgl-ctrl-group button:focus {
-  box-shadow: 0 0 2px 2px #0096ff;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button:disabled {
-  cursor: not-allowed;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button:disabled .mapboxgl-ctrl-icon {
-  opacity: .25;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button:first-child {
-  border-radius: 4px 4px 0 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button:last-child {
-  border-radius: 0 0 4px 4px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button:only-child {
-  border-radius: inherit;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button:not(:disabled):hover {
-  background-color: #0000000d;
-}
-
-/* Marker styles */
-.mapbox-gl-scope .mapboxgl-marker {
-  position: absolute;
-  z-index: 1;
-}
-
-.mapbox-gl-scope .mapboxgl-marker svg {
-  display: block;
-}
-
-/* Popup styles */
-.mapbox-gl-scope .mapboxgl-popup {
-  position: absolute;
-  text-align: center;
-  margin-bottom: 20px;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content-wrapper {
-  padding: 1px;
-  text-align: left;
-  border-radius: 12px;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content {
-  margin: 13px 24px 13px 20px;
-  line-height: 1.3;
-  font-size: 13px;
-  min-height: 1px;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content p {
-  margin: 17px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-tip-container {
-  width: 40px;
-  height: 20px;
-  position: absolute;
-  left: 50%;
-  margin-top: -1px;
-  margin-left: -20px;
-  overflow: hidden;
-  pointer-events: none;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-tip {
-  width: 17px;
-  height: 17px;
-  padding: 1px;
-  margin: -10px auto 0;
-  pointer-events: auto;
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  transform: rotate(45deg);
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content-wrapper,
-.mapbox-gl-scope .mapboxgl-popup-tip {
-  background: white;
-  color: #333;
-  box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4);
-}
-
-.mapbox-gl-scope .mapboxgl-popup-close-button {
-  position: absolute;
-  top: 0;
-  right: 0;
-  border: none;
-  text-align: center;
-  width: 24px;
-  height: 24px;
-  font: 16px/24px Tahoma, Verdana, sans-serif;
-  color: #757575;
-  text-decoration: none;
-  background: transparent;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-close-button:hover,
-.mapbox-gl-scope .mapboxgl-popup-close-button:focus {
-  color: #585858;
-}
-
-/* Attribution */
-.mapbox-gl-scope .mapboxgl-ctrl-attribution {
-  background: #fff;
-  background: rgba(255, 255, 255, 0.8);
-  margin: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attribution,
-.mapbox-gl-scope .mapboxgl-ctrl-scale-line {
-  padding: 0 5px;
-  color: #333;
-  line-height: 1.4;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attribution a {
-  text-decoration: none;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attribution a:hover,
-.mapbox-gl-scope .mapboxgl-ctrl-attribution a:focus {
-  text-decoration: underline;
-}
-
-/* Hide attribution by default */
-.mapbox-gl-scope .mapboxgl-ctrl-attribution {
-  display: none !important;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-logo {
-  display: none !important;
-}