datastake-daf 0.6.765 → 0.6.766

package/dist/components/index.js

@@ -6384,7 +6384,10 @@ function MoreTags(_ref) {
     values = [],
     maxWidthCont = 120,
     maxTextCont = 100,
-    diff = 30
+    diff = 30,
+    style = {},
+    tagColor,
+    limit
   } = _ref;
   const ref = React.useRef();
   const [width, setWidth] = React.useState(0);
@@ -6399,6 +6402,11 @@ function MoreTags(_ref) {
     return () => resizeObserver.disconnect();
   }, []);
   const _calculate = () => {
+    // If limit prop is provided and valid, use it instead of calculating
+    if (typeof limit === 'number' && limit > 0) {
+      setIndexToReturn(Math.min(limit - 1, values.length - 1));
+      return;
+    }
     const tabs = ref.current.querySelectorAll(".check-tabs");
     let filled = 0;
     let indexToReturn;
@@ -6425,34 +6433,36 @@ function MoreTags(_ref) {
   const other = hasMore ? values.slice(indexToReturn + 1, values.length + 1) : [];
   React.useEffect(() => {
     _calculate();
-  }, [width, values]);
+  }, [width, values, limit]);
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "daf-more-tags",
     children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "list",
       children: [toShow.map((ac, i) => typeof ac.renderTag === "function" ? ac.renderTag() : /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
-        style: {
+        style: _objectSpread2({
           maxWidth: _maxWidthCont,
           overflow: "hidden",
           textOverflow: "ellipsis",
           whiteSpace: "nowrap"
-        },
-        color: ac.color,
+        }, style),
+        color: tagColor || ac.color,
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
           title: typeof ac === "object" ? ac.label : ac,
           children: /*#__PURE__*/jsxRuntime.jsx("span", {
-            style: {
+            style: _objectSpread2({
               maxWidth: _maxWidthTxt,
               overflow: "hidden",
               textOverflow: "ellipsis",
               whiteSpace: "nowrap"
-            },
+            }, style),
             children: typeof ac === "object" ? ac.label : ac
           })
         })
       }, "".concat(typeof ac === "object" ? ac.value : ac, "-").concat(i))), other.length ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: other.map(ac => typeof ac === "object" ? ac.label : ac).join(", "),
         children: /*#__PURE__*/jsxRuntime.jsxs(antd.Tag, {
+          color: tagColor || 'default',
+          style: style,
           children: ["+", other.length]
         })
       }) : null]
