datastake-daf 0.6.780 → 0.6.781

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/PlantingLocations/index.jsx

@@ -6,171 +6,176 @@ import CustomIcon from '../../../../../../../../src/@daf/core/components/Icon/Cu
 import { renderDateFormatted } from '../../../../../../../../src/helpers/Forms';
 
 const PlantingLocations = ({
-    id,
-    getSummaryDetail,
-    loading = false,
-    t = (s) => s
+  id,
+  getSummaryDetail,
+  loading = false,
+  t = (s) => s
 }) => {
-    const defaultConfig = useMemo(
-        () => ({
-            basepath: "planting-cycle",
-            url: `/summary/${id}/locations`,
-            stop: !id,
-        }),
-        [id],
-    );
-
-    const customGetData = useMemo(() => {
-        if (getSummaryDetail && id) {
-            return ({ url, params = {} }) => {
-                const match = url.match(/\/summary\/[^/]+\/(.+)/);
-                if (match) {
-                    const [, type] = match;
-                    return getSummaryDetail(id, type, params);
-                }
-                throw new Error(`Invalid URL format: ${url}`);
-            };
-        }
-        return undefined;
-    }, [getSummaryDetail, id]);
-
-    const { loading: plantingLocationsLoading, data: plantingLocationsData } = useWidgetFetch({
-        config: defaultConfig,
-        getData: customGetData
-    });
-
-
-    const mappedData = useMemo(() => {
-        if (!plantingLocationsData || !plantingLocationsData.events) {
-            return [];
-        }
-
-        const { locations = [], events } = plantingLocationsData;
-
-        // Filter events that have valid GPS coordinates
-        const eventsWithGPS = events.filter(event =>
-            event.locationCheckArrival &&
-            event.locationCheckArrival.latitude &&
-            event.locationCheckArrival.longitude
-        );
-
-        return eventsWithGPS.map((event, index) => {
-            const locationCheckArrival = event.locationCheckArrival;
-
-            const matchingLocation = locations.find(location =>
-                locationCheckArrival.name === location.name ||
-                locationCheckArrival._id === location.id ||
-                location.id === locationCheckArrival._id
-            ) || locations[0]; 
-
-            
-            const area = matchingLocation?.perimeter ? matchingLocation.perimeter.map(coord =>
-                Array.isArray(coord) && coord.length >= 2
-                    ? [coord[1], coord[0]] 
-                    : coord
-            ) : [];
-
-           
-            const gps = {
-                latitude: locationCheckArrival.latitude,
-                longitude: locationCheckArrival.longitude
-            };
-
-         
-            const color = "#15FFFFB2"
-
-            const locationName = matchingLocation?.name || locationCheckArrival.name || 'Planting Location';
-
-            return {
-                _id: locationCheckArrival._id || event._id || {},
-                area: area,
-                color: color,
-                datastakeId: `LOC-${String(index + 1).padStart(9, '0')}`,
-                gps: gps,
-                id: matchingLocation?.id || locationCheckArrival._id || `event-${index}`,
-                name: event.name || t("Activity Start"),
-                date: event.date,
-                sources: 1,
-                subTitle: event.date ? renderDateFormatted(event.date, "DD MMM YY") : locationName,
-                plotName: locationName,
-                territoryTitle: locationName,
-                type: 'Planting Location'
-            };
-        });
-    }, [plantingLocationsData, t]);
-
-    return (
-        <section>
-            <Widget
-                title={t("Planting Locations")}
-                className="no-px h-w-btn-header no-pt-body  no-p-body no-pb-body"
-                style={{ height: '100%', display: 'flex', flexDirection: 'column' }}
-            >
-                <MineSiteMap
-                    data={mappedData}
-                    link
-                    style={{ height: '100%', width: '100%' }}
-                    maxZoom={18}
-                    isSatellite={true}
-                    onClickLink={() => { }}
-                    onFilterChange={() => { }}
-                    primaryLink
-                    renderTooltipForLocation={(data) => {
-                        const coordinates = data.gps?.latitude && data.gps?.longitude
-                            ? convertDMS(data.gps.latitude, data.gps.longitude)
-                            : null;
-
-                        if (!coordinates) {
-                            return [];
-                        }
-
-                        const iconColor = "#016C6E"; // Activity Start color
-
-                        return [
-                            {
-                                label: t("Coordinates"),
-                                value: (
-                                    <div style={{ display: 'flex', alignItems: 'center', gap: '6px', flexWrap: 'nowrap' }}>
-                                        {/* Latitude icon (vertical) */}
-                                        <div style={{ display: 'flex', alignItems: 'center' }}>
-                                            <CustomIcon 
-                                                name="SpacingHeight" 
-                                                width={14} 
-                                                height={14} 
-                                                color={iconColor}
-                                            />
-                                            <span style={{ fontWeight: 600, marginLeft: '4px' }}>{coordinates[0]}</span>
-                                        </div>
-                                        {/* Longitude icon (horizontal) */}
-                                        <div style={{ display: 'flex', alignItems: 'center' }}>
-                                            <CustomIcon 
-                                                name="SpacingWidth" 
-                                                width={14} 
-                                                height={14} 
-                                                color={iconColor}
-                                            />
-                                            <span style={{ fontWeight: 600, marginLeft: '4px' }}>{coordinates[1]}</span>
-                                        </div>
-                                    </div>
-                                ),
-                            },
-                        ];
-                    }}
-                    renderTooltipForTerritory={(data) => {
-                        return [
-                            {
-                                label: t("Plot Name"),
-                                value: data.plotName || data.name || "--",
-                            },
-                        ];
-                    }}
-                    renderTooltipTags={() => { }}
-                    type="location-territory"
-                />
-            </Widget>
-        </section>
-    );
+  const defaultConfig = useMemo(
+      () => ({
+          basepath: "planting-cycle",
+          url: `/summary/${id}/locations`,
+          stop: !id,
+      }),
+      [id],
+  );
+
+  const customGetData = useMemo(() => {
+      if (getSummaryDetail && id) {
+          return ({ url, params = {} }) => {
+              const match = url.match(/\/summary\/[^/]+\/(.+)/);
+              if (match) {
+                  const [, type] = match;
+                  return getSummaryDetail(id, type, params);
+              }
+              throw new Error(`Invalid URL format: ${url}`);
+          };
+      }
+      return undefined;
+  }, [getSummaryDetail, id]);
+
+  const { loading: plantingLocationsLoading, data: plantingLocationsData } = useWidgetFetch({
+      config: defaultConfig,
+      getData: customGetData
+  });
+
+
+  const mappedData = useMemo(() => {
+      if (!plantingLocationsData || !plantingLocationsData.events) {
+          return [];
+      }
+
+      const { locations = [], events } = plantingLocationsData;
+
+      // Filter events that have valid GPS coordinates
+      const eventsWithGPS = events.filter(event =>
+          event.locationCheckArrival &&
+          event.locationCheckArrival.latitude &&
+          event.locationCheckArrival.longitude
+      );
+
+      return eventsWithGPS.map((event, index) => {
+          const locationCheckArrival = event.locationCheckArrival;
+
+          const matchingLocation = locations.find(location =>
+              locationCheckArrival.name === location.name ||
+              locationCheckArrival._id === location.id ||
+              location.id === locationCheckArrival._id
+          ) || locations[0];
+
+        
+          const area = matchingLocation?.perimeter ? matchingLocation.perimeter.map(coord =>
+              Array.isArray(coord) && coord.length >= 2
+                  ? [coord[1], coord[0]]
+                  : coord
+          ) : null;
+
+          // Only include area if it has at least 3 valid coordinates
+          const validArea = area && Array.isArray(area) && area.length >= 3 ? area : null;
+
+       
+          const gps = {
+              latitude: locationCheckArrival.latitude,
+              longitude: locationCheckArrival.longitude
+          };
+
+     
+          const color = "#15FFFFB2"
+
+          const locationName = matchingLocation?.name || locationCheckArrival.name || 'Planting Location';
+
+          return {
+              _id: locationCheckArrival._id || event._id || {},
+              area: validArea,
+              color: color,
+              datastakeId: `LOC-${String(index + 1).padStart(9, '0')}`,
+              gps: gps,
+              id: matchingLocation?.id || locationCheckArrival._id || `event-${index}`,
+              name: event.name || t("Activity Start"),
+              date: event.date,
+              sources: 1,
+              subTitle: event.date ? renderDateFormatted(event.date, "DD MMM YY") : locationName,
+              plotName: locationName,
+              territoryTitle: locationName,
+              type: 'Planting Location'
+          };
+      });
+  }, [plantingLocationsData, t]);
+
+  return (
+      <section>
+          <Widget
+              title={t("Planting Locations")}
+              className="no-px h-w-btn-header no-pt-body  no-p-body no-pb-body"
+              style={{ height: '100%', display: 'flex', flexDirection: 'column' }}
+          >
+              <MineSiteMap
+                  data={mappedData}
+                  link
+                  style={{ height: '100%', width: '100%' }}
+                  maxZoom={18}
+                  isSatellite={true}
+                  onClickLink={() => { }}
+                  onFilterChange={() => { }}
+                  primaryLink
+                  renderTooltipForLocation={(data) => {
+                      const coordinates = data.gps?.latitude && data.gps?.longitude
+                          ? convertDMS(data.gps.latitude, data.gps.longitude)
+                          : null;
+
+                      if (!coordinates) {
+                          return [];
+                      }
+
+                      const iconColor = "#016C6E"; // Activity Start color
+
+                      return [
+                          {
+                              label: t("Coordinates"),
+                              value: (
+                                  <div style={{ display: 'flex', alignItems: 'center', gap: '6px', flexWrap: 'nowrap' }}>
+                                      {/* Latitude icon (vertical) */}
+                                      <div style={{ display: 'flex', alignItems: 'center' }}>
+                                          <CustomIcon
+                                              name="SpacingHeight"
+                                              width={14}
+                                              height={14}
+                                              color={iconColor}
+                                          />
+                                          <span style={{ fontWeight: 600, marginLeft: '4px' }}>{coordinates[0]}</span>
+                                      </div>
+                                      {/* Longitude icon (horizontal) */}
+                                      <div style={{ display: 'flex', alignItems: 'center' }}>
+                                          <CustomIcon
+                                              name="SpacingWidth"
+                                              width={14}
+                                              height={14}
+                                              color={iconColor}
+                                          />
+                                          <span style={{ fontWeight: 600, marginLeft: '4px' }}>{coordinates[1]}</span>
+                                      </div>
+                                  </div>
+                              ),
+                          },
+                      ];
+                  }}
+                  renderTooltipForTerritory={(data) => {
+                      return [
+                          {
+                              label: t("Plot Name"),
+                              value: data.plotName || data.name || "--",
+                          },
+                      ];
+                  }}
+                  renderTooltipTags={() => { }}
+                  type="location-territory"
+              />
+          </Widget>
+      </section>
+  );
 };
 
 export default PlantingLocations;
 
+
+

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

@@ -61,6 +61,4 @@ export const removeKeysFromObject = (obj = {}, keys = []) => {
         }
     }
     return result;
-}
-
-export const hasKeyInObject = (obj, key) => Object.keys(obj || {}).includes(key);
+}

package/src/pages.js

@@ -19,7 +19,4 @@ export { default as TablePage } from './@daf/pages/TablePage/index.jsx';
 export { default as OperatorSummary } from './@daf/pages/Summary/Operator/index.jsx';
 export { default as RestorationActivitySummary } from './@daf/pages/Summary/Activities/Restoration/index.jsx';
 export { default as PlantingCycleSummary } from './@daf/pages/Summary/Activities/PlantingCycle/index.jsx';
-export { default as MineSummary } from './@daf/pages/Summary/Minesite/index.jsx';
-
-// View
-export { default as View } from './@daf/pages/View/index.jsx';
+export { default as MineSummary } from './@daf/pages/Summary/Minesite/index.jsx';

package/src/utils.js

@@ -27,7 +27,7 @@ export { default as locales } from './constants/locales/index.js';
 
 export { getTagColor } from "./@daf/utils/productTag.js";
 
-export { convertUndefinedToNull, hasKeyInObject, removeKeysFromObject } from './@daf/utils/object'
+export { convertUndefinedToNull } from './@daf/utils/object'
 
 export { default as ErrorFormat, formatErrors } from './helpers/ErrorFormater'
 

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

