datastake-daf 0.6.733 → 0.6.735

package/dist/layouts/index.js

@@ -4852,6 +4852,12 @@ function SidenavMenu({
         className: "title-span",
         children: t("core")
       }), renderMenu(coreItems)]
+    }) : null, operationsItems.length ? /*#__PURE__*/jsxRuntime.jsxs("div", {
+      className: "sidemenu-cont",
+      children: [/*#__PURE__*/jsxRuntime.jsx("span", {
+        className: "title-span",
+        children: t("operations")
+      }), renderMenu(operationsItems)]
     }) : null, activityItems.length ? /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "sidemenu-cont",
       children: [/*#__PURE__*/jsxRuntime.jsx("span", {
@@ -4906,12 +4912,6 @@ function SidenavMenu({
         className: "title-span",
         children: t("specifications")
       }), renderMenu(specificationsItems)]
-    }) : null, operationsItems.length ? /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: "sidemenu-cont",
-      children: [/*#__PURE__*/jsxRuntime.jsx("span", {
-        className: "title-span",
-        children: t("operations")
-      }), renderMenu(operationsItems)]
     }) : null, projectDataItems.length ? /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "sidemenu-cont",
       children: [/*#__PURE__*/jsxRuntime.jsx("span", {

package/dist/pages/index.js

@@ -6788,7 +6788,7 @@ const useWidgetFetch = ({
   };
   React.useEffect(() => {
     fetchData();
-  }, []);
+  }, [config]);
   return {
     data,
     loading,
@@ -11990,30 +11990,32 @@ const mapIcon = category => {
 };
 const leftBackground = theme.colorPrimary3;
 const rightBackground = theme.colorPrimary6;
-const mapDataForChainOfCustody = (data = {}, options = [], goTo = () => {}) => {
+const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {}) => {
   const mapChildren = (items, type, parentId, isDirect = true) => {
-    return (items ?? []).map(item => ({
-      id: item.id,
-      number: 0,
-      name: item.name,
-      sources: parentId ? [parentId] : [],
-      subTitle: findOptions(item.category, options),
-      leftIcon: type === "client" ? rightIcon : leftIcon,
-      leftBackground: type === "client" ? rightBackground : leftBackground,
-      topIcon: mapIcon(item.category),
-      children: mapChildren(item.sources ?? item.clients ?? [], type, item.id, false),
-      onClick: () => {
-        if (isDirect && parentId === data.id) {
-          goTo(`/app/partners?datastakeId=${item.id}`);
+    return (items ?? []).map(item => {
+      return {
+        id: item.id,
+        number: 0,
+        name: item.name,
+        sources: parentId ? [parentId] : [],
+        subTitle: findOptions(item?.category, options?.categoriesOptions),
+        leftIcon: type === "client" ? rightIcon : leftIcon,
+        leftBackground: type === "client" ? rightBackground : leftBackground,
+        topIcon: mapIcon(item.category),
+        children: mapChildren(item.sources ?? item.clients ?? [], type, item.id, false),
+        onClick: () => {
+          if (isDirect && parentId === data.id) {
+            goTo(`/app/partners?datastakeId=${item.id}`);
+          }
         }
-      }
-    }));
+      };
+    });
   };
   return {
     id: data.id,
     number: 0,
     name: data.name,
-    subTitle: findOptions(data.category, options),
+    subTitle: findOptions(data?.category, options?.categoriesOptions),
     leftIcon: middleIcon,
     leftBackground: theme.colorPrimary10,
     topIcon: mapIcon(data.category),
@@ -12044,7 +12046,7 @@ function TradeRelationships({
   } = useWidgetFetch({
     config: fetchConfig
   });
-  const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options?.category ?? [], goTo);
+  const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options, goTo);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     loading: loading,
     title: t("Trade Relationships"),
@@ -12430,6 +12432,9 @@ function Identification({
     label: t("Monthly"),
     value: "monthly"
   }], [t]);
+  console.log({
+    identificationData: data
+  });
   const chartConfig = useIdentification({
     data,
     theme,
@@ -13713,6 +13718,12 @@ function MineSites({
     defaultData: [],
     stop: selectedPartners?.loading
   }), [activeTab, selectedPartners]);
+  console.log({
+    activeTab
+  });
+  console.log({
+    dataFetchConfig
+  });
   const {
     data,
     loading,
@@ -29924,7 +29935,8 @@ const StakeholdersCreate$1 = ({
         };
         const newPayload = {
           ...defaultData,
-          ...payloadData
+          ...payloadData,
+          form: 'stakeholder'
         };
         const callback = (type, m, data) => {
           if (setSelectedFormNext) {
@@ -29984,7 +29996,7 @@ const StakeholdersTable = ({
     activeTab,
     getRedirectLink,
     theme,
-    subject: 'stakeholder'
+    subject: 'stakeholders'
   }), [t, goTo, user, options, activeTab, getRedirectLink, theme]);
   const breadCrumbs = [];
   const {
@@ -30059,7 +30071,7 @@ const StakeholdersTable = ({
       onSubmitted: (type, m, data) => {
         if (data.datastakeId) {
           displayMessage(type, t("affirmations::subject-created-successfully") || m);
-          goTo(`/app/locations`);
+          goTo(`/app/stakeholders`);
         }
       },
       onCancel: onDrawerClose,
@@ -30075,6 +30087,12 @@ const StakeholdersTable = ({
   });
 };
 
+const getLinkValue = (value, linkingObject) => {
+  if (linkingObject && linkingObject?.[value]) {
+    return linkingObject?.[value]?.name;
+  }
+  return null;
+};
 const getColumns = ({
   t,
   goTo,
@@ -30084,8 +30102,7 @@ const getColumns = ({
   getRedirectLink,
   theme,
   subject,
-  data,
-  dataOptions
+  data
 }) => [{
   dataIndex: 'datastakeId',
   title: t('ID'),
@@ -30129,7 +30146,7 @@ const getColumns = ({
         className: "daf-default-cell"
       });
     }
-    const category = findOptions(v, dataOptions?.locationCategories);
+    const category = findOptions(v, data?.options?.locationCategories);
     return category ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: category,
       children: category
@@ -30163,8 +30180,11 @@ const getColumns = ({
         className: "daf-default-cell"
       });
     }
-    findOptions(v, options?.countries);
-    return '-';
+    const region = getLinkValue(v, all?.linking?.SCL);
+    return region ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: region,
+      children: region
+    }) : '-';
   }
 }, {
   dataIndex: 'administrativeLevel2',
@@ -30177,8 +30197,11 @@ const getColumns = ({
         className: "daf-default-cell"
       });
     }
-    findOptions(v, options?.countries);
-    return '-';
+    const district = getLinkValue(v, all?.linking?.SCL);
+    return district ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: district,
+      children: district
+    }) : '-';
   }
 }, {
   title: t("Last Update"),
@@ -30209,9 +30232,10 @@ const getColumns = ({
         className: "daf-default-cell"
       });
     }
-    if (!val || val?.length === 0) {
-      return "--";
-    }
+    console.log({
+      val,
+      all
+    });
     return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
       items: val
     });
@@ -30356,7 +30380,8 @@ const StakeholdersCreate = ({
         };
         const newPayload = {
           ...defaultData,
-          ...payloadData
+          ...payloadData,
+          form: 'location'
         };
         const callback = (type, m, data) => {
           if (setSelectedFormNext) {
@@ -30404,8 +30429,7 @@ const LocationsTable = ({
   changeAjaxOptions = () => {},
   formData = {},
   formValue = {},
-  form = {},
-  dataOptions = {}
+  form = {}
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState();
@@ -30417,10 +30441,9 @@ const LocationsTable = ({
     activeTab,
     getRedirectLink,
     theme,
-    subject: 'location',
-    data,
-    dataOptions
-  }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, dataOptions]);
+    subject: 'locations',
+    data
+  }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data]);
   const breadCrumbs = [];
   const {
     paginationQuery,
@@ -30441,6 +30464,9 @@ const LocationsTable = ({
       tab: activeTab
     }, 'locations');
   }, [paginationQuery, otherParams, searchParams, activeTab]);
+  console.log({
+    data
+  });
   const selectFiltersConfig = React.useMemo(() => {
     return getFiltersConfig({
       t
@@ -30495,7 +30521,7 @@ const LocationsTable = ({
         if (data.datastakeId) {
           displayMessage(type, t("affirmations::subject-created-successfully") || m);
           // goTo(`/app/edit/stakeholders/${data.datastakeId}`);
-          window.location.reload();
+          goTo('/app/locations');
         }
       },
       onCancel: onDrawerClose,

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

@@ -0,0 +1,330 @@
+/* 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;
+}

package/package.json

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