@@ -6460,11 +6470,11 @@ function MoreTags(_ref) {
       className: "list hidden",
       ref: ref,
       children: values.map((ac, i) => typeof ac.renderTag === "function" ? ac.renderTag("check-tabs") : /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
-        color: ac.color,
+        color: tagColor || ac.color,
         className: "check-tabs",
-        style: {
+        style: _objectSpread2({
           maxWidth: _maxWidthCont
-        },
+        }, style),
         children: /*#__PURE__*/jsxRuntime.jsx(Text$1, {
           ellipsis: {
             tooltip: typeof ac === "object" ? ac.label : ac
@@ -6482,7 +6492,8 @@ MoreTags.propTypes = {
   values: PropTypes__default["default"].array,
   maxWidthCont: PropTypes__default["default"].number,
   maxTextCont: PropTypes__default["default"].number,
-  diff: PropTypes__default["default"].number
+  diff: PropTypes__default["default"].number,
+  limit: PropTypes__default["default"].number
 };
 
 const pageValues = [10, 20, 50, 100];
@@ -9930,44 +9941,44 @@ function useAjaxModal$2({
 }
 
 const mergeObject = obj => {
-  return Object.entries(obj || {}).reduce((acc, [key, value]) => {
+  return Object.entries(obj || {}).reduce((acc, _ref) => {
+    let [key, value] = _ref;
     if (typeof value === "object" && !Array.isArray(value) && value !== null) {
-      return {
-        ...acc,
-        ...value
-      };
+      return _objectSpread2(_objectSpread2({}, acc), value);
     }
-    return {
-      ...acc,
+    return _objectSpread2(_objectSpread2({}, acc), {}, {
       [key]: value
-    };
+    });
   }, {});
 };
-const handleDataLinkGroupWithTableKeys = ({
-  config,
-  inputConfig,
-  inputKey,
-  value,
-  level,
-  t,
-  rootForm,
-  allData,
-  user,
-  getApiBaseUrl = () => {},
-  getAppHeader = () => {},
-  app,
-  TreeNodeComponent
-}) => {
+const handleDataLinkGroupWithTableKeys = _ref2 => {
+  var _inputConfig$meta, _config$meta2, _inputConfig$meta3, _inputConfig$meta4, _inputConfig$meta5;
+  let {
+    config,
+    inputConfig,
+    inputKey,
+    value,
+    level,
+    t,
+    rootForm,
+    allData,
+    user,
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    app,
+    TreeNodeComponent
+  } = _ref2;
   if (!(config.type === 'dataLinkGroup' || config.type === 'dataLink')) {
     return null;
   }
-  if (inputConfig?.type !== 'dataLink' || !inputConfig?.meta?.tableKeys) {
+  if ((inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type) !== 'dataLink' || !(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta = inputConfig.meta) !== null && _inputConfig$meta !== void 0 && _inputConfig$meta.tableKeys)) {
     const parentInputKeys = Object.keys(config.inputs || {});
     const isHandledBySiblingDataLink = parentInputKeys.some(otherInputKey => {
       const otherConfig = config.inputs[otherInputKey];
-      if (otherConfig?.type === 'dataLink') {
-        const siblingTableKeys = otherConfig?.meta?.tableKeys || [];
-        const additionalTableKeys = config.meta?.additionalTableKeys || [];
+      if ((otherConfig === null || otherConfig === void 0 ? void 0 : otherConfig.type) === 'dataLink') {
+        var _otherConfig$meta, _config$meta;
+        const siblingTableKeys = (otherConfig === null || otherConfig === void 0 || (_otherConfig$meta = otherConfig.meta) === null || _otherConfig$meta === void 0 ? void 0 : _otherConfig$meta.tableKeys) || [];
+        const additionalTableKeys = ((_config$meta = config.meta) === null || _config$meta === void 0 ? void 0 : _config$meta.additionalTableKeys) || [];
         const allSiblingKeys = [...siblingTableKeys, ...additionalTableKeys];
         return allSiblingKeys.includes(inputKey) && otherInputKey !== inputKey;
       }
@@ -9981,23 +9992,26 @@ const handleDataLinkGroupWithTableKeys = ({
     return null;
   }
   const tableKeys = inputConfig.meta.tableKeys;
-  const additionalTableKeys = config.meta?.additionalTableKeys || [];
+  const additionalTableKeys = ((_config$meta2 = config.meta) === null || _config$meta2 === void 0 ? void 0 : _config$meta2.additionalTableKeys) || [];
   const parentInputKeys = Object.keys(config.inputs || {});
   const siblingInputsMatchingTableKeys = parentInputKeys.filter(siblingKey => siblingKey !== inputKey).filter(siblingKey => tableKeys.includes(siblingKey) || additionalTableKeys.includes(siblingKey));
   [...new Set([...tableKeys, ...siblingInputsMatchingTableKeys])];
-  const isAjaxModal = React.useMemo(() => !!inputConfig?.meta?.namespace, [inputConfig]);
+  const isAjaxModal = React.useMemo(() => {
+    var _inputConfig$meta2;
+    return !!(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta2 = inputConfig.meta) !== null && _inputConfig$meta2 !== void 0 && _inputConfig$meta2.namespace);
+  }, [inputConfig]);
   const ajaxModalValues = useAjaxModal$2({
     name: inputKey,
     user,
-    namespace: inputConfig?.meta?.namespace,
-    skipFetch: inputConfig?.meta?.skipFetch,
+    namespace: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta3 = inputConfig.meta) === null || _inputConfig$meta3 === void 0 ? void 0 : _inputConfig$meta3.namespace,
+    skipFetch: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta4 = inputConfig.meta) === null || _inputConfig$meta4 === void 0 ? void 0 : _inputConfig$meta4.skipFetch,
     isAjaxModal,
-    formScope: inputConfig?.meta?.formScope,
+    formScope: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta5 = inputConfig.meta) === null || _inputConfig$meta5 === void 0 ? void 0 : _inputConfig$meta5.formScope,
     APP: app,
     apiBaseUrl: getApiBaseUrl(),
     _getAppHeader: getAppHeader
   });
-  const dataLinkForm = ajaxModalValues?.form;
+  const dataLinkForm = ajaxModalValues === null || ajaxModalValues === void 0 ? void 0 : ajaxModalValues.form;
   const createInputsAndValues = item => {
     const inputs = {};
     const values = {};
@@ -10009,12 +10023,12 @@ const handleDataLinkGroupWithTableKeys = ({
       'videos': 'Video'
     };
     tableKeys.filter(tableKey => tableKey !== 'datastakeId').forEach(tableKey => {
-      const formInputConfig = dataLinkForm?.[tableKey] || dataLinkForm?.['identification']?.[tableKey];
+      var _dataLinkForm$identif;
+      const formInputConfig = (dataLinkForm === null || dataLinkForm === void 0 ? void 0 : dataLinkForm[tableKey]) || (dataLinkForm === null || dataLinkForm === void 0 || (_dataLinkForm$identif = dataLinkForm['identification']) === null || _dataLinkForm$identif === void 0 ? void 0 : _dataLinkForm$identif[tableKey]);
       if (formInputConfig) {
-        inputs[tableKey] = {
-          ...formInputConfig,
+        inputs[tableKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : formInputConfig.label || formInputConfig.tableLabel || tableKey
-        };
+        });
         if (formInputConfig.label && typeof formInputConfig.label === 'object') {
           const dynamicLabelKeys = Object.keys(formInputConfig.label);
           let resolvedLabel = null;
@@ -10022,7 +10036,7 @@ const handleDataLinkGroupWithTableKeys = ({
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if (item?.[conditionKey] === conditionValue) {
+              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10030,37 +10044,37 @@ const handleDataLinkGroupWithTableKeys = ({
           }
           inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
         }
-        values[tableKey] = item?.[tableKey];
+        values[tableKey] = item === null || item === void 0 ? void 0 : item[tableKey];
       } else {
+        var _item$linking;
         inputs[tableKey] = {
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
-          type: inputConfig?.type
+          type: inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type
         };
-        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item?.[tableKey];
+        values[tableKey] = (item === null || item === void 0 || (_item$linking = item.linking) === null || _item$linking === void 0 || (_item$linking = _item$linking.SCL) === null || _item$linking === void 0 || (_item$linking = _item$linking[item === null || item === void 0 ? void 0 : item[tableKey]]) === null || _item$linking === void 0 ? void 0 : _item$linking.name) || (item === null || item === void 0 ? void 0 : item[tableKey]);
       }
     });
     siblingInputsMatchingTableKeys.forEach(siblingKey => {
       const siblingConfig = config.inputs[siblingKey];
       if (siblingConfig) {
-        inputs[siblingKey] = {
-          ...siblingConfig,
+        inputs[siblingKey] = _objectSpread2(_objectSpread2({}, siblingConfig), {}, {
           label: siblingConfig.label || siblingKey
-        };
-        values[siblingKey] = item?.[siblingKey];
+        });
+        values[siblingKey] = item === null || item === void 0 ? void 0 : item[siblingKey];
       }
     });
-    if (dataLinkForm?.identification && typeof dataLinkForm.identification === 'object') {
+    if (dataLinkForm !== null && dataLinkForm !== void 0 && dataLinkForm.identification && typeof dataLinkForm.identification === 'object') {
       Object.keys(dataLinkForm.identification).filter(fieldKey => fieldKey !== 'datastakeId' && !tableKeys.includes(fieldKey)).filter(fieldKey => {
         const formInputConfig = dataLinkForm.identification[fieldKey];
         return formInputConfig && typeof formInputConfig === 'object' && !Array.isArray(formInputConfig);
       }).forEach(fieldKey => {
+        var _item$linking2;
         const formInputConfig = dataLinkForm.identification[fieldKey];
-        inputs[fieldKey] = {
-          ...formInputConfig,
+        inputs[fieldKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
           label: uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : formInputConfig.label || formInputConfig.tableLabel || fieldKey
-        };
-        if (formInputConfig?.label && typeof formInputConfig?.label === 'object') {
-          const dynamicLabelKeys = Object.keys(formInputConfig?.label);
+        });
+        if (formInputConfig !== null && formInputConfig !== void 0 && formInputConfig.label && typeof (formInputConfig === null || formInputConfig === void 0 ? void 0 : formInputConfig.label) === 'object') {
+          const dynamicLabelKeys = Object.keys(formInputConfig === null || formInputConfig === void 0 ? void 0 : formInputConfig.label);
           let resolvedLabel = null;
           for (const labelKey of dynamicLabelKeys) {
             const parts = labelKey.split(' is ');
@@ -10069,7 +10083,7 @@ const handleDataLinkGroupWithTableKeys = ({
               const flattenedItem = Object.assign({}, item.location, {
                 address: item.address
               });
-              if (flattenedItem?.[conditionKey] === conditionValue) {
+              if ((flattenedItem === null || flattenedItem === void 0 ? void 0 : flattenedItem[conditionKey]) === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10077,7 +10091,7 @@ const handleDataLinkGroupWithTableKeys = ({
           }
           inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
         }
-        values[fieldKey] = item?.linking?.SCL?.[item?.[fieldKey]]?.name || item?.[fieldKey];
+        values[fieldKey] = (item === null || item === void 0 || (_item$linking2 = item.linking) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2.SCL) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2[item === null || item === void 0 ? void 0 : item[fieldKey]]) === null || _item$linking2 === void 0 ? void 0 : _item$linking2.name) || (item === null || item === void 0 ? void 0 : item[fieldKey]);
       });
     }
     return {
@@ -10087,16 +10101,17 @@ const handleDataLinkGroupWithTableKeys = ({
   };
   if (Array.isArray(value)) {
     return value.map((item, itemIndex) => {
+      var _merged$inputKey;
       const merged = mergeObject(item);
-      const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
+      const datastakeIdValue = (merged === null || merged === void 0 || (_merged$inputKey = merged[inputKey]) === null || _merged$inputKey === void 0 ? void 0 : _merged$inputKey.datastakeId) || (merged === null || merged === void 0 ? void 0 : merged.datastakeId);
       const {
         inputs,
         values
       } = createInputsAndValues(merged);
       return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
-        nodeKey: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
+        nodeKey: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
         config: {
-          label: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
+          label: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
           type: 'custom-datalink-group',
           inputs: inputs
         },
@@ -10110,11 +10125,12 @@ const handleDataLinkGroupWithTableKeys = ({
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
         app: app
-      }, `${inputKey}-${itemIndex}`);
+      }, "".concat(inputKey, "-").concat(itemIndex));
     });
   } else {
+    var _merged$inputKey2;
     const merged = mergeObject(value);
-    const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
+    const datastakeIdValue = (merged === null || merged === void 0 || (_merged$inputKey2 = merged[inputKey]) === null || _merged$inputKey2 === void 0 ? void 0 : _merged$inputKey2.datastakeId) || (merged === null || merged === void 0 ? void 0 : merged.datastakeId);
     const {
       inputs,
       values
@@ -10136,7 +10152,7 @@ const handleDataLinkGroupWithTableKeys = ({
       getApiBaseUrl: getApiBaseUrl,
       getAppHeader: getAppHeader,
       app: app
-    }, `${inputKey}-group`);
+    }, "".concat(inputKey, "-group"));
   }
 };
 
@@ -13723,12 +13739,6 @@ function LocationIcon({
       }).addTo(mapRef);
       const div = document.getElementById(markerId);
       root.current = client.createRoot(div);
-      console.log({
-        locationID: data.datastakeId,
-        stakeholder,
-        index,
-        parentId: data.datastakeId
-      });
       root.current.render( /*#__PURE__*/jsxRuntime.jsx(StakeholderIcon$1, {
         data: stakeholder,
         zoom: zoom,
@@ -46290,7 +46300,7 @@ const Container$1 = styled__default["default"].div`
 	width: ${props => props.isPdf ? props.width ? props.width : '1000px' : 'calc(100% - 48px)'}; 
 `;
 
-const _excluded$7 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "isPercentage", "seriesField", "formattedYAxis", "formattedXAxis", "color", "height", "t", "isPdf", "legendConfig", "width"];
+const _excluded$7 = ["data", "xFieldKey", "yFieldKey", "renderTooltipContent", "tooltipConfig", "animated", "isStack", "isGroup", "isPercentage", "seriesField", "formattedYAxis", "formattedXAxis", "color", "height", "t", "isPdf", "legendConfig", "width", "xAxisConfig"];
 const {
   useToken: useToken$g
 } = antd.theme;
@@ -46377,7 +46387,8 @@ function BarChart(_ref) {
       t = s => s,
       isPdf = false,
       legendConfig = {},
-      width
+      width,
+      xAxisConfig = {}
     } = _ref;
     _objectWithoutProperties(_ref, _excluded$7);
   const containerRef = React__default["default"].useRef(null);
@@ -46404,14 +46415,14 @@ function BarChart(_ref) {
       data,
       xField: xFieldKey,
       yField: yFieldKey,
-      xAxis: _objectSpread2(_objectSpread2({}, isPercentage ? {
+      xAxis: _objectSpread2(_objectSpread2(_objectSpread2({}, isPercentage ? {
         tickMethod: () => {
           return Array.from(new Array(11), (v, i) => i * 10);
         }
-      } : {}), {}, {
-        label: {
+      } : {}), xAxisConfig), {}, {
+        label: _objectSpread2({
           formatter: isPercentage ? v => "".concat(v).replace(/\d{1,3}(?=(\d{3})+$)/g, s => "".concat(s, ",")) + " %" : formattedXAxis
-        }
+        }, xAxisConfig === null || xAxisConfig === void 0 ? void 0 : xAxisConfig.label)
       }),
       yAxis: {
         label: {
@@ -46435,7 +46446,7 @@ function BarChart(_ref) {
     } else {
       chartRef.current.update(config);
     }
-  }, [data, xFieldKey, yFieldKey, renderTooltipContent, tooltipConfig, animated, isStack, isGroup, isPercentage, seriesField, formattedYAxis, formattedXAxis, color, token.colorPrimary7]);
+  }, [data, xFieldKey, yFieldKey, renderTooltipContent, tooltipConfig, animated, isStack, isGroup, isPercentage, seriesField, formattedYAxis, formattedXAxis, color, token.colorPrimary7, xAxisConfig]);
   React__default["default"].useEffect(() => {
     return () => {
       if (chartRef.current) {
@@ -49148,7 +49159,6 @@ const BaseGraph = /*#__PURE__*/React.forwardRef(function BaseGraph({
   withDuration = true,
   onFilterChange,
   isPdf,
-  zoomOutTransition = false,
   ...props
 }, ref) {
   const {
@@ -49171,8 +49181,8 @@ const BaseGraph = /*#__PURE__*/React.forwardRef(function BaseGraph({
       fitView({
         padding: 0.4,
         nodes: [...nodesToFit],
-        duration: withDuration ? 300 : undefined,
-        maxZoom: 0.8
+        // duration: withDuration ? 300 : undefined,
+        maxZoom: 0.9
       });
     });
   }, [JSON.stringify(nodesToFit), withDuration]);
@@ -49204,11 +49214,8 @@ const BaseGraph = /*#__PURE__*/React.forwardRef(function BaseGraph({
         fitView: true // zoom out on default
         ,
         fitViewOptions: {
-          padding: 0.2,
-          //zoom out on default
-          ...(zoomOutTransition ? {
-            duration: withDuration ? 300 : undefined
-          } : {})
+          padding: 0.2 //zoom out on default
+          // ...(zoomOutTransition ? { duration: withDuration ? 300 : undefined } : {}),
         },
         ...props,
         children: !isPdf && /*#__PURE__*/jsxRuntime.jsxs(react.Controls, {
@@ -49805,8 +49812,7 @@ function StakeholderMappings(_ref3) {
     iconOffsetY = 250,
     t = s => s,
     emptyString = undefined,
-    isPdf = false,
-    zoomOutTransition = false
+    isPdf = false
   } = _ref3;
   const reactFlowWrapper = React.useRef(null);
   const [nodes, setNodes] = react.useNodesState([]);
@@ -50071,7 +50077,6 @@ function StakeholderMappings(_ref3) {
     });
   }, [reactFlowWrapper.current, JSON.stringify(data), JSON.stringify(selectedIconNodes), isAllOpenDefault, isSelectable, isChanged, emptyString]);
   return /*#__PURE__*/jsxRuntime.jsx(BaseGraph, {
-    zoomOutTransition: zoomOutTransition,
     nodes: nodes,
     mandatoryNodesToFit: mandatoryNodesToFit,
     edges: edges,
@@ -50266,7 +50271,7 @@ function getConfig(data, goTo, t) {
         className: "flex",
         children: [/*#__PURE__*/jsxRuntime.jsx("div", {
           className: "flex-1",
-          children: t(`admin::${item.title}`)
+          children: t(`${item.title}`)
         }), /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "cursor-pointer",
           onClick: () => goTo(item.goToPath),
@@ -50337,6 +50342,8 @@ const getColor = (users, items) => {
 };
 function useConfig(data) {
   const config = React.useMemo(() => {
+    // Ensure data is an array to prevent "data.find is not a function" error
+    const safeData = Array.isArray(data) ? data : [];
     const start = moment__default["default"]().add(-1, "years").format("MMM YY");
     let now = moment__default["default"](start, "MMM YY");
     const _config = [];
@@ -50349,7 +50356,7 @@ function useConfig(data) {
       while (true) {
         DAYS$1.forEach(d => {
           if (d === nowMonth.format("dd") && now.format("MMM YY") === nowMonth.format("MMM YY")) {
-            const users = data.find(d => d._id === nowMonth.format("YYYY-MM-DD"))?.count || 0;
+            const users = safeData.find(d => d._id === nowMonth.format("YYYY-MM-DD"))?.count || 0;
             conf.push({
               date: nowMonth.format("DD MMM YY"),
               active: true,
@@ -50400,6 +50407,9 @@ function UserActivity({
   const {
     isCollapsed
   } = useResizeContext();
+
+  // console.log("userActivityyyyy",data);
+
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     title: t(`admin::user-activity`),
     loading: loading,
@@ -50843,6 +50853,13 @@ function UserStatistics({
   t,
   translationKeys
 }) {
+  // console.log("UserStatistics:loading", loading);
+  // console.log("UserStatistics:loadingUserGrowth", loadingUserGrowth);
+  // console.log("UserStatistics:data", data);
+  // console.log("UserStatistics:userActivityData", data?.userActivityData);
+  // console.log("UserStatistics:topContributorsData", data?.topContributorsData);
+  // console.log("UserStatistics:userGrowthData", data?.userGrowthData);
+
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     title: t(`${translationKeys}-admin::usage-statistics`),
     className: "with-border-header",
@@ -50850,18 +50867,18 @@ function UserStatistics({
       className: "flex flex-column gap-6",
       children: [/*#__PURE__*/jsxRuntime.jsx(UserActivity, {
         loading: loading,
-        data: data.userActivityData,
+        data: data.userActivityData || [],
         t: t
       }), /*#__PURE__*/jsxRuntime.jsxs("div", {
         className: "flex flex-row flex-col-mobile gap-6",
         children: [/*#__PURE__*/jsxRuntime.jsx(TopContributors, {
-          data: data.topContributorsData,
+          data: data.topContributorsData || [],
           loading: loading,
           t: t
         }), /*#__PURE__*/jsxRuntime.jsx(UserGrowth, {
           t: t,
           loading: loadingUserGrowth,
-          data: data.userGrowthData,
+          data: data.userGrowthData || [],
           fetchUserGrowth: fetchUserGrowth,
           translationKeys: translationKeys
         })]
@@ -50879,11 +50896,11 @@ function AdminDashboard(_ref) {
     adminTranslationIdentifier,
     t,
     loadingUserGrowth,
-    fetchUserGrowth = () => {}
+    fetchUserGrowth = () => {},
+    userGrowthData
   } = _ref;
-  const {
-    keyIndicatorsData
-  } = data;
+  const keyIndicatorsCards = Array.isArray(data === null || data === void 0 ? void 0 : data.keyIndicatorsData) ? data.keyIndicatorsData : [];
+  console.log("AdminDashboard:data", data);
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "daf-analysis admin-dashboard",
     children: [/*#__PURE__*/jsxRuntime.jsx(DAFHeader, {
@@ -50897,22 +50914,21 @@ function AdminDashboard(_ref) {
           children: /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: "sections-cont w-pt",
             children: [/*#__PURE__*/jsxRuntime.jsx("section", {
-              children: actionWidgetConfig.map(widgetConfig => {
-                return /*#__PURE__*/jsxRuntime.jsx(ActionWidget, _objectSpread2(_objectSpread2({}, widgetConfig), {}, {
-                  onClick: () => goTo(widgetConfig.goToPath),
-                  title: t("admin::".concat(widgetConfig.title))
-                }), widgetConfig.title);
-              })
+              children: actionWidgetConfig.map(widgetConfig => /*#__PURE__*/jsxRuntime.jsx(ActionWidget, _objectSpread2(_objectSpread2({}, widgetConfig), {}, {
+                onClick: () => goTo(widgetConfig.goToPath),
+                title: t("".concat(widgetConfig.title))
+              }), widgetConfig.title))
             }), /*#__PURE__*/jsxRuntime.jsx("section", {
               children: /*#__PURE__*/jsxRuntime.jsx(KeyIndicatorsWidget, {
-                data: keyIndicatorsData,
+                data: keyIndicatorsCards,
                 loading: loading,
                 goTo: goTo,
                 t: t
               })
             }), /*#__PURE__*/jsxRuntime.jsx("section", {
               children: /*#__PURE__*/jsxRuntime.jsx(UserStatistics, {
-                data: data,
+                data: _objectSpread2({}, data),
+                userGrowthData: userGrowthData,
                 loading: loading,
                 t: t,
                 loadingUserGrowth: loadingUserGrowth,
@@ -55038,45 +55054,34 @@ function AdminDashboardScreen({
     fetchUserGrowth,
     userGrowthDataLoading
   } = useWidgetFetch();
+  console.log({
+    userGrowthData
+  });
   const actionsWidgetsConfig = React.useMemo(() => getActionWidgetsConfig({
     getRedirectLink
-  }), [getRedirectLink]);
+  }), [getRedirectLink, getActionWidgetsConfig]);
   const keyIndicatorsConfig = React.useMemo(() => getKeyIndicatorsConfig({
     getRedirectLink,
-    keyIndicatorsData: data?.keyInformation
-  }), [data?.keyInformation, getRedirectLink]);
-
-  // Dummy data for top contributors if not provided
-  const TOTAL_DUMMY = [{
-    label: "Contributor 1",
-    Score: 0
-  }, {
-    label: "Contributor 2",
-    Score: 0
-  }, {
-    label: "Contributor 3",
-    Score: 0
-  }, {
-    label: "Contributor 4",
-    Score: 0
-  }, {
-    label: "Contributor 5",
-    Score: 0
-  }];
+    keyIndicators: data?.keyIndicators ?? data?.keyInformation
+  }), [data?.keyIndicators, data?.keyInformation, getRedirectLink, getKeyIndicatorsConfig]);
+  const safeUserActivity = Array.isArray(data?.data?.userActivity) ? data.data.userActivity : [];
+  const safeTopContributors = Array.isArray(data?.topContributors) ? data.topContributors : [];
+  const safeUserGrowth = Array.isArray(data?.userGrowthData) ? data.userGrowthData : [];
   return /*#__PURE__*/jsxRuntime.jsx(AdminDashboard, {
     t: t,
-    loading: loading,
     goTo: goTo,
+    loading: loading,
     actionWidgetConfig: actionsWidgetsConfig,
     loadingUserGrowth: userGrowthDataLoading,
     fetchUserGrowth: fetchUserGrowth,
+    adminTranslationIdentifier: appName,
     data: {
       keyIndicatorsData: keyIndicatorsConfig,
-      userActivityData: data?.userActivity,
-      topContributorsData: data?.topContributors || TOTAL_DUMMY,
-      userGrowthData: userGrowthData
-    },
-    adminTranslationIdentifier: appName
+      userActivityData: safeUserActivity,
+      topContributorsData: safeTopContributors,
+      userGrowthData: safeUserGrowth,
+      data: data
+    }
   });
 }
 
@@ -55293,6 +55298,136 @@ function AdminAccountsViewScreen({
   });
 }
 
+function AdminSubjectsScreen({
+  config
+}) {
+  const {
+    appName = "app",
+    module,
+    goTo,
+    t,
+    location,
+    isMobile,
+    getRedirectLink,
+    AdminService,
+    options,
+    handleError,
+    defaultPageSize = 20,
+    view,
+    headerTitle = "subjects",
+    breadcrumbs,
+    refetchTrigger,
+    getData
+  } = config;
+  const handleMergeSubjects = React.useCallback(async mergeData => {
+    try {
+      if (AdminService.mergeSubjects) {
+        await AdminService.mergeSubjects(mergeData);
+        antd.message.success(t("Subjects merged successfully"));
+      } else {
+        console.warn("AdminService.mergeSubjects is not implemented");
+        antd.message.success(t("Subjects merged successfully"));
+      }
+    } catch (err) {
+      handleError?.(err);
+    }
+  }, [AdminService, t, handleError]);
+
+  // Use custom getData if provided, otherwise use default AdminService.getSubjects
+  const getSubjects = React.useCallback(params => {
+    if (getData) {
+      return getData(params);
+    }
+    return AdminService.getSubjects(params);
+  }, [getData, AdminService]);
+  return /*#__PURE__*/jsxRuntime.jsx(SubjectsTable, {
+    t: t,
+    goTo: goTo,
+    getRedirectLink: getRedirectLink,
+    location: location,
+    module: module,
+    headerTitle: headerTitle,
+    getData: getSubjects,
+    isMobile: isMobile,
+    defaultPageSize: defaultPageSize,
+    view: view,
+    breadcrumbs: breadcrumbs,
+    mergeSubjectsFunction: handleMergeSubjects,
+    refetchTrigger: refetchTrigger,
+    config: {
+      options: {
+        category: options?.category,
+        countries: options?.countries
+      }
+    }
+  });
+}
+
+function AdminLocationScreen({
+  config
+}) {
+  const {
+    appName = "app",
+    module,
+    goTo,
+    t,
+    location,
+    isMobile,
+    getRedirectLink,
+    AdminService,
+    options,
+    handleError,
+    defaultPageSize = 20,
+    view,
+    headerTitle = "location",
+    breadcrumbs,
+    refetchTrigger,
+    getData
+  } = config;
+  const handleMergeLocations = React.useCallback(async mergeData => {
+    try {
+      if (AdminService.mergeLocations) {
+        await AdminService.mergeLocations(mergeData);
+        antd.message.success(t("Locations merged successfully"));
+      } else {
+        console.warn("AdminService.mergeLocations is not implemented");
+        antd.message.success(t("Locations merged successfully"));
+      }
+    } catch (err) {
+      handleError?.(err);
+    }
+  }, [AdminService, t, handleError]);
+
+  // Use custom getData if provided, otherwise use default AdminService.getLocations
+  const getLocations = React.useCallback(params => {
+    if (getData) {
+      return getData(params);
+    }
+    return AdminService.getLocations(params);
+  }, [getData, AdminService]);
+  return /*#__PURE__*/jsxRuntime.jsx(LocationTable, {
+    t: t,
+    goTo: goTo,
+    getRedirectLink: getRedirectLink,
+    location: location,
+    module: module,
+    headerTitle: headerTitle,
+    getData: getLocations,
+    isMobile: isMobile,
+    defaultPageSize: defaultPageSize,
+    view: view,
+    breadcrumbs: breadcrumbs,
+    mergeSubjectsFunction: handleMergeLocations,
+    refetchTrigger: refetchTrigger,
+    config: {
+      options: {
+        category: options?.category,
+        countries: options?.countries
+      }
+    }
+  });
+}
+
 function getAdminRoutes(config) {
   const {
     appName,
@@ -55300,11 +55435,11 @@ function getAdminRoutes(config) {
     useAdminUsersConfig,
     useAdminAccountsConfig,
     useAdminAccountsViewConfig,
+    useAdminSubjectsConfig,
+    useAdminLocationConfig,
     userIsAdmin
   } = config;
   const APP_PREFIX = "APP_".concat(appName.toUpperCase());
-
-  // Wrapper components that use the configuration hooks
   function DashboardWrapper() {
     const dashboardConfig = useAdminDashboardConfig();
     return /*#__PURE__*/jsxRuntime.jsx(AdminDashboardScreen, {
@@ -55329,11 +55464,24 @@ function getAdminRoutes(config) {
       config: accountsViewConfig
     });
   }
-  return [{
+  function SubjectsWrapper() {
+    const subjectsConfig = typeof useAdminSubjectsConfig === "function" ? useAdminSubjectsConfig() : undefined;
+    return /*#__PURE__*/jsxRuntime.jsx(AdminSubjectsScreen, {
+      config: subjectsConfig
+    });
+  }
+  function LocationWrapper() {
+    const locationConfig = typeof useAdminLocationConfig === "function" ? useAdminLocationConfig() : undefined;
+    return /*#__PURE__*/jsxRuntime.jsx(AdminLocationScreen, {
+      config: locationConfig
+    });
+  }
+  const subjectsIndexComponent = typeof useAdminLocationConfig === "function" ? /*#__PURE__*/jsxRuntime.jsx(LocationWrapper, {}) : typeof useAdminSubjectsConfig === "function" ? /*#__PURE__*/jsxRuntime.jsx(SubjectsWrapper, {}) : /*#__PURE__*/jsxRuntime.jsx("div", {});
+  const routes = [{
     path: "",
     key: "".concat(APP_PREFIX, "_DASHBOARD"),
     exact: true,
-    visible: () => true,
+    visible: user => userIsAdmin(user),
     component: /*#__PURE__*/jsxRuntime.jsx(DashboardWrapper, {})
   }, {
     path: "accounts",
@@ -55353,7 +55501,26 @@ function getAdminRoutes(config) {
     exact: true,
     visible: user => userIsAdmin(user),
     component: /*#__PURE__*/jsxRuntime.jsx(AccountsViewWrapper, {})
-  }];
+  }, {
+    path: "subjects",
+    key: "".concat(APP_PREFIX, "_SUBJECTS_INDEX"),
+    exact: true,
+    visible: user => userIsAdmin(user),
+    component: subjectsIndexComponent
+  }, ...(typeof useAdminLocationConfig === "function" ? [{
+    path: "subjects/location",
+    key: "".concat(APP_PREFIX, "_ADMIN_SUBJECTS_LOCATIONS"),
+    exact: true,
+    visible: user => userIsAdmin(user),
+    component: /*#__PURE__*/jsxRuntime.jsx(LocationWrapper, {})
+  }] : []), ...(typeof useAdminSubjectsConfig === "function" ? [{
+    path: "subjects/stakeholder",
+    key: "".concat(APP_PREFIX, "_ADMIN_SUBJECTS_STAKEHOLDERS"),
+    exact: true,
+    visible: user => userIsAdmin(user),
+    component: /*#__PURE__*/jsxRuntime.jsx(SubjectsWrapper, {})
+  }] : [])];
+  return routes;
 }
 
 const isUnderDevelopmentType = backgroundType => {
@@ -61581,6 +61748,8 @@ exports.AdminAccountsScreen = AdminAccountsScreen;
 exports.AdminAccountsViewScreen = AdminAccountsViewScreen;
 exports.AdminDashboard = AdminDashboard;
 exports.AdminDashboardScreen = AdminDashboardScreen;
+exports.AdminLocationScreen = AdminLocationScreen;
+exports.AdminSubjectsScreen = AdminSubjectsScreen;
 exports.AdminUsersScreen = AdminUsersScreen;
 exports.AdminView = AdminView$1;
 exports.AjaxSelect = AjaxSelectMain;