@@ -1,73 +0,0 @@
-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,
-    namespace,
-    allData,
-    id,
-    isSupported,
-    namespaceGet,
-    source,
-    version,
-    user,
-    setLoading,
-    APP,
-  }) => {
-    const isFirstRender = 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;
-          if (doCall) {
-              if (isSupported) {
-                  namespaceGet[namespace]();
-              }
-          }
-      };
-  
-    useEffect(() => {
-          if (isFirstRender.current) {
-              isFirstRender.current = false;
-              return;
-          }
-          callToGetData(true);
-      }, [source, version]);
-  
-    useEffect(() => {
-          callToGetData(true);
-      }, [id, namespace, user.language]);
-  
-    const onStorageUpdate = (e) => {
-          const { key, newValue } = e;
-          if (key === `${id}-loading` && newValue) {
-              setLoading(newValue);
-          }
-          if (key === `${id}-updated` && newValue) {
-              setLoading(true);
-              callToGetData();
-          }
-      };
-  
-      useEffect(() => {
-          window.addEventListener("storage", onStorageUpdate);
-          return () => {
-              window.removeEventListener("storage", onStorageUpdate);
-          };
-      }, []);
-  
-    useEffect(() => {
-          setLoading(true);
-      }, [namespace]);
-  
-  
-    return {
-      callToGetData,
-    }
-  }

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

@@ -1,86 +0,0 @@
-import { useState, useEffect } from "react";
-import { hasKeyInObject } from "../../../../@daf/utils/object.js";
-
-export const usePrepareForm = ({
-    namespaceConfig,
-    allData,
-    id,
-    namespace,
-    t,
-    mode,
-    APP,
-    viewConfig,
-  }) => {
-    const [form, setForm] = useState({});
-      const [data, setData] = useState({});
-      const [groups, setGroups] = useState({});
-      const [linkingForms, setLinkingForms] = useState({});
-      const [loading, setLoading] = useState(true);
-      const [notFound, setNotFound] = useState(false);
-  
-    const prepareForm = (currentView) => {
-          const dKey = namespaceConfig.dataKey;
-          const nKey = `${APP}-${currentView}`;
-  
-          if (hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey)) {
-              const {
-                  form = {},
-                  data = {},
-                  config = {},
-                  linkingForms = {},
-              } = JSON.parse(JSON.stringify(allData[dKey][nKey] || {}));
-  
-              if (data.datastakeId === id || id === "user") {
-                  if (viewConfig.linkingSubjects.includes(namespace)) {
-                      setForm({
-                          ...form,
-                          linking: {
-                              position: 100,
-                              excludeFromEdit: true,
-                              label: t("Linked Subjects"),
-                              template: "linkingSubjects",
-                          },
-                      });
-                  } else {
-                      setForm(form);
-                  }
-                  setData(data);
-                  setGroups(config.groups || {});
-                  setLinkingForms(linkingForms);
-                  setLoading(false);
-                  setNotFound(false);
-              } else if (!data.id) {
-                  if (mode === "proxy") {
-                      window.location.reload();
-                  } else {
-                      setLoading(false);
-                      setNotFound(true);
-                  }
-              }
-          }
-      };
-  
-    const getCertainData = allData[namespaceConfig.dataKey];
-  
-      useEffect(() => {
-          if(namespace && namespaceConfig) {
-              prepareForm(namespaceConfig.view);
-          }
-      }, [getCertainData, namespaceConfig]);
-  
-    return {
-      form,
-      setForm,
-      data,
-      setData,
-      groups,
-      setGroups,
-      linkingForms,
-      setLinkingForms,
-      loading,
-      setLoading,
-      notFound,
-      setNotFound,
-      prepareForm,
-    }
-  }

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

