datastake-daf 0.6.816 → 0.6.818

package/dist/pages/index.js

@@ -16,6 +16,7 @@ var reactCollapsed = require('react-collapsed');
 var L$1 = require('leaflet');
 var countryCityLocation = require('country-city-location');
 var client = require('react-dom/client');
+var reactDom = require('react-dom');
 require('@elfalem/leaflet-curve');
 var react = require('@xyflow/react');
 var g2plot = require('@antv/g2plot');
@@ -9401,8 +9402,8 @@ function LocationIcon({
   activeMarker,
   setActiveMarker
 }) {
-  const rootsMapRef = React.useRef(new Map());
   const markersRef = React.useRef([]);
+  const [portalContainers, setPortalContainers] = React.useState([]);
   const isSelected = selectedMarkersId.includes(data.datastakeId);
   const Marker = React.useMemo(() => {
     if (isMineSite(data.type)) {
@@ -9410,7 +9411,7 @@ function LocationIcon({
     }
     return VillageMarker;
   }, [data.type]);
-  const [isHovering, setIsHovering] = React.useState(false);
+  React.useState(false);
   const linkedNodesData = React.useMemo(() => {
     const nodes = [];
     const links = data.links || [];
@@ -9475,31 +9476,32 @@ function LocationIcon({
     return nodes;
   }, [JSON.stringify(allData), JSON.stringify(data.links), JSON.stringify(data.stakeholders), zoom]);
   const stakeholdersOfLocation = React.useMemo(() => {
-    return data?.stakeholders || [];
-  }, [data.stakeholders, zoom]);
+    return (data?.stakeholders || []).filter(stakeholder => {
+      if (!stakeholder.links || stakeholder.links.length === 0) {
+        return true;
+      }
+      const locationsWithThisStakeholder = allData.filter(loc => loc.stakeholders?.some(s => s.datastakeId === stakeholder.datastakeId)).map(loc => loc.datastakeId);
+      const primaryLocation = locationsWithThisStakeholder.sort()[0];
+      return data.datastakeId === primaryLocation;
+    });
+  }, [data.stakeholders, data.datastakeId, allData, zoom]);
   React.useEffect(() => {
-    const currentRoots = rootsMapRef.current;
-    const currentMarkers = markersRef.current;
-    currentMarkers.forEach(marker => {
-      if (mapRef.hasLayer(marker)) {
+    markersRef.current.forEach(marker => {
+      if (mapRef && mapRef.hasLayer(marker)) {
         mapRef.removeLayer(marker);
       }
     });
-    currentRoots.forEach(root => {
-      root.unmount();
-    });
-    currentRoots.clear();
     markersRef.current = [];
-
-    // Only create stakeholder markers if this location or any of its stakeholders are selected
+    setPortalContainers([]);
     const shouldShowStakeholders = isSelected || stakeholdersOfLocation.some(stk => selectedMarkersId.includes(stk.datastakeId));
     if (!shouldShowStakeholders || selectedMarkersId.length === 0) {
       return;
     }
 
-    // Create new markers only when selected
+    // Create markers and store their container references
+    const containers = [];
     stakeholdersOfLocation.forEach((stakeholder, index) => {
-      const markerId = `${stakeholder.datastakeId}`;
+      const markerId = `${data.datastakeId}-${stakeholder.datastakeId}`;
       const {
         x,
         y,
@@ -9522,41 +9524,29 @@ function LocationIcon({
       const pathLocLatLng = mapRef.layerPointToLatLng(pathLocPoint);
       const isForceOpen = activeMarker?.datastakeId === data.datastakeId;
       const iconSize = isSmallMarker(zoom) || isExtraSmallMarker(zoom) ? [11, 11] : [25, 25];
+
+      // Create container div
+      const containerDiv = document.createElement('div');
+      containerDiv.id = markerId;
       const marker = L__namespace.marker(stakeholderLatLng, {
         icon: L__namespace.divIcon({
-          html: `<div id="${markerId}"></div>`,
+          html: containerDiv.outerHTML,
           className: "marker-chain",
           iconSize: iconSize
         })
       }).addTo(mapRef);
       markersRef.current.push(marker);
-      setTimeout(() => {
-        const div = document.getElementById(markerId);
-        if (div && !rootsMapRef.current.has(markerId)) {
-          const root = client.createRoot(div);
-          rootsMapRef.current.set(markerId, root);
-          root.render( /*#__PURE__*/jsxRuntime.jsx(StakeholderIcon$1, {
-            data: stakeholder,
-            zoom: zoom,
-            allData: allData,
-            link: link,
-            parentId: data.datastakeId,
-            renderTooltip: renderTooltip,
-            onClickLink: onClickLink,
-            selectedMarkersId: selectedMarkersId,
-            handleSelectMarker: handleSelectMarker,
-            mapRef: mapRef,
-            radius: radius,
-            index: index,
-            x: x,
-            y: y,
-            openPopupIdRef: openPopupIdRef,
-            polylinesRef: polylinesRef,
-            isForceOpen: isForceOpen,
-            activeMarker: activeMarker
-          }));
-        }
-      }, 0);
+
+      // Store container info for portal rendering
+      containers.push({
+        markerId,
+        stakeholder,
+        x,
+        y,
+        radius,
+        index,
+        isForceOpen
+      });
       setMapMarkers(prev => {
         const array = [...prev, {
           id: marker._leaflet_id,
@@ -9588,17 +9578,19 @@ function LocationIcon({
         animated: true
       });
     });
+
+    // Update portal containers after markers are created
+    setTimeout(() => {
+      setPortalContainers(containers);
+    }, 0);
     return () => {
       markersRef.current.forEach(marker => {
-        if (mapRef.hasLayer(marker)) {
+        if (mapRef && mapRef.hasLayer(marker)) {
           mapRef.removeLayer(marker);
         }
       });
-      rootsMapRef.current.forEach(root => {
-        root.unmount();
-      });
-      rootsMapRef.current.clear();
       markersRef.current = [];
+      setPortalContainers([]);
     };
   }, [stakeholdersOfLocation, selectedMarkersId, activeMarker, zoom]);
 
@@ -9682,57 +9674,81 @@ function LocationIcon({
       });
     });
   }, [linkedNodesData, selectedMarkersId, zoom, stakeholdersOfLocation, isSelected]);
-  return /*#__PURE__*/jsxRuntime.jsx(antd.Popover, {
-    content: renderTooltipJsx({
-      title: data.name,
-      subTitle: data.subTitle,
-      total: data.sources,
-      className: "pt-0 pb-0",
-      items: renderTooltip(data),
-      link,
-      onClickLink: () => onClickLink(data),
-      isNewTab: true
-    })
-    // open={
-    // 	(!openPopupIdRef.current || openPopupIdRef.current === data.datastakeId) &&
-    // 	isHovering
-    // }
-    ,
-    getPopupContainer: triggerNode => {
-      const mapElement = document.getElementById("map");
-      return mapElement || triggerNode.parentElement || document.body;
-    },
-    children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-      style: {
-        position: "relative",
-        display: "inline-block"
+  return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/jsxRuntime.jsx(antd.Popover, {
+      content: renderTooltipJsx({
+        title: data.name,
+        subTitle: data.subTitle,
+        total: data.sources,
+        className: "pt-0 pb-0",
+        items: renderTooltip(data),
+        link,
+        onClickLink: () => onClickLink(data),
+        isNewTab: true
+      }),
+      getPopupContainer: triggerNode => {
+        const mapElement = document.getElementById("map");
+        return mapElement || triggerNode.parentElement || document.body;
       },
-      children: [(isSelected || selectedMarkersId.length === 0) && /*#__PURE__*/jsxRuntime.jsx("div", {
+      children: /*#__PURE__*/jsxRuntime.jsxs("div", {
         style: {
-          position: "absolute",
-          bottom: "0",
-          left: "50%",
-          transform: "translateX(-50%)",
-          width: "12px",
-          height: "6px",
-          background: "rgba(0,0,0,0.15)",
-          borderRadius: "50%",
-          filter: "blur(3px)"
-        }
-      }), /*#__PURE__*/jsxRuntime.jsx(Marker, {
-        isSelected: isSelected,
-        onClick: () => {
-          handleSelectMarker(data);
-          setActiveMarker(isSelected ? null : data);
+          position: "relative",
+          display: "inline-block"
         },
+        children: [(isSelected || selectedMarkersId.length === 0) && /*#__PURE__*/jsxRuntime.jsx("div", {
+          style: {
+            position: "absolute",
+            bottom: "0",
+            left: "50%",
+            transform: "translateX(-50%)",
+            width: "12px",
+            height: "6px",
+            background: "rgba(0,0,0,0.15)",
+            borderRadius: "50%",
+            filter: "blur(3px)"
+          }
+        }), /*#__PURE__*/jsxRuntime.jsx(Marker, {
+          isSelected: isSelected,
+          onClick: () => {
+            handleSelectMarker(data);
+            setActiveMarker(isSelected ? null : data);
+          },
+          zoom: zoom,
+          selectedMarkersId: selectedMarkersId
+        })]
+      })
+    }), portalContainers.map(({
+      markerId,
+      stakeholder,
+      x,
+      y,
+      radius,
+      index,
+      isForceOpen
+    }) => {
+      const container = document.getElementById(markerId);
+      if (!container) return null;
+      return /*#__PURE__*/reactDom.createPortal( /*#__PURE__*/jsxRuntime.jsx(StakeholderIcon$1, {
+        data: stakeholder,
         zoom: zoom,
-        onMouseEnter: () => setIsHovering(true),
-        onMouseLeave: () => {
-          setIsHovering(false);
-        },
-        selectedMarkersId: selectedMarkersId
-      })]
-    })
+        allData: allData,
+        link: link,
+        parentId: data.datastakeId,
+        renderTooltip: renderTooltip,
+        onClickLink: onClickLink,
+        selectedMarkersId: selectedMarkersId,
+        handleSelectMarker: handleSelectMarker,
+        mapRef: mapRef,
+        radius: radius,
+        index: index,
+        x: x,
+        y: y,
+        openPopupIdRef: openPopupIdRef,
+        polylinesRef: polylinesRef,
+        isForceOpen: isForceOpen,
+        activeMarker: activeMarker
+      }, markerId), container);
+    })]
   });
 }
 
@@ -12753,7 +12769,6 @@ const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {}) => {
 const Container$1 = styled__default["default"].div`
 	height: ${props => props.height || '300px'};
 	width: ${props => props.isPdf ? props.width ? props.width : '1000px' : 'calc(100% - 48px)'};
-	overflow: ${props => props.style?.overflow || 'visible'};
 `;
 
 const useLegendConfig = ({
@@ -14161,7 +14176,7 @@ const getTabs = t => {
     label: t("Events")
   }];
 };
-const getFiltersConfig$b = ({
+const getFiltersConfig$e = ({
   t,
   filters,
   activeTab,
@@ -14396,7 +14411,7 @@ function MineSites({
     config: dataFetchConfig
   });
   const tabs = React.useMemo(() => getTabs(t), [t]);
-  const filtersConfig = React.useMemo(() => getFiltersConfig$b({
+  const filtersConfig = React.useMemo(() => getFiltersConfig$e({
     t,
     filters,
     options,
@@ -15549,7 +15564,12 @@ function DAFTable({
   doEmptyRows,
   ...rest
 }) {
-  const [source, setSource] = React.useState([]);
+  const source = React.useMemo(() => {
+    if (data && Array.isArray(data)) {
+      return data;
+    }
+    return [];
+  }, [data]);
   const projectData = (projects || []).find(p => p.id === selectedProject);
   const [filtersInit, setFiltersInit] = React.useState(!loading);
   React.useEffect(() => {
@@ -15594,11 +15614,13 @@ function DAFTable({
       }
     } : filtersConfig;
   }, [sourcesKey, sources, filtersConfig, t]);
-  React.useEffect(() => {
-    if (data && Array.isArray(data)) {
-      setSource(data);
-    }
-  }, [data, data.length]);
+
+  // useEffect(() => {
+  //   if (data && Array.isArray(data)) {
+  //     setSource(data);
+  //   }
+  // }, [data, data.length]);
+
   const paginationPageSize = pagination?.pageSize;
   const dataSource = React.useMemo(() => {
     const pageSize = paginationPageSize ? paginationPageSize : source.length > 10 ? source.length : 10;
@@ -16088,7 +16110,7 @@ const NavigationAction = ({
   });
 };
 
-const getColumns$g = ({
+const getColumns$j = ({
   t,
   data,
   user,
@@ -16214,7 +16236,7 @@ function OrganisationInformation({
     });
   }, [organisationInfo, data]);
   const columns = React.useMemo(() => {
-    return getColumns$g({
+    return getColumns$j({
       t,
       data: tableData,
       user,
@@ -16345,7 +16367,7 @@ const Style$8 = styled__default["default"].div`
   }
 `;
 
-const getColumns$f = ({
+const getColumns$i = ({
   t = () => {},
   options = {},
   user = {},
@@ -16502,7 +16524,7 @@ function ProductionSites({
     return productionSites?.length > 5 ? ComponentWithFocus : "div";
   }, [productionSites]);
   const columns = React.useMemo(() => {
-    return getColumns$f({
+    return getColumns$i({
       t,
       options,
       user,
@@ -16736,7 +16758,7 @@ const getAdminLevelName = (data, level) => {
   return entry?.name || "-";
 };
 
-const getColumns$e = ({
+const getColumns$h = ({
   t,
   activeTab,
   options,
@@ -17030,7 +17052,7 @@ function AssociatedInformation$1({
   console.log({
     data
   });
-  const columns = React.useMemo(() => getColumns$e({
+  const columns = React.useMemo(() => getColumns$h({
     t,
     isMonitoring: false,
     activeTab,
@@ -17414,7 +17436,7 @@ const getPartnershipTypes = t => {
   }];
 };
 
-const getColumns$d = ({
+const getColumns$g = ({
   t,
   accept,
   decline,
@@ -40800,7 +40822,7 @@ const PartnersTable = ({
     setTotalRequests,
     t
   });
-  const columns = React.useMemo(() => getColumns$d({
+  const columns = React.useMemo(() => getColumns$g({
     t,
     accept,
     decline,
@@ -41037,7 +41059,7 @@ const Create = ({
   });
 };
 
-const getFiltersConfig$a = ({
+const getFiltersConfig$d = ({
   t
 }) => {
   return {
@@ -41068,7 +41090,7 @@ const getFiltersConfig$a = ({
     }
   };
 };
-const getFilterOptions$a = (options, t) => {
+const getFilterOptions$d = (options, t) => {
   const {
     countries,
     category,
@@ -41079,13 +41101,13 @@ const getFilterOptions$a = (options, t) => {
     category: categoriesOptions || category || []
   };
 };
-const formConfig$8 = {
+const formConfig$b = {
   namespace: 'stakeholders',
   view: 'scoping',
   scope: 'create',
   formType: 'stakeholder'
 };
-const viewConfig$8 = {
+const viewConfig$b = {
   title: "Stakeholders",
   createTitle: "Create Stakeholder"
 };
@@ -41172,7 +41194,7 @@ function sourceAvatarConfig(items, user, applications) {
   });
 }
 
-const getColumns$c = ({
+const getColumns$f = ({
   t,
   goTo,
   user,
@@ -41225,7 +41247,8 @@ const getColumns$c = ({
         className: "daf-default-cell"
       });
     }
-    const category = findOptions(v, options?.categoriesOptions);
+    const categoriesOptions = [...(options?.categoriesOptions || []), ...(options?.category || [])];
+    const category = findOptions(v, categoriesOptions);
     return category ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: category,
       children: category
@@ -41242,7 +41265,8 @@ const getColumns$c = ({
         className: "daf-default-cell"
       });
     }
-    const subCategory = findOptions(v, options?.subCategoriesOptions);
+    const subCategoriesOptions = [...(options?.subCategoriesOptions || []), ...(options?.subCategory || [])];
+    const subCategory = findOptions(v, subCategoriesOptions);
     return subCategory ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: subCategory,
       children: subCategory
@@ -41277,7 +41301,7 @@ const getColumns$c = ({
       });
     }
     if (!val || val?.length === 0) {
-      return "--";
+      return "-";
     }
     const sources = sourceAvatarConfig(val, user, applications);
     return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
@@ -41326,7 +41350,7 @@ const getColumns$c = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$9 = ({
+const getFiltersConfig$c = ({
   t
 }) => {
   return {
@@ -41494,7 +41518,7 @@ const getFiltersConfig$9 = ({
     }
   };
 };
-const getFilterOptions$9 = (options, t) => {
+const getFilterOptions$c = (options, t) => {
   const {
     statusOptions,
     categoryOptions,
@@ -41516,13 +41540,13 @@ const getFilterOptions$9 = (options, t) => {
   };
   return _default;
 };
-const formConfig$7 = {
+const formConfig$a = {
   namespace: 'OPERATOR',
   view: ['scoping', 'new'],
   scope: 'global',
   formType: 'operator'
 };
-const viewConfig$7 = {
+const viewConfig$a = {
   title: "Operators",
   createTitle: "Create Operator"
 };
@@ -41563,7 +41587,7 @@ const renderStatusTag = ({
   }
 };
 
-const getColumns$b = ({
+const getColumns$e = ({
   t,
   goTo,
   user,
@@ -41621,7 +41645,8 @@ const getColumns$b = ({
         className: "daf-default-cell"
       });
     }
-    const country = findOptions(v, data?.options?.positionSupplyChainOptions || data?.options?.optionPositionSupplyChain);
+    const positionSupplyChainOptions = [...(data?.options?.positionSupplyChainOptions || []), ...(options?.positionSupplyChainOptions || []), ...(options?.optionPositionSupplyChain || [])];
+    const country = findOptions(v, positionSupplyChainOptions);
     return country ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: country,
       children: country
@@ -41640,7 +41665,8 @@ const getColumns$b = ({
         className: "daf-default-cell"
       });
     }
-    const subCategory = findOptions(v, data?.options?.subCategoriesOptions || data?.options?.subCategory);
+    const subCategoriesOptions = [...(data?.options?.subCategoriesOptions || []), ...(options?.subCategoriesOptions || []), ...(options?.subCategory || [])];
+    const subCategory = findOptions(v, subCategoriesOptions);
     return subCategory ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: subCategory,
       children: subCategory
@@ -41709,6 +41735,9 @@ const getColumns$b = ({
         className: "daf-default-cell"
       });
     }
+    if (!val || val?.length === 0) {
+      return "-";
+    }
     const sources = sourceAvatarConfig(val, user, applications);
     return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
       items: sources
@@ -41770,7 +41799,7 @@ const getColumns$b = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$8 = ({
+const getFiltersConfig$b = ({
   t
 }) => {
   return {
@@ -41911,7 +41940,7 @@ const getFiltersConfig$8 = ({
     }
   };
 };
-const getFilterOptions$8 = (options, t) => {
+const getFilterOptions$b = (options, t) => {
   const {
     statusOptions,
     categoryOptions,
@@ -41938,18 +41967,18 @@ const getFilterOptions$8 = (options, t) => {
   };
   return _default;
 };
-const formConfig$6 = {
+const formConfig$9 = {
   namespace: 'WORKERS',
   view: ['scoping', 'new'],
   scope: 'global',
   formType: 'worker'
 };
-const viewConfig$6 = {
+const viewConfig$9 = {
   title: "Workers",
   createTitle: "Create Worker"
 };
 
-const getColumns$a = ({
+const getColumns$d = ({
   t,
   goTo,
   user,
@@ -42028,7 +42057,8 @@ const getColumns$a = ({
         className: "daf-default-cell"
       });
     }
-    const activity = findOptions(v, data?.options?.activityAtSiteOptions || data?.options?.activityAtSite);
+    const activityAtSiteOptions = [...(data?.options?.activityAtSiteOptions || []), ...(options?.activityAtSiteOptions || []), ...(options?.activityAtSite || [])];
+    const activity = findOptions(v, activityAtSiteOptions);
     return activity ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: activity,
       children: activity
@@ -42079,6 +42109,9 @@ const getColumns$a = ({
         className: "daf-default-cell"
       });
     }
+    if (!val || val?.length === 0) {
+      return "-";
+    }
     const sources = sourceAvatarConfig(val, user, applications);
     return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
       items: sources
@@ -42125,7 +42158,175 @@ const getColumns$a = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$7 = ({
+const getFiltersConfig$a = ({
+  t
+}) => {
+  return {
+    status: {
+      type: "select",
+      label: "Status",
+      placeholder: () => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        fley: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    },
+    timeframe: {
+      type: "timeframe",
+      label: "Timeframe",
+      style: {
+        flex: 1
+      }
+    }
+  };
+};
+const getFilterOptions$a = (options, t) => {
+  const _default = {
+    status: getStatusOptions(t) || [],
+    timeframe: []
+  };
+  return _default;
+};
+const formConfig$8 = {
+  namespace: 'armed-groups',
+  view: ['scoping', 'new'],
+  scope: 'global',
+  formType: 'armed-group'
+};
+const viewConfig$8 = {
+  title: "Armed Groups",
+  createTitle: "New Armed Group"
+};
+
+const getColumns$c = ({
+  t,
+  goTo,
+  user,
+  options,
+  activeTab,
+  getRedirectLink,
+  theme,
+  subject,
+  data,
+  applications
+}) => [{
+  dataIndex: 'datastakeId',
+  title: t('ID'),
+  ellipsis: true,
+  show: true,
+  key: "datastakeId",
+  sorter: () => 0 + 0,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  dataIndex: 'name',
+  title: t('Name'),
+  ellipsis: true,
+  show: true,
+  key: "name",
+  sorter: () => 0 + 0,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  title: t("Last Update"),
+  dataIndex: "updatedAt",
+  key: "updatedAt",
+  render: (date, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: _date,
+      children: _date
+    });
+  },
+  ellipsis: true
+}, {
+  title: t("Sources"),
+  dataIndex: "sources",
+  key: "sources",
+  show: activeTab !== "own",
+  render: (val, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    if (!val || val?.length === 0) {
+      return "-";
+    }
+    const sources = sourceAvatarConfig(val, user, applications);
+    return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
+      items: sources
+    });
+  }
+}, {
+  title: t("Status"),
+  dataIndex: 'status',
+  ellipsis: true,
+  show: activeTab == "own",
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _val = all?.published || all?.status === "submitted" ? "submitted" : v;
+    return renderStatusTag({
+      value: _val,
+      t
+    });
+  }
+}, {
+  id: 'actions',
+  title: "",
+  width: 60,
+  render: (_, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const onClick = () => {
+      let link = `/app/view/${subject}/${all.datastakeId}`;
+      if (activeTab === "shared") {
+        link += `?sourceId=${all?.authorId?.id}`;
+      }
+      goTo(getRedirectLink(link));
+    };
+    return /*#__PURE__*/jsxRuntime.jsx(NavigationAction, {
+      onClick: onClick,
+      theme: theme
+    });
+  }
+}].filter(column => column.show !== false);
+
+const getFiltersConfig$9 = ({
   t
 }) => {
   return {
@@ -42277,7 +42478,7 @@ const getFiltersConfig$7 = ({
     }
   };
 };
-const getFilterOptions$7 = (options, t) => {
+const getFilterOptions$9 = (options, t) => {
   const {
     timeframe = [],
     status,
@@ -42303,13 +42504,13 @@ const getFilterOptions$7 = (options, t) => {
     }]
   };
 };
-const formConfig$5 = {
+const formConfig$7 = {
   namespace: 'event',
   view: 'scoping',
   scope: 'create',
   formType: 'event'
 };
-const viewConfig$5 = {
+const viewConfig$7 = {
   title: "Events",
   createTitle: "Create Event"
 };
@@ -42436,7 +42637,7 @@ MoreTags.propTypes = {
   limit: PropTypes__default["default"].number
 };
 
-const getColumns$9 = ({
+const getColumns$b = ({
   t,
   goTo,
   user,
@@ -42598,6 +42799,9 @@ const getColumns$9 = ({
         className: "daf-default-cell"
       });
     }
+    if (!val || val?.length === 0) {
+      return "-";
+    }
     const sources = sourceAvatarConfig(val, user, applications);
     return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
       items: sources
@@ -42668,7 +42872,7 @@ const getColumns$9 = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$6 = ({
+const getFiltersConfig$8 = ({
   t
 }) => {
   return {
@@ -42840,7 +43044,7 @@ const getFiltersConfig$6 = ({
     }
   };
 };
-const getFilterOptions$6 = (options, t) => {
+const getFilterOptions$8 = (options, t) => {
   const {
     timeframe = [],
     statusOptions,
@@ -42873,13 +43077,13 @@ const getFilterOptions$6 = (options, t) => {
   };
   return _default;
 };
-const formConfig$4 = {
+const formConfig$6 = {
   namespace: 'corrective-actions',
   view: 'corrective-actions',
   scope: 'createActivity',
   formType: 'activity'
 };
-const viewConfig$4 = {
+const viewConfig$6 = {
   title: "Activities",
   createTitle: "Create Activity"
 };
@@ -42893,7 +43097,7 @@ const getEventCategoryBySubject = (eventCategoryObject, subject, isSingular = fa
   return eventCategoryObject[key] || null;
 };
 
-const getColumns$8 = ({
+const getColumns$a = ({
   t,
   goTo,
   user,
@@ -43040,6 +43244,9 @@ const getColumns$8 = ({
         className: "daf-default-cell"
       });
     }
+    if (!val || val?.length === 0) {
+      return "-";
+    }
     const sources = sourceAvatarConfig(val, user, applications);
     return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
       items: sources
@@ -43103,7 +43310,7 @@ const getColumns$8 = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$5 = ({
+const getFiltersConfig$7 = ({
   t
 }) => {
   return {
@@ -43274,7 +43481,7 @@ const getFiltersConfig$5 = ({
     }
   };
 };
-const getFilterOptions$5 = (options, t) => {
+const getFilterOptions$7 = (options, t) => {
   const {
     timeframe = [],
     statusOptions,
@@ -43307,18 +43514,18 @@ const getFilterOptions$5 = (options, t) => {
   };
   return _default;
 };
-const formConfig$3 = {
+const formConfig$5 = {
   namespace: 'incident',
   view: 'incident',
   scope: 'createIncident',
   formType: 'incident'
 };
-const viewConfig$3 = {
+const viewConfig$5 = {
   title: "Incidents",
   createTitle: "Create Incident"
 };
 
-const getColumns$7 = ({
+const getColumns$9 = ({
   t,
   goTo,
   user,
@@ -43465,6 +43672,9 @@ const getColumns$7 = ({
         className: "daf-default-cell"
       });
     }
+    if (!val || val?.length === 0) {
+      return "-";
+    }
     const sources = sourceAvatarConfig(val, user, applications);
     return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
       items: sources
@@ -43528,233 +43738,651 @@ const getColumns$7 = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$4 = ({
+const getFiltersConfig$6 = ({
   t
 }) => {
   return {
-    country: {
-      type: 'select',
-      placeholder: t('Country'),
+    timeframe: {
+      type: "timeframe",
+      label: "Timeframe",
       style: {
         flex: 1
       },
-      labelStyle: {
-        flex: 1
-      },
-      getLabel: option => option.label,
-      getValue: option => option.value
+      t: t
     },
-    category: {
-      type: 'select',
-      label: 'Category',
-      placeholder: t => `${t('Filter by')} ${t('Category').toLowerCase()}`,
-      style: {
-        flex: 1
-      },
-      labelStyle: {
-        flex: 1
-      },
-      getLabel: option => option.label,
-      getValue: option => option.value
-    }
-  };
-};
-const getFilterOptions$4 = (options, t) => {
-  const {
-    countries,
-    category,
-    locationCategories
-  } = options || {};
-  return {
-    country: countries || [],
-    category: locationCategories || category || []
-  };
-};
-const formConfig$2 = {
-  namespace: 'locations',
-  view: 'scoping',
-  scope: 'create',
-  formType: 'location'
-};
-const viewConfig$2 = {
-  title: "Locations",
-  createTitle: "Create Location"
-};
-
-const getColumns$6 = ({
-  t,
-  goTo,
-  user,
-  options,
-  activeTab,
-  getRedirectLink,
-  theme,
-  subject,
-  data,
-  applications
-}) => [{
-  dataIndex: 'datastakeId',
-  title: t('ID'),
-  ellipsis: true,
-  show: true,
-  render: (v, all) => {
-    if (all.empty) {
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "daf-default-cell"
-      });
-    }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: v,
-      children: v
-    });
-  }
-}, {
-  dataIndex: 'name',
-  title: t('Name'),
-  ellipsis: true,
-  show: true,
-  render: (v, all) => {
-    if (all.empty) {
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "daf-default-cell"
-      });
-    }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: v,
-      children: v
-    });
-  }
-}, {
-  dataIndex: 'category',
-  title: t('Category'),
-  ellipsis: true,
-  show: true,
-  render: (v, all) => {
-    if (all.empty) {
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "daf-default-cell"
-      });
-    }
-    const locationCategories = [...(data?.options?.locationCategories || []), ...(options?.productionSiteCategories || [])];
-    const category = findOptions(v, locationCategories);
-    return category ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: category,
-      children: category
-    }) : '-';
-  }
-}, {
-  dataIndex: 'country',
-  title: t('Country'),
-  ellipsis: true,
-  show: true,
-  render: (v, all) => {
-    if (all.empty) {
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "daf-default-cell"
-      });
-    }
-    const country = findOptions(v, options?.countries);
-    return country ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: country,
-      children: country
-    }) : '-';
-  }
-}, {
-  dataIndex: 'province',
-  title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
-  ellipsis: true,
-  show: true,
-  render: (v, all) => {
-    if (all.empty) {
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "daf-default-cell"
-      });
-    }
-    const province = getLinkValue(all?.administrativeLevel1, all?.linking?.SCL);
-    return province ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: province,
-      children: province
-    }) : '-';
-  }
-}, {
-  dataIndex: 'territory',
-  title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
-  ellipsis: true,
-  show: true,
-  render: (v, all) => {
-    if (all.empty) {
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "daf-default-cell"
-      });
-    }
-    const territory = getLinkValue(all?.administrativeLevel2, all?.linking?.SCL);
-    return territory ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: territory,
-      children: territory
-    }) : '-';
-  }
-}, {
-  title: t("Sources"),
-  dataIndex: "sources",
-  key: "sources",
-  show: activeTab !== "own",
-  render: (val, all) => {
-    if (all.empty) {
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "daf-default-cell"
-      });
-    }
-    const sources = sourceAvatarConfig(val, user, applications);
-    return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
-      items: sources
-    });
-  }
-}, {
-  title: t("Last Update"),
-  dataIndex: "updatedAt",
-  key: "updatedAt",
-  width: 125,
-  render: (date, all) => {
-    if (all.empty) {
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "daf-default-cell"
-      });
-    }
-    const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: _date,
-      children: _date
-    });
-  },
-  ellipsis: true
-}, {
-  id: 'actions',
-  title: "",
-  width: 60,
-  render: (_, all) => {
-    if (all.empty) {
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "daf-default-cell"
-      });
-    }
-    const onClick = () => {
-      let link = `/app/view/${subject}/${all.datastakeId}`;
-      if (activeTab === "shared") {
-        link += `?sourceId=${all?.authorId?.id}`;
-      }
-      goTo(getRedirectLink(link));
-    };
-    return /*#__PURE__*/jsxRuntime.jsx(NavigationAction, {
-      onClick: onClick,
-      theme: theme
-    });
-  }
-}].filter(column => column.show !== false);
-
-const getFiltersConfig$3 = ({
-  t
-}) => {
-  return {
+    country: {
+      type: 'select',
+      label: 'Country',
+      placeholder: () => `${t('Filter by')} ${t('Country').toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    },
+    administrativeLevel1: {
+      type: 'ajaxSelect',
+      label: ({
+        t = s => s,
+        options = {},
+        filters = {},
+        language = 'en'
+      }) => {
+        const {
+          administrativeLevel1
+        } = options;
+        if (administrativeLevel1) {
+          if (options.country) {
+            const _item = administrativeLevel1[filters.country];
+            if (_item) {
+              if (_item[language]) {
+                return _item[language];
+              }
+            }
+          }
+        }
+        return t('Province');
+      },
+      placeholder: () => `${t('Filter by')} ${t('Province').toLowerCase()}`,
+      filters: data => ({
+        country: data.country,
+        level: 'level_1'
+      }),
+      show: data => !data.country,
+      disabled: data => !data.country,
+      mapper: {
+        label: "name",
+        value: "id"
+      },
+      method: 'getOptions',
+      entity: 'AdministrativeLevel',
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      }
+    },
+    administrativeLevel2: {
+      type: 'ajaxSelect',
+      label: ({
+        t = s => s,
+        options = {},
+        filters = {},
+        language = 'en'
+      }) => {
+        const {
+          administrativeLevel2
+        } = options;
+        if (administrativeLevel2) {
+          if (options.country) {
+            const _item = administrativeLevel2[filters.country];
+            if (_item) {
+              if (_item[language]) {
+                return _item[language];
+              }
+            }
+          }
+        }
+        return t('Province');
+      },
+      show: data => !(data.country && data.administrativeLevel1),
+      placeholder: () => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
+      filters: data => ({
+        country: data.country,
+        level: 'level_2',
+        administrativeLevel1: data.administrativeLevel1
+      }),
+      disabled: data => !(data.country && data.administrativeLevel1),
+      mapper: {
+        label: "name",
+        value: "id"
+      },
+      method: 'getOptions',
+      entity: 'AdministrativeLevel',
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      }
+    },
+    eventCategory: {
+      type: 'select',
+      label: 'Category',
+      placeholder: () => `${t('Filter by')} ${t('Category').toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value,
+      filterOptions: val => {
+        if (val) {
+          const {
+            option,
+            filters
+          } = val;
+          if (filters && option) {
+            const {
+              filters: optionFilters
+            } = option;
+            if (Array.isArray(optionFilters) && optionFilters.length) {
+              const {
+                value,
+                condition
+              } = optionFilters[0];
+              if (condition === 'includes') {
+                return value.includes('corporation');
+              }
+            }
+          }
+        }
+        return true;
+      }
+    },
+    // positionInTheMineralSupplyChain: {
+    //   type: 'select',
+    //   label: 'Position',
+    //   placeholder: () => `${t('Filter by')} ${t('Position').toLowerCase()}`,
+    //   style: { flex: 1 },
+    //   labelStyle: { flex: 1 },
+    //   getLabel: (option) => option.label,
+    //   getValue: (option) => option.value,
+    // },
+    status: {
+      type: "select",
+      label: "Status",
+      placeholder: () => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        fley: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    }
+  };
+};
+const getFilterOptions$6 = (options, t) => {
+  const {
+    timeframe = [],
+    statusOptions,
+    categoryOptions,
+    countries,
+    subCategory,
+    category,
+    stakeholderCategoryOptions,
+    stakeholderSubCategoriesOptions,
+    administrativeLevel1,
+    administrativeLevel2,
+    positionInMineralSupplyChainOptions,
+    subCategoriesOptions,
+    eventCategoryOptions
+  } = options || {};
+  const _categoryOptions = (eventCategoryOptions || categoryOptions || [])?.map(item => ({
+    value: item.value,
+    label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label
+  }));
+  const _default = {
+    timeframe: timeframe,
+    status: getStatusOptions(t) || [],
+    eventCategory: _categoryOptions || [],
+    country: countries || [],
+    subCategory: subCategoriesOptions || [],
+    // category: category,
+    administrativeLevel1,
+    administrativeLevel2
+    // positionInTheMineralSupplyChain: positionInMineralSupplyChainOptions || [],
+  };
+  return _default;
+};
+const formConfig$4 = {
+  namespace: 'testimonials',
+  view: 'testimonials',
+  scope: 'create',
+  formType: 'testimonial'
+};
+const viewConfig$4 = {
+  title: "Testimonials",
+  createTitle: "New Testimonial"
+};
+
+const getColumns$8 = ({
+  t,
+  goTo,
+  user,
+  options,
+  activeTab,
+  getRedirectLink,
+  theme,
+  subject,
+  data,
+  applications
+}) => [{
+  dataIndex: 'datastakeId',
+  title: t('ID'),
+  ellipsis: true,
+  show: true,
+  key: "datastakeId",
+  sorter: () => 0 + 0,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  dataIndex: 'name',
+  title: t('Title'),
+  ellipsis: true,
+  show: true,
+  key: "name",
+  sorter: () => 0 + 0,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  title: t("type"),
+  dataIndex: "typeOfTestimonials",
+  key: "typeOfTestimonials",
+  sorter: () => 0 + 0,
+  show: true,
+  render: (title, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const type = findOptions(title, data?.options?.testimonialsType);
+    return type ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: type,
+      children: type
+    }) : '-';
+  },
+  ellipsis: true
+}, {
+  title: t("Date"),
+  dataIndex: "date",
+  key: "date",
+  sorter: () => 0 + 0,
+  render: (date, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: _date,
+      children: _date
+    });
+  },
+  ellipsis: true
+}, {
+  dataIndex: 'mineSite',
+  title: t('Location'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        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,
+      children: mineSite
+    }) : '-';
+  }
+}, {
+  dataIndex: 'eventCategory',
+  title: t('Category'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const eventCategory = findOptions(v, data?.options?.eventCategoryOptions || data?.options?.categoryOptions);
+    const categoryValue = getEventCategoryBySubject(eventCategory, subject);
+    return categoryValue ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: categoryValue,
+      children: categoryValue
+    }) : '-';
+  }
+}, {
+  title: t("Sources"),
+  dataIndex: "sources",
+  key: "sources",
+  show: activeTab !== "own",
+  render: (val, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    if (!val || val?.length === 0) {
+      return "-";
+    }
+    const sources = sourceAvatarConfig(val, user, applications);
+    return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
+      items: sources
+    });
+  }
+}, {
+  title: t("Status"),
+  dataIndex: "status",
+  key: "status",
+  show: activeTab === "own",
+  render: (val, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _val = all?.published || all?.status === "submitted" ? "submitted" : val;
+    return renderStatusTag({
+      value: _val,
+      t
+    });
+  }
+}, {
+  title: t("Last Update"),
+  dataIndex: "updatedAt",
+  key: "updatedAt",
+  render: (date, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: _date,
+      children: _date
+    });
+  },
+  ellipsis: true
+}, {
+  id: 'actions',
+  title: "",
+  width: 60,
+  render: (_, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const onClick = () => {
+      let link = `/app/view/${subject}/${all.datastakeId}`;
+      if (activeTab === "shared") {
+        link += `?sourceId=${all?.authorId?.id}`;
+      }
+      goTo(getRedirectLink(link));
+    };
+    return /*#__PURE__*/jsxRuntime.jsx(NavigationAction, {
+      onClick: onClick,
+      theme: theme
+    });
+  }
+}].filter(column => column.show !== false);
+
+const getFiltersConfig$5 = ({
+  t
+}) => {
+  return {
+    country: {
+      type: 'select',
+      placeholder: t('Country'),
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    },
+    category: {
+      type: 'select',
+      label: 'Category',
+      placeholder: t => `${t('Filter by')} ${t('Category').toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    }
+  };
+};
+const getFilterOptions$5 = (options, t) => {
+  const {
+    countries,
+    category,
+    locationCategories
+  } = options || {};
+  return {
+    country: countries || [],
+    category: locationCategories || category || []
+  };
+};
+const formConfig$3 = {
+  namespace: 'locations',
+  view: 'scoping',
+  scope: 'create',
+  formType: 'location'
+};
+const viewConfig$3 = {
+  title: "Locations",
+  createTitle: "Create Location"
+};
+
+const getColumns$7 = ({
+  t,
+  goTo,
+  user,
+  options,
+  activeTab,
+  getRedirectLink,
+  theme,
+  subject,
+  data,
+  applications
+}) => [{
+  dataIndex: 'datastakeId',
+  title: t('ID'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  dataIndex: 'name',
+  title: t('Name'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  dataIndex: 'category',
+  title: t('Category'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const locationCategories = [...(data?.options?.locationCategories || []), ...(options?.productionSiteCategories || [])];
+    const category = findOptions(v, locationCategories);
+    return category ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: category,
+      children: category
+    }) : '-';
+  }
+}, {
+  dataIndex: 'country',
+  title: t('Country'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const country = findOptions(v, options?.countries);
+    return country ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: country,
+      children: country
+    }) : '-';
+  }
+}, {
+  dataIndex: 'province',
+  title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const province = getLinkValue(all?.administrativeLevel1, all?.linking?.SCL);
+    return province ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: province,
+      children: province
+    }) : '-';
+  }
+}, {
+  dataIndex: 'territory',
+  title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const territory = getLinkValue(all?.administrativeLevel2, all?.linking?.SCL);
+    return territory ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: territory,
+      children: territory
+    }) : '-';
+  }
+}, {
+  title: t("Sources"),
+  dataIndex: "sources",
+  key: "sources",
+  show: activeTab !== "own",
+  render: (val, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    if (!val || val?.length === 0) {
+      return "-";
+    }
+    const sources = sourceAvatarConfig(val, user, applications);
+    return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
+      items: sources
+    });
+  }
+}, {
+  title: t("Last Update"),
+  dataIndex: "updatedAt",
+  key: "updatedAt",
+  width: 125,
+  render: (date, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: _date,
+      children: _date
+    });
+  },
+  ellipsis: true
+}, {
+  id: 'actions',
+  title: "",
+  width: 60,
+  render: (_, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const onClick = () => {
+      let link = `/app/view/${subject}/${all.datastakeId}`;
+      if (activeTab === "shared") {
+        link += `?sourceId=${all?.authorId?.id}`;
+      }
+      goTo(getRedirectLink(link));
+    };
+    return /*#__PURE__*/jsxRuntime.jsx(NavigationAction, {
+      onClick: onClick,
+      theme: theme
+    });
+  }
+}].filter(column => column.show !== false);
+
+const getFiltersConfig$4 = ({
+  t,
+  screen
+}) => {
+  return {
     country: {
       type: 'select',
       label: 'Country',
@@ -43879,7 +44507,8 @@ const getFiltersConfig$3 = ({
         flex: 1
       },
       getLabel: option => option.label,
-      getValue: option => option.value
+      getValue: option => option.value,
+      show: () => screen === 'scl'
     },
     positionInTheMineralSupplyChain: {
       type: 'select',
@@ -43909,7 +44538,7 @@ const getFiltersConfig$3 = ({
     }
   };
 };
-const getFilterOptions$3 = (options, t) => {
+const getFilterOptions$4 = (options, t) => {
   const {
     statusOptions = [],
     categoryOptions = [],
@@ -43938,13 +44567,13 @@ const getFilterOptions$3 = (options, t) => {
   };
   return _default;
 };
-const formConfig$1 = {
+const formConfig$2 = {
   namespace: 'PRODUCTION SITES',
   view: ['scoping', 'new'],
   scope: 'global',
   formType: 'production-sites'
 };
-const viewConfig$1 = {
+const viewConfig$2 = {
   title: "Production Sites",
   createTitle: "Create Production Site"
 };
@@ -43995,7 +44624,7 @@ MoreOptions.propTypes = {
   limit: PropTypes__default["default"].number
 };
 
-const getColumns$5 = ({
+const getColumns$6 = ({
   t,
   goTo,
   user,
@@ -44054,7 +44683,7 @@ const getColumns$5 = ({
         className: "daf-default-cell"
       });
     }
-    const locationCategories = [...(data?.options?.locationCategories || []), ...(options?.productionSiteCategories || [])];
+    const locationCategories = [...(data?.options?.locationCategories || []), ...(options?.productionSiteCategories || []), ...(options?.locationCategories || [])];
     const category = findOptions(v, locationCategories);
     return category ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: category,
@@ -44167,16 +44796,19 @@ const getColumns$5 = ({
   }
 }, {
   title: t("Sources"),
-  dataIndex: 'sources',
-  ellipsis: true,
+  dataIndex: "sources",
+  key: "sources",
   show: activeTab !== "own",
-  render: (v, all) => {
+  render: (val, all) => {
     if (all.empty) {
       return /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "daf-default-cell"
       });
     }
-    const sources = sourceAvatarConfig(v, user, applications);
+    if (!val || val?.length === 0) {
+      return "-";
+    }
+    const sources = sourceAvatarConfig(val, user, applications);
     return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
       items: sources
     });
@@ -44222,6 +44854,208 @@ const getColumns$5 = ({
   }
 }].filter(column => column.show !== false);
 
+const getFiltersConfig$3 = ({
+  t
+}) => {
+  return {
+    status: {
+      type: "select",
+      label: "Status",
+      placeholder: () => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        fley: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    },
+    timeframe: {
+      type: "timeframe",
+      label: "Timeframe",
+      style: {
+        flex: 1
+      }
+    }
+  };
+};
+const getFilterOptions$3 = (options, t) => {
+  const _default = {
+    status: getStatusOptions(t) || [],
+    timeframe: []
+  };
+  return _default;
+};
+const formConfig$1 = {
+  namespace: 'conflict-areas',
+  view: ['scoping', 'new'],
+  scope: 'conflictAreaCreate',
+  formType: 'conflict-area'
+};
+const viewConfig$1 = {
+  title: "Conflict Areas",
+  createTitle: "New Conflict Area"
+};
+
+const getColumns$5 = ({
+  t,
+  goTo,
+  user,
+  options,
+  activeTab,
+  getRedirectLink,
+  theme,
+  subject,
+  data,
+  applications
+}) => [{
+  dataIndex: 'datastakeId',
+  title: t('ID'),
+  ellipsis: true,
+  show: true,
+  key: "datastakeId",
+  sorter: () => 0 + 0,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  dataIndex: "name",
+  title: t('Name'),
+  ellipsis: true,
+  show: true,
+  key: "name",
+  sorter: () => 0 + 0,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  dataIndex: 'region',
+  title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const region = getLinkValue(all?.administrativeLevel1, all?.linking?.SCL);
+    return region ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: region,
+      children: region
+    }) : '-';
+  }
+}, {
+  dataIndex: 'territory',
+  title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const district = getLinkValue(all?.administrativeLevel2, all?.linking?.SCL);
+    return district ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: district,
+      children: district
+    }) : '-';
+  }
+}, {
+  title: t("Last Update"),
+  dataIndex: "updatedAt",
+  key: "updatedAt",
+  render: (date, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: _date,
+      children: _date
+    });
+  },
+  ellipsis: true
+}, {
+  title: t("Sources"),
+  dataIndex: "sources",
+  key: "sources",
+  show: activeTab !== "own",
+  render: (val, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    if (!val || val?.length === 0) {
+      return "-";
+    }
+    const sources = sourceAvatarConfig(val, user, applications);
+    return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
+      items: sources
+    });
+  }
+}, {
+  title: t("Status"),
+  dataIndex: 'status',
+  ellipsis: true,
+  show: activeTab == "own",
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _val = all?.published || all?.status === "submitted" ? "submitted" : v;
+    return renderStatusTag({
+      value: _val,
+      t
+    });
+  }
+}, {
+  id: 'actions',
+  title: "",
+  width: 60,
+  render: (_, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const onClick = () => {
+      let link = `/app/view/${subject}/${all.datastakeId}`;
+      if (activeTab === "shared") {
+        link += `?sourceId=${all?.authorId?.id}`;
+      }
+      goTo(getRedirectLink(link));
+    };
+    return /*#__PURE__*/jsxRuntime.jsx(NavigationAction, {
+      onClick: onClick,
+      theme: theme
+    });
+  }
+}].filter(column => column.show !== false);
+
 const getFiltersConfig$2 = ({
   t
 }) => {
@@ -44376,62 +45210,83 @@ const getColumns$4 = ({
 
 const FILTER_REGISTRY = {
   stakeholders: {
+    config: getFiltersConfig$d,
+    options: getFilterOptions$d,
+    formConfig: formConfig$b,
+    viewConfig: viewConfig$b,
+    columns: getColumns$f
+  },
+  workers: {
+    config: getFiltersConfig$b,
+    options: getFilterOptions$b,
+    formConfig: formConfig$9,
+    viewConfig: viewConfig$9,
+    columns: getColumns$d
+  },
+  operators: {
+    config: getFiltersConfig$c,
+    options: getFilterOptions$c,
+    formConfig: formConfig$a,
+    viewConfig: viewConfig$a,
+    columns: getColumns$e
+  },
+  "armed-groups": {
     config: getFiltersConfig$a,
     options: getFilterOptions$a,
     formConfig: formConfig$8,
     viewConfig: viewConfig$8,
     columns: getColumns$c
   },
-  workers: {
+  events: {
+    config: getFiltersConfig$9,
+    options: getFilterOptions$9,
+    formConfig: formConfig$7,
+    viewConfig: viewConfig$7,
+    columns: getColumns$b
+  },
+  activities: {
     config: getFiltersConfig$8,
     options: getFilterOptions$8,
     formConfig: formConfig$6,
     viewConfig: viewConfig$6,
     columns: getColumns$a
   },
-  operators: {
-    config: getFiltersConfig$9,
-    options: getFilterOptions$9,
-    formConfig: formConfig$7,
-    viewConfig: viewConfig$7,
-    columns: getColumns$b
+  'corrective-actions': {
+    config: getFiltersConfig$8,
+    options: getFilterOptions$8,
+    formConfig: formConfig$6,
+    viewConfig: viewConfig$6,
+    columns: getColumns$a
   },
-  events: {
+  incidents: {
     config: getFiltersConfig$7,
     options: getFilterOptions$7,
     formConfig: formConfig$5,
     viewConfig: viewConfig$5,
     columns: getColumns$9
   },
-  activities: {
+  testimonials: {
     config: getFiltersConfig$6,
     options: getFilterOptions$6,
     formConfig: formConfig$4,
     viewConfig: viewConfig$4,
     columns: getColumns$8
   },
-  'corrective-actions': {
-    config: getFiltersConfig$6,
-    options: getFilterOptions$6,
-    formConfig: formConfig$4,
-    viewConfig: viewConfig$4,
-    columns: getColumns$8
-  },
-  incidents: {
+  locations: {
     config: getFiltersConfig$5,
     options: getFilterOptions$5,
     formConfig: formConfig$3,
     viewConfig: viewConfig$3,
     columns: getColumns$7
   },
-  locations: {
+  'production-sites': {
     config: getFiltersConfig$4,
     options: getFilterOptions$4,
     formConfig: formConfig$2,
     viewConfig: viewConfig$2,
     columns: getColumns$6
   },
-  'production-sites': {
+  "conflict-areas": {
     config: getFiltersConfig$3,
     options: getFilterOptions$3,
     formConfig: formConfig$1,
@@ -44439,11 +45294,11 @@ const FILTER_REGISTRY = {
     columns: getColumns$5
   },
   scl: {
-    config: getFiltersConfig$3,
-    options: getFilterOptions$3,
+    config: getFiltersConfig$4,
+    options: getFilterOptions$4,
     formConfig: sclFormConfig,
     viewConfig: sclViewConfig,
-    columns: getColumns$5
+    columns: getColumns$6
   },
   documents: {
     config: getFiltersConfig$2,
@@ -44477,7 +45332,8 @@ const getFiltersConfig$1 = ({
 }) => {
   const registry = FILTER_REGISTRY[subject] || FILTER_REGISTRY[DEFAULT_SUBJECT];
   return registry?.config({
-    t
+    t,
+    screen: subject
   });
 };
 const getFilterOptions$1 = ({
@@ -51437,6 +52293,44 @@ const RadarChart = ({
     legendConfig,
     isPdf
   });
+
+  // Helper function to wrap long text labels to multiple lines
+  // Ensures text is never hidden - wraps to multiple lines if needed
+  const wrapLabel = React.useCallback((text, maxLength = 10) => {
+    if (!text) {
+      return '';
+    }
+    const formattedText = formattedXAxis(text);
+
+    // If text is short enough, return as is
+    if (formattedText.length <= maxLength) {
+      return formattedText;
+    }
+
+    // Split by spaces to find word boundaries
+    const words = formattedText.split(' ');
+    const lines = [];
+    let currentLine = '';
+    words.forEach((word, index) => {
+      // If adding this word would exceed maxLength, start a new line
+      if (currentLine && (currentLine + ' ' + word).length > maxLength) {
+        if (currentLine) {
+          lines.push(currentLine);
+        }
+        currentLine = word;
+      } else {
+        currentLine = currentLine ? currentLine + ' ' + word : word;
+      }
+
+      // If it's the last word, add it to lines
+      if (index === words.length - 1 && currentLine) {
+        lines.push(currentLine);
+      }
+    });
+
+    // Ensure we always return something - never empty
+    return lines.length > 0 ? lines.join('\n') : formattedText;
+  }, [formattedXAxis]);
   React.useEffect(() => {
     if (!containerRef.current) {
       return;
@@ -51457,16 +52351,20 @@ const RadarChart = ({
         ...tooltipConfig
       },
       color: color || token.colorPrimary7,
-      paddingX: 60,
-      paddingY: 60,
+      // Increased padding to ensure labels are never clipped
+      padding: [50, 50, 50, 50],
       xAxis: {
         label: {
-          formatter: formattedXAxis,
+          formatter: text => wrapLabel(text, 10),
           offset: 15,
+          autoRotate: false,
+          autoHide: false,
+          // Never hide labels
+          autoEllipsis: false,
+          // Never truncate with ellipsis
           style: {
             fontSize: 12,
-            fill: '#666',
-            textAlign: 'center'
+            fill: '#666'
           }
         },
         line: null,
@@ -51525,7 +52423,7 @@ const RadarChart = ({
     } else {
       chartRef.current.update(chartConfig);
     }
-  }, [data, xFieldKey, yFieldKey, seriesField, renderTooltipContent, tooltipConfig, animated, color, formattedYAxis, formattedXAxis, score, token.colorPrimary7, rest]);
+  }, [data, xFieldKey, yFieldKey, seriesField, renderTooltipContent, tooltipConfig, animated, color, formattedYAxis, formattedXAxis, score, token.colorPrimary7, wrapLabel, rest]);
   React.useEffect(() => {
     return () => {
       if (chartRef.current) {
@@ -51536,23 +52434,12 @@ const RadarChart = ({
   }, []);
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "flex flex-1 flex-column justify-content-center",
-    style: {
-      overflow: 'visible'
-    },
     children: [/*#__PURE__*/jsxRuntime.jsx("div", {
       className: "flex justify-content-center",
-      style: {
-        paddingX: '30px',
-        overflow: 'visible',
-        width: '100%'
-      },
       children: /*#__PURE__*/jsxRuntime.jsx(Container$1, {
         ref: containerRef,
         height: height,
-        isPdf: isPdf,
-        style: {
-          paddingX: '30px'
-        }
+        isPdf: isPdf
       })
     }), legendEnabled && legendPosition === 'bottom' && /*#__PURE__*/jsxRuntime.jsx(CustomLegend, {
       items: legendItems,
@@ -57664,21 +58551,29 @@ const BiodiversityHabitat = ({
       }), /*#__PURE__*/jsxRuntime.jsxs("div", {
         style: {
           display: "flex",
-          gap: "24px"
+          gap: "24px",
+          flexWrap: "wrap"
         },
         children: [/*#__PURE__*/jsxRuntime.jsx("section", {
           style: {
-            flex: 1
+            flex: 1,
+            minWidth: "300px"
           },
           children: /*#__PURE__*/jsxRuntime.jsx(ObservedFauna, {
             observedFaunaChart: observedFauna,
             t: t,
             options: options
           })
-        }), /*#__PURE__*/jsxRuntime.jsx(InvasiveSpecies, {
-          invasiveSpeciesChart: invasiveSpecies,
-          t: t,
-          options: options
+        }), /*#__PURE__*/jsxRuntime.jsx("section", {
+          style: {
+            flex: 1,
+            minWidth: "300px"
+          },
+          children: /*#__PURE__*/jsxRuntime.jsx(InvasiveSpecies, {
+            invasiveSpeciesChart: invasiveSpecies,
+            t: t,
+            options: options
+          })
         })]
       })]
     })
@@ -60634,6 +61529,11 @@ class LinkedSubjectsService extends BaseService {
   getForm({
     namespace
   }, language = "en", scope) {
+    console.log({
+      namespace,
+      language,
+      scope
+    });
     return this.apiGet({
       url: `forms/${namespace === "documents" ? namespace : getNamespace(namespace)}`,
       isApp: true,