@@ -1,40 +0,0 @@
-import { useState, useCallback } from "react";
-
-export const submitSubjectData = async (namespace, data, serviceMap) => {
-    const service = serviceMap[namespace];
-    if (!service) {
-      throw new Error(`No service found for namespace: ${namespace}`);
-    }
-  
-    const response = await service.submitStep(
-      data,
-      data.datastakeId || data.id
-    );
-    return response.data;
-};
-
-export const useSubmitSubject = ({namespace, data, serviceMap}) => {
-    const [isDisabled, setIsDisabled] = useState(false);
-    const [loading, setLoading] = useState(false);
-    const [isPublished, setIsPublished] = useState(false);
-  
-    const submitSubject = useCallback(async () => {
-      try {
-        setLoading(true);
-        const response = await submitSubjectData(namespace, data, serviceMap);
-        setIsDisabled(response.published);
-        setIsPublished(response.published);
-      } catch (error) {
-        console.error("Submit error:", error);
-      } finally {
-        setLoading(false);
-      }
-    }, [namespace, data]);
-  
-    return {
-      submitSubject,
-      isDisabled,
-      submitLoading: loading,
-      isPublished,
-    };
-};

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

@@ -1,83 +0,0 @@
-import { useState, useEffect } from "react";
-
-export const useViewActions = ({
-    namespace,
-    data,
-    isSupported,
-    canEdit,
-    versionUrl,
-    sourceUrl,
-    getEditLink,
-    submitSubject,
-    isDisabled,
-    setOpenRecordsModal,
-    goBackFromSource,
-    push,
-    getRedirectLink,
-    t,
-    viewConfig,
-    buttonActions,
-  }) => {
-    const [pageActions, setPageActions] = useState([]);
-    const [extraPageActions, setExtraPageActions] = useState([]);
-  
-    useEffect(() => {
-      const actions = [];
-      const extraActions = [];
-  
-      if (!isSupported) {
-        setPageActions([]);
-        setExtraPageActions([]);
-        return;
-      }
-  
-      if (canEdit) {
-        if (viewConfig.namespacesWithoutActionButtons.includes(namespace)) {
-          if (viewConfig.editOnlyButton.includes(namespace)) {
-            if (versionUrl && sourceUrl) {
-              actions.push(buttonActions.createBackButton(t, goBackFromSource));
-            } else {
-              actions.push(buttonActions.createEditButton(t, getEditLink));
-            }
-          }
-        } else {
-          if (versionUrl && sourceUrl) {
-            actions.push(buttonActions.createBackButton(t, goBackFromSource));
-          } else {
-            actions.push(buttonActions.createSubmitButton(t, submitSubject, isDisabled, data));
-            actions.push(buttonActions.createEditButton(t, getEditLink));
-            // actions.push(createRecordsButton(t, setOpenRecordsModal));
-          }
-        }
-      }
-  
-      if (viewConfig.summaryNamespaces.includes(namespace)) {
-        extraActions.push(
-          buttonActions.createSummaryButton(t, namespace, data, push, getRedirectLink)
-        );      
-        extraActions.push(
-          buttonActions.createRecordsButton(t, setOpenRecordsModal)
-        );
-      }
-  
-      setPageActions(actions);
-      setExtraPageActions(extraActions);
-    }, [
-      namespace,
-      data,
-      isSupported,
-      canEdit,
-      versionUrl,
-      sourceUrl,
-      isDisabled,
-      t,
-      getEditLink,
-      submitSubject,
-      goBackFromSource,
-      setOpenRecordsModal,
-      push,
-      getRedirectLink,
-    ]);
-  
-    return { pageActions, extraPageActions };
-  };