datastake-daf 0.6.834 → 0.6.837

package/dist/pages/index.js

@@ -7476,14 +7476,13 @@ class DashboardService extends BaseService {
       isUserManager: true
     });
   }
-
-  // getWidgetConflictManagement({ url, params = {}, filters = {} }) {
-  //   return this.apiGet({
-  //     url: `/dashboard/conflict-management${url}`,
-  //     params: { ...params, ...filters },
-  //     isApp: true,
-  //   });
-  // }
+  getWidgetConflictManagement(url, params, basepath = "dashboard/conflict-management") {
+    return this.apiGet({
+      url: `/${basepath}${url}`,
+      params,
+      isApp: true
+    });
+  }
 }
 var DashboardService$1 = createLazyService(DashboardService);
 
@@ -7495,7 +7494,7 @@ var DashboardService$1 = createLazyService(DashboardService);
 //     basePath: string,
 // }
 
-const useWidgetFetch$1 = ({
+const useWidgetFetch = ({
   config,
   getData = DashboardService$1.getWidget,
   onFetch = () => {}
@@ -7575,7 +7574,7 @@ const getRowConfig$2 = ({
     t: t,
     getRedirectLink: getRedirectLink,
     theme: theme,
-    label: "Identified Mine Sites",
+    label: t("Identified Mine Sites"),
     link: APP === 'nashiriki' ? '/app/scl' : '/app/production-sites'
   }),
   render: () => {
@@ -7588,7 +7587,7 @@ const getRowConfig$2 = ({
     t: t,
     getRedirectLink: getRedirectLink,
     theme: theme,
-    label: "Identified Operators",
+    label: t("Identified Operators"),
     link: "/app/operators"
   }),
   render: () => /*#__PURE__*/jsxRuntime.jsx("span", {
@@ -7610,7 +7609,7 @@ const getRowConfig$2 = ({
     t: t,
     getRedirectLink: getRedirectLink,
     theme: theme,
-    label: "Associated Documents",
+    label: t("Associated Documents"),
     link: "/app/documents"
   }),
   render: () => /*#__PURE__*/jsxRuntime.jsx("span", {
@@ -7621,7 +7620,7 @@ const getRowConfig$2 = ({
     t: t,
     getRedirectLink: getRedirectLink,
     theme: theme,
-    label: "Information Sources",
+    label: t("Information Sources"),
     link: "/app/partners"
   }),
   render: () => /*#__PURE__*/jsxRuntime.jsx("span", {
@@ -8197,7 +8196,7 @@ function KeyIndicators$2({
   const {
     data,
     loading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: fetchConfig
   });
   const config = React.useMemo(() => {
@@ -11304,7 +11303,7 @@ function SupplyChainMap({
   const {
     loading,
     data
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig
   });
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
@@ -13807,7 +13806,7 @@ function GenderDistribution$1({
       return renderTooltipJsx({
         title: t("Role"),
         items: [{
-          label: options?.optionPositionSupplyChain?.find(o => {
+          label: (options?.optionPositionSupplyChain || options?.positionSupplyChainOptions || [])?.find(o => {
             return o.value === item.key;
           }).label || item.key,
           value: data[item.key] || 0
@@ -13897,7 +13896,7 @@ function ChartsContainer({
   const {
     loading,
     data
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     onFetch: () => setPreviousRange(selectedRange)
   });
@@ -14196,7 +14195,7 @@ function KeyIndicators$1({
   const {
     data,
     loading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: fetchConfig
   });
   const config = React.useMemo(() => getRowConfig$1({
@@ -14433,7 +14432,7 @@ function MineSites$1({
   const {
     data: _formData,
     loading: formLoading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: _formFetchConfig
   });
   React.useEffect(() => {
@@ -14462,7 +14461,7 @@ function MineSites$1({
     data,
     loading,
     setData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: dataFetchConfig
   });
   const tabs = React.useMemo(() => getTabs(t), [t]);
@@ -14840,7 +14839,7 @@ function AccumulationGraph({
   const {
     data,
     loading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: fetchConfig
   });
   const selectOptions = React.useMemo(() => [{
@@ -15188,7 +15187,7 @@ function ContributionsGraph({
   const {
     data,
     loading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: fetchConfig
   });
   const chartConfig = useContributionsGraph({
@@ -15318,7 +15317,7 @@ function Triangulation({
   const {
     data: widgetData,
     loading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: fetchConfig
   });
   const {
@@ -15479,7 +15478,7 @@ function DataChainOfCustody({
   const {
     data,
     loading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: fetchConfig
   });
   const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options, goTo);
@@ -17102,7 +17101,7 @@ function AssociatedInformation$1({
   const {
     data,
     loading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig
   });
   console.log({
@@ -41046,21 +41045,20 @@ const Create = ({
     form: formConfig,
     data: formValue
   };
+  const language = React.useMemo(() => user?.language, [user?.language]);
   React.useEffect(() => {
-    if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
-      if (!edit) {
-        getData({
-          namespace,
-          module: APP,
-          view,
-          scope
-        });
-      } else {
-        form = formConfig;
-        data = formValue;
-      }
+    if (!edit) {
+      getData({
+        namespace,
+        module: APP,
+        view,
+        scope
+      });
+    } else {
+      form = formConfig;
+      data = formValue;
     }
-  }, [edit, user?.language, scope]);
+  }, [edit, language, scope, namespace, APP, view]);
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: "daf-create-form",
     children: /*#__PURE__*/jsxRuntime.jsx(DynamicForm, {
@@ -41707,7 +41705,7 @@ const getColumns$e = ({
         className: "daf-default-cell"
       });
     }
-    const positionSupplyChainOptions = [...(data?.options?.positionSupplyChainOptions || []), ...(options?.positionSupplyChainOptions || []), ...(options?.optionPositionSupplyChain || [])];
+    const positionSupplyChainOptions = [...(options?.positionSupplyChainOptions || []), ...(options?.optionPositionSupplyChain || [])];
     const country = findOptions(v, positionSupplyChainOptions);
     return country ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: country,
@@ -41727,7 +41725,7 @@ const getColumns$e = ({
         className: "daf-default-cell"
       });
     }
-    const subCategoriesOptions = [...(data?.options?.subCategoriesOptions || []), ...(options?.subCategoriesOptions || []), ...(options?.subCategory || [])];
+    const subCategoriesOptions = [...(options?.subCategoriesOptions || []), ...(options?.subCategory || [])];
     const subCategory = findOptions(v, subCategoriesOptions);
     return subCategory ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: subCategory,
@@ -42100,8 +42098,6 @@ const getColumns$d = ({
         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,
@@ -42119,7 +42115,7 @@ const getColumns$d = ({
         className: "daf-default-cell"
       });
     }
-    const activityAtSiteOptions = [...(data?.options?.activityAtSiteOptions || []), ...(options?.activityAtSiteOptions || []), ...(options?.activityAtSite || [])];
+    const activityAtSiteOptions = [...(options?.activityAtSiteOptions || []), ...(options?.activityAtSite || [])];
     const activity = findOptions(v, activityAtSiteOptions);
     return activity ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: activity,
@@ -42858,14 +42854,14 @@ const getColumns$b = ({
       if (all.navigationEventType === "other") {
         return "-";
       }
-      const categoryOptions = (data?.options?.categoryOptions || []).map(c => {
+      const categoryOptions = (options?.categoryOptions || []).map(c => {
         const searchTerm = `typeOfEvent is ${all.navigationEventType}`;
         return {
           value: c.value,
           label: c.label[searchTerm]
         };
       });
-      const relaxantOptions = [...categoryOptions, ...(data?.options?.eventsType || []), ...(data?.options?.testimonialsType || [])];
+      const relaxantOptions = [...categoryOptions, ...(options?.eventsType || []), ...(options?.testimonialsType || [])];
       const title = relaxantOptions.find(v => v.value === value)?.label || "-";
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: title,
@@ -43280,8 +43276,6 @@ const getColumns$a = ({
         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,
@@ -43337,7 +43331,7 @@ const getColumns$a = ({
       "corrective-actions": "correctiveActions",
       "activities": "activity"
     };
-    const eventCategory = findOptions(v, data?.options?.eventCategoryOptions || data?.options?.categoryOptions);
+    const eventCategory = findOptions(v, options?.eventCategoryOptions || options?.categoryOptions);
     const categoryValue = getEventCategoryBySubject(eventCategory, subjectMap[subject], true);
     return categoryValue ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: categoryValue,
@@ -43712,8 +43706,6 @@ const getColumns$9 = ({
         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,
@@ -43765,7 +43757,7 @@ const getColumns$9 = ({
         className: "daf-default-cell"
       });
     }
-    const eventCategory = findOptions(v, data?.options?.eventCategoryOptions || data?.options?.categoryOptions);
+    const eventCategory = findOptions(v, options?.eventCategoryOptions || options?.categoryOptions);
     const categoryValue = getEventCategoryBySubject(eventCategory, subject);
     return categoryValue ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: categoryValue,
@@ -44160,8 +44152,6 @@ const getColumns$8 = ({
         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,
@@ -44179,7 +44169,7 @@ const getColumns$8 = ({
         className: "daf-default-cell"
       });
     }
-    const eventCategory = findOptions(v, data?.options?.eventCategoryOptions || data?.options?.categoryOptions);
+    const eventCategory = findOptions(v, options?.eventCategoryOptions || options?.categoryOptions);
     const categoryValue = getEventCategoryBySubject(eventCategory, subject);
     return categoryValue ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: categoryValue,
@@ -44794,7 +44784,7 @@ const getColumns$6 = ({
         className: "daf-default-cell"
       });
     }
-    const locationCategories = [...(data?.options?.locationCategories || []), ...(options?.productionSiteCategories || []), ...(options?.locationCategories || [])];
+    const locationCategories = [...(options?.locationCategories || []), ...(options?.productionSiteCategories || []), ...(options?.locationCategories || [])];
     const category = findOptions(v, locationCategories);
     return category ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: category,
@@ -45689,12 +45679,6 @@ const TablePage = ({
   breadcrumbs = [],
   onDownload
 }) => {
-  const _options = React.useMemo(() => {
-    return {
-      ...options,
-      ...data?.options
-    };
-  }, [options, data?.options]);
   const {
     activeTab,
     selectOptions,
@@ -45710,7 +45694,7 @@ const TablePage = ({
     location,
     getData,
     extendingFilters,
-    options: _options,
+    options,
     t,
     goTo,
     user,
@@ -46035,6 +46019,11 @@ const getKeyIndicatorConfig = ({
   label: t("Legal Form"),
   render: () => {
     const subCategory = findOptions(data?.subCategory, options?.subCategoriesOptions || options?.subCategory);
+    console.log({
+      subCategory,
+      initialSub: data?.subCategory,
+      options: options?.subCategoriesOptions || options?.subCategory
+    });
     if (subCategory?.length > 22) {
       const _subCategory = truncateString(subCategory, 22);
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
@@ -46415,7 +46404,7 @@ const InformationAvailability = ({
   const {
     data,
     loading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultFetchConfig
   });
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
@@ -46633,7 +46622,7 @@ const useTradeRelationship = ({
   }), [id, filters?.products, selectedPartners?.partners, selectedPartners?.loading]);
   const {
     data
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: config
   });
   const mapItem$1 = data => {
@@ -47665,7 +47654,7 @@ const Governance = ({
   const {
     data,
     loading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultFetchConfig
   });
   const graphData = React.useMemo(() => {
@@ -55554,7 +55543,7 @@ const PlantingLocations = ({
   const {
     loading: plantingLocationsLoading,
     data: plantingLocationsData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     getData: customGetData
   });
@@ -56252,7 +56241,7 @@ const CycleOutcomes = ({
   const {
     loading: dataDetailsLoading,
     data: dataDetails
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     getData: customGetData
   });
@@ -56640,7 +56629,7 @@ const HealthAndSafety = ({
   const {
     loading: pieChartLoading,
     data: pieChartData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     getData: customGetData
   });
@@ -56769,7 +56758,7 @@ const CycleIndicators = ({
   const {
     loading: indicatorsLoading,
     data: indicatorsData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     getData: customGetData
   });
@@ -57278,7 +57267,7 @@ const CommunityParticipation = ({
   const {
     loading: communityParticipationLoading,
     data: communityParticipationData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     getData: customGetData
   });
@@ -57999,7 +57988,7 @@ const AssociatedInformation = ({
     loading: associatedInformationLoading,
     data: associatedInformationData,
     setData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     getData: customGetData
   });
@@ -58133,7 +58122,7 @@ const KeyInformation$1 = ({
   const {
     loading: keyInformationLoading,
     data: keyInformationData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     getData: customGetData
   });
@@ -58283,7 +58272,7 @@ const KeyInformation = ({
   const {
     loading: keyInformationLoading,
     data: keyInformationData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     getData: customGetData
   });
@@ -58340,7 +58329,7 @@ const MonitoringScopeAndFindings = ({
   const {
     loading: monitoringScopeLoading,
     data: monitoringScopeData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     getData: customGetData
   });
@@ -59128,7 +59117,7 @@ const MangroveGrowth = ({
   const {
     loading: outcomesLoading,
     data: outcomesData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     getData: customGetData
   });
@@ -59408,7 +59397,7 @@ const BiodiversityHabitat = ({
   const {
     loading: outcomesLoading,
     data: outcomesData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     getData: customGetData
   });
@@ -59800,7 +59789,7 @@ const SoilWaterProfile = ({
   const {
     loading: outcomesLoading,
     data: outcomesData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultConfig,
     getData: customGetData
   });
@@ -60038,7 +60027,7 @@ const StakeholderMapping = ({
   const {
     data,
     loading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultFilter
   });
   const graphData = React.useMemo(() => {
@@ -60204,7 +60193,7 @@ const MineDetailsSection = ({
   const {
     data,
     loading: loadingData
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultFetchConfig
   });
   return /*#__PURE__*/jsxRuntime.jsxs("section", {
@@ -63557,7 +63546,7 @@ const getRowConfig = ({
       children: t("Reported Incidents")
     }), /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "cursor-pointer",
-      onClick: () => goTo(getRedirectLink("/app/incident")),
+      onClick: () => goTo(getRedirectLink("/app/incidents")),
       children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
         name: "LinkNewTab",
         width: 16,
@@ -63654,7 +63643,7 @@ function KeyIndicators({
   const {
     data,
     loading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: fetchConfig
   });
   const config = React.useMemo(() => getRowConfig({
@@ -63721,7 +63710,7 @@ function MineSites({
   const {
     data,
     loading
-  } = useWidgetFetch$1({
+  } = useWidgetFetch({
     config: defaultFetchConfig
   });
   // const { user } = useSelector((state) => state.authentication);
@@ -63876,19 +63865,195 @@ function MineSites({
   });
 }
 
+var isoWeek = createCommonjsModule(function (module, exports) {
+!function(e,t){module.exports=t();}(commonjsGlobal,(function(){var e="day";return function(t,i,s){var a=function(t){return t.add(4-t.isoWeekday(),e)},d=i.prototype;d.isoWeekYear=function(){return a(this).year()},d.isoWeek=function(t){if(!this.$utils().u(t))return this.add(7*(t-this.isoWeek()),e);var i,d,n,o,r=a(this),u=(i=this.isoWeekYear(),d=this.$u,n=(d?s.utc:s)().year(i).startOf("year"),o=4-n.isoWeekday(),n.isoWeekday()>4&&(o+=7),n.add(o,e));return r.diff(u,"week")+1},d.isoWeekday=function(e){return this.$utils().u(e)?this.day()||7:this.day(this.day()%7?e:e-7)};var n=d.startOf;d.startOf=function(e,t){var i=this.$utils(),s=!!i.u(t)||t;return "isoweek"===i.p(e)?s?this.date(this.date()-(this.isoWeekday()-1)).startOf("day"):this.date(this.date()-1-(this.isoWeekday()-1)+7).endOf("day"):n.bind(this)(e,t)};}}));
+});
+
+dayjs__default["default"].extend(isoWeek);
+function useTimelineBase({
+  language,
+  selectedRange
+}) {
+  const locale = React.useMemo(() => language === "sp" ? "es" : language || "en", [language]);
+  const baseMonths = React.useMemo(() => {
+    if (selectedRange === "12") {
+      const y = dayjs__default["default"]().year();
+      const arr = [];
+      for (let i = 0; i < 12; i++) {
+        const d = dayjs__default["default"]().year(y).month(i);
+        arr.push({
+          key: d.format("YYYY-MM"),
+          label: d.locale(locale).format("MMM YYYY"),
+          date: d.toISOString()
+        });
+      }
+      return arr;
+    }
+    if (selectedRange === "3") {
+      const end = dayjs__default["default"]().endOf("month");
+      const start = end.subtract(2, "month").startOf("month");
+      const diff = end.diff(start, "month");
+      const arr = [];
+      for (let i = 0; i <= diff; i++) {
+        const d = start.add(i, "month");
+        arr.push({
+          key: d.format("YYYY-MM"),
+          label: d.locale(locale).format("MMM YYYY"),
+          date: d.toISOString()
+        });
+      }
+      return arr;
+    }
+    return [];
+  }, [locale, selectedRange]);
+  const baseWeeks = React.useMemo(() => {
+    if (selectedRange !== "3") return [];
+    const end = dayjs__default["default"]().endOf("week");
+    const start = end.subtract(12, "week");
+    const diff = end.diff(start, "week");
+    const arr = [];
+    for (let i = 0; i <= diff; i++) {
+      const d = start.add(i, "week");
+      arr.push({
+        key: d.format("GGGG-[W]WW"),
+        label: d.format("[W]WW"),
+        date: d.toISOString()
+      });
+    }
+    return arr;
+  }, [selectedRange]);
+  const severityOrder = ["minor", "moderate", "major"];
+  const mergeWithData = React.useCallback((backendData = []) => {
+    let events = [];
+    if (Array.isArray(backendData)) {
+      backendData.forEach(entry => {
+        if (!entry) return;
+        if (typeof entry === "object" && !Array.isArray(entry)) {
+          Object.values(entry).forEach(arr => {
+            if (Array.isArray(arr)) events.push(...arr);
+          });
+        } else if (Array.isArray(entry)) {
+          events.push(...entry);
+        }
+      });
+    } else if (backendData && typeof backendData === "object") {
+      Object.values(backendData).forEach(arr => {
+        if (Array.isArray(arr)) events.push(...arr);
+      });
+    }
+    if (selectedRange === "12") {
+      const monthBuckets = baseMonths.reduce((acc, m) => {
+        acc[m.key] = [];
+        return acc;
+      }, {});
+      events.forEach(ev => {
+        const d = dayjs__default["default"](ev.date);
+        const key = d.format("YYYY-MM");
+        if (monthBuckets[key]) monthBuckets[key].push(ev);
+      });
+      const res = [];
+      baseMonths.forEach(m => {
+        const arr = monthBuckets[m.key];
+        if (!arr.length) {
+          res.push({
+            label: m.label,
+            key: m.key,
+            severity: "placeholder",
+            category: "placeholder",
+            value: 1,
+            isPlaceholder: true
+          });
+          return;
+        }
+        arr.sort((a, b) => severityOrder.indexOf(a.severity) - severityOrder.indexOf(b.severity)).forEach((ev, idx) => {
+          const source = Array.isArray(ev.source) ? ev.source.join(", ") : ev.source;
+          res.push({
+            ...ev,
+            source,
+            label: m.label,
+            key: m.key,
+            indexInGroup: idx + 1,
+            severity: ev.severity || "undetermined",
+            category: ev.severity || "undetermined",
+            value: 1
+          });
+        });
+      });
+      return res;
+    }
+    if (selectedRange === "3") {
+      const weekBuckets = baseWeeks.reduce((acc, w) => {
+        acc[w.key] = [];
+        return acc;
+      }, {});
+      events.forEach(ev => {
+        const d = dayjs__default["default"](ev.date);
+        const key = d.format("GGGG-[W]WW");
+        if (weekBuckets[key]) weekBuckets[key].push(ev);
+      });
+      const res = [];
+      baseWeeks.forEach(w => {
+        const arr = weekBuckets[w.key];
+        if (!arr.length) {
+          res.push({
+            label: w.label,
+            key: w.key,
+            severity: "placeholder",
+            category: "placeholder",
+            value: 1,
+            isPlaceholder: true
+          });
+          return;
+        }
+        arr.sort((a, b) => severityOrder.indexOf(a.severity) - severityOrder.indexOf(b.severity)).forEach((ev, idx) => {
+          const source = Array.isArray(ev.source) ? ev.source.join(", ") : ev.source;
+          res.push({
+            ...ev,
+            source,
+            label: w.label,
+            key: w.key,
+            indexInGroup: idx + 1,
+            severity: ev.severity || "undetermined",
+            category: ev.severity || "undetermined",
+            value: 1
+          });
+        });
+      });
+      return res;
+    }
+    return [];
+  }, [selectedRange, baseMonths, baseWeeks]);
+  return {
+    baseMonths,
+    baseWeeks,
+    mergeWithData
+  };
+}
+
 function useIncidentsTimeline({
-  t = () => {},
-  options = {}
+  t,
+  language,
+  severityOptions = [],
+  selectedRange = "12"
 }) {
   const [filters, setFilters] = React.useState({
     severity: "all"
   });
+  const {
+    baseMonths,
+    baseWeeks,
+    mergeWithData
+  } = useTimelineBase({
+    language,
+    selectedRange
+  });
   const filtersConfig = React.useMemo(() => ({
+    language,
     filtersConfig: {
       severity: {
         type: "select",
         label: "",
-        placeholder: t => t(""),
+        placeholder: tFn => tFn(""),
         style: {
           flex: 1
         },
@@ -63902,44 +64067,54 @@ function useIncidentsTimeline({
       severity: [{
         value: "all",
         label: t("All")
-      }, ...(options?.severityOptions || [])]
+      }, ...(severityOptions || [])]
     },
     selectedFilters: filters,
     type: "small",
     t
-  }), [t, filters, options?.severityOptions]);
+  }), [t, language, filters, severityOptions]);
   return {
     filters,
-    filtersConfig
+    filtersConfig,
+    setFilters,
+    baseMonths,
+    baseWeeks,
+    mergeWithData
   };
 }
 
-function IncidentsTime({
+function IncidentsTimeline({
   selectedRange,
   selectedPartners = {},
-  t = () => {},
-  goTo = s => s,
-  getRedirectLink = s => s,
-  theme = {},
-  APP,
-  options = {}
+  t,
+  language,
+  goTo,
+  user,
+  options
 }) {
   const {
     filters,
-    filtersConfig
+    filtersConfig,
+    mergeWithData,
+    baseMonths,
+    baseWeeks
   } = useIncidentsTimeline({
     t,
-    options
+    language,
+    severityOptions: options?.severityOptions || [],
+    selectedRange
   });
-  const {
-    user
-  } = useSelector(state => state.authentication);
-  React.useCallback(sourceId => {
-    if (user?.company?.id !== sourceId) {
-      return `?sourceId=${sourceId}`;
-    }
+  const getSourceParam = React.useCallback(sourceId => {
+    if (user?.company?.id !== sourceId) return `?sourceId=${sourceId}`;
     return "";
   }, [user?.company?.id]);
+  const severityColors = React.useMemo(() => ({
+    major: "#cf1322",
+    minor: "#fadb14",
+    moderate: "#fa8c16",
+    undetermined: "#999999",
+    placeholder: "transparent"
+  }), []);
   const defaultFetchConfig = React.useMemo(() => ({
     url: `/incidents-timeline`,
     filters: {
@@ -63951,67 +64126,99 @@ function IncidentsTime({
     defaultData: [],
     stop: selectedPartners?.loading
   }), [filters, selectedRange, selectedPartners]);
-  const chartConfig = {};
+  const getIncidentsTimelineData = React.useCallback(({
+    url,
+    filters
+  }) => DashboardService$1.getWidgetConflictManagement(url, filters), []);
   const {
     data,
     loading
-  } = useWidgetFetch(defaultFetchConfig);
+  } = useWidgetFetch({
+    config: defaultFetchConfig,
+    getData: getIncidentsTimelineData
+  });
+  const renderSeverity = val => {
+    if (val === "major") return /*#__PURE__*/jsxRuntime.jsx("span", {
+      style: {
+        color: severityColors.major
+      },
+      children: t("Major")
+    });
+    if (val === "minor") return /*#__PURE__*/jsxRuntime.jsx("span", {
+      style: {
+        color: severityColors.minor
+      },
+      children: t("Minor")
+    });
+    if (val === "moderate") return /*#__PURE__*/jsxRuntime.jsx("span", {
+      style: {
+        color: severityColors.moderate
+      },
+      children: t("Moderate")
+    });
+    return /*#__PURE__*/jsxRuntime.jsx("span", {
+      children: t("Undetermined")
+    });
+  };
+  const chartData = React.useMemo(() => mergeWithData(data), [data, mergeWithData]);
+  const categories = React.useMemo(() => {
+    if (selectedRange === "12") return baseMonths.map(m => m.label);
+    return baseWeeks.map(w => w.label);
+  }, [selectedRange, baseMonths, baseWeeks]);
+  const getTooltipContent = React.useCallback(({
+    item
+  }) => {
+    if (!item) return {
+      title: "",
+      items: []
+    };
+    return {
+      title: item.name || item.label || t("Undetermined"),
+      subTitle: renderDateFormatted(item.date, "DD MMM YYYY"),
+      link: true,
+      onClickLink: () => {
+        goTo(`/app/view/incidents/${item.datastakeId}/identification${getSourceParam(item?.sourceId)}`);
+      },
+      items: [{
+        label: t("nashiriki::Source"),
+        value: item?.source || "--"
+      }, item.severity ? {
+        label: t("Severity"),
+        value: renderSeverity(item.severity)
+      } : null].filter(Boolean)
+    };
+  }, [t, goTo, getSourceParam, renderSeverity]);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     loading: loading,
     filtersConfig: filtersConfig,
-    title: t("Incidents Timeline"),
+    title: t("nashiriki::Incidents Timeline"),
     className: "with-border-header",
-    t: t,
-    children: /*#__PURE__*/jsxRuntime.jsx(StackChart, {
-      ...chartConfig,
-      height: "400px",
-      t: t
+    children: /*#__PURE__*/jsxRuntime.jsx("div", {
+      className: "mb-4 flex-1 flex flex-column justify-content-center",
+      children: /*#__PURE__*/jsxRuntime.jsx(StackChart, {
+        data: chartData,
+        xFieldKey: "label",
+        categories: categories,
+        seriesField: "severity",
+        colors: severityColors,
+        doConstraints: false,
+        renderTooltip: getTooltipContent
+      })
     })
   });
 }
-IncidentsTime.propTypes = {
+IncidentsTimeline.propTypes = {
   selectedRange: PropTypes__default["default"].string,
   selectedPartners: PropTypes__default["default"].object,
-  t: PropTypes__default["default"].func,
-  goTo: PropTypes__default["default"].func,
-  getRedirectLink: PropTypes__default["default"].func,
-  theme: PropTypes__default["default"].object,
-  APP: PropTypes__default["default"].string,
-  options: PropTypes__default["default"].object
+  t: PropTypes__default["default"].func.isRequired,
+  language: PropTypes__default["default"].string,
+  goTo: PropTypes__default["default"].func.isRequired,
+  user: PropTypes__default["default"].object,
+  options: PropTypes__default["default"].shape({
+    severityOptions: PropTypes__default["default"].array
+  })
 };
 
-function useTerritorialDistribution({
-  t = s => {
-  },
-  options = {}
-}) {
-  const [filters, setFilters] = React.useState({
-    filter1: 'all',
-    filter2: 'all'
-  });
-  const filtersConfig = React.useMemo(t => ({
-    onApply: val => setFilters(val),
-    options: {
-      filter1: [{
-        label: t('All'),
-        value: 'all'
-      }],
-      filter2: [{
-        label: t('All'),
-        value: 'all'
-      }]
-    },
-    selectedFilters: filters,
-    type: 'small',
-    t
-  }), [t, filters]);
-  return {
-    filters,
-    filtersConfig,
-    setFilters,
-    t
-  };
-}
 const getColors = theme => {
   return [theme.colorPrimary8, theme.colorPrimary7, theme.colorPrimary5, theme.colorPrimary6, theme.colorPrimary4];
 };
@@ -64026,29 +64233,31 @@ function TerritorialDistribution({
   goTo = () => {},
   getRedirectLink = () => {}
 }) {
-  const {
-    filters,
-    filtersConfig
-  } = useTerritorialDistribution({
-    t
-  });
   const colors = getColors(theme);
   const defaultFetchConfig = React.useMemo(() => ({
     url: "/territorial-distribution",
+    basepath: "dashboard/conflict-management",
     filters: {
-      ...filters,
       category,
       period: selectedRange,
       sources: selectedPartners?.partners || []
     },
-    defaultData: [],
+    defaultData: {},
     stop: selectedPartners?.loading
-  }), [filters, category, selectedRange, selectedPartners]);
+  }), [category, selectedRange, selectedPartners]);
+  const getData = React.useCallback(({
+    url,
+    filters,
+    basepath
+  }) => {
+    return DashboardService$1.getWidgetConflictManagement(url, filters, basepath);
+  }, []);
   const {
     data,
     loading
-  } = useWidgetFetch$1({
-    config: defaultFetchConfig
+  } = useWidgetFetch({
+    config: defaultFetchConfig,
+    getData
   });
   const pieData = React.useMemo(() => {
     if (!data || Array.isArray(data)) return [];
@@ -64067,13 +64276,13 @@ function TerritorialDistribution({
   }, [data, colors]);
   const isEmpty = !pieData.length;
   const getTooltipChildren = React.useCallback(items => {
-    const item = items[0];
+    const item = Array.isArray(items) ? items[0] : items;
     return renderTooltipJsx({
       title: item?.label || t("Undetermined"),
       link: true,
       onClickLink: () => {
         if (item?.label) {
-          goTo(`/app/incident?administrativeLevel1=${item?.locationData?.administrativeLevel1}&administrativeLevel2=${item?.locationData?.administrativeLevel2}&country=${item?.locationData?.country}`);
+          goTo(`/app/incidents?administrativeLevel1=${item?.locationData?.administrativeLevel1}&administrativeLevel2=${item?.locationData?.administrativeLevel2}&country=${item?.locationData?.country}`);
         } else {
           goTo("/app/incident");
         }
@@ -64088,7 +64297,6 @@ function TerritorialDistribution({
     loading: loading || parentLoading,
     title: t("Territorial Distribution"),
     className: "with-border-header",
-    filtersConfig: filtersConfig,
     children: /*#__PURE__*/jsxRuntime.jsx(Chart, {
       mouseXOffset: 10,
       mouseYOffset: 10,
@@ -64111,7 +64319,9 @@ TerritorialDistribution.propTypes = {
   selectedRange: PropTypes__default["default"].string
 };
 
-function useProblemSolvers(t = () => {}) {
+function useProblemSolvers({
+  t = () => {}
+} = {}) {
   const [filters, setFilters] = React.useState({
     administrativeLevel1: "all"
   });
@@ -64121,25 +64331,25 @@ function useProblemSolvers(t = () => {}) {
       try {
         const {
           data
-        } = await DashboardService$1.getWidget({
-          url: "/problem-solvers"
-        });
-        const rawOptions = Object.keys(data).map(agentKey => {
-          const actions = data[agentKey]?.actions || [];
+        } = await DashboardService$1.getWidgetConflictManagement("/problem-solvers", {}, "dashboard/conflict-management");
+        const all = Object.keys(data);
+        const options = all.map(key => {
+          const actions = data[key].actions;
           return actions.map(action => {
-            const lvl1 = action?.location?.administrativeLevel1;
-            const name = action?.location?.name || action?.location?.administrativeLevel1 || null;
-            if (!lvl1 || !name) return undefined;
+            if (action.location === undefined) {
+              return;
+            }
+            const administrativeLevel1 = action?.location?.administrativeLevel1;
+            const name = action?.location?.linking?.SCL?.[administrativeLevel1]?.name;
             return {
               label: name,
-              value: lvl1
+              value: administrativeLevel1
             };
-          }).filter(Boolean);
-        }).flat();
-        const unique = [...new Map(rawOptions.map(item => [item.value, item])).values()];
-        setFilterOptions(unique);
+          });
+        }).flat().filter(item => item !== undefined);
+        setFilterOptions(options);
       } catch (err) {
-        console.error("Problem Solvers fetch failed:", err);
+        console.log(err);
       }
     }
     fetchOptions();
@@ -64188,10 +64398,12 @@ function ProblemSolvers({
   const {
     filters,
     filtersConfig
-  } = useProblemSolvers();
+  } = useProblemSolvers({
+    t
+  });
   const defaultFetchConfig = React.useMemo(() => ({
-    basepath: "conflict-management",
     url: "/problem-solvers",
+    basepath: "dashboard/conflict-management",
     filters: {
       ...filters,
       period: selectedRange,
@@ -64200,11 +64412,19 @@ function ProblemSolvers({
     defaultData: [],
     stop: selectedPartners?.loading
   }), [filters, selectedRange, selectedPartners]);
+  const getData = React.useCallback(({
+    url,
+    filters,
+    basepath
+  }) => {
+    return DashboardService$1.getWidgetConflictManagement(url, filters, basepath);
+  }, []);
   const {
     data,
     loading
-  } = useWidgetFetch$1({
-    config: defaultFetchConfig
+  } = useWidgetFetch({
+    config: defaultFetchConfig,
+    getData
   });
   const pieData = React.useMemo(() => {
     if (!data || Array.isArray(data)) return [];
@@ -64303,7 +64523,7 @@ function RisksWidget({
     }),
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex flex-row flex-col-mobile gap-6",
-      children: [/*#__PURE__*/jsxRuntime.jsx(IncidentsTime, {
+      children: [/*#__PURE__*/jsxRuntime.jsx(IncidentsTimeline, {
         selectedRange: range,
         selectedPartners: selectedPartners,
         t: t,
@@ -64458,7 +64678,8 @@ function ConflictManagement({
   goTo = () => {},
   getRedirectLink = s => s,
   theme = {},
-  options = {}
+  options = {},
+  breadcrumbs = []
 }) {
   const {
     partners,
@@ -64502,9 +64723,8 @@ function ConflictManagement({
       };
     });
   }, [partners, user, theme]);
-  return /*#__PURE__*/jsxRuntime.jsxs("div", {
-    className: "daf-analysis",
-    children: [/*#__PURE__*/jsxRuntime.jsx(DAFHeader, {
+  return /*#__PURE__*/jsxRuntime.jsxs(DashboardLayout, {
+    header: /*#__PURE__*/jsxRuntime.jsx(DAFHeader, {
       title: t("conflict-management"),
       breadcrumbs: breadCrumbs,
       supportText: /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
@@ -64515,10 +64735,8 @@ function ConflictManagement({
           children: t("European Union")
         })]
       }),
-      addedHeader: /*#__PURE__*/jsxRuntime.jsxs("div", {
-        children: [/*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "flex-1"
-        }), /*#__PURE__*/jsxRuntime.jsx(Multiselect, {
+      addedHeader: /*#__PURE__*/jsxRuntime.jsx("div", {
+        children: /*#__PURE__*/jsxRuntime.jsx(Multiselect, {
           options: [...sourceOptions],
           isAvatarGroup: true,
           canUnselectLast: false,
@@ -64532,48 +64750,37 @@ function ConflictManagement({
           dropDownWidth: 200,
           selectionType: "checkbox",
           defaultSelected: partners.map(p => p.id) || []
-        }, partners?.length)]
+        }, partners?.length)
       })
-    }), /*#__PURE__*/jsxRuntime.jsx("div", {
-      className: "content",
-      children: /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "view-content",
-        children: /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-analysis-layout",
-          children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-            className: "sections-cont w-pt",
-            children: [/*#__PURE__*/jsxRuntime.jsx("section", {
-              children: /*#__PURE__*/jsxRuntime.jsx(KeyIndicators, {
-                selectedPartners: selectedPartners,
-                partners: informationSources > 0 ? informationSources : selectedPartners?.partners?.length > 0 ? selectedPartners?.partners?.length : 0,
-                t: t,
-                goTo: goTo,
-                getRedirectLink: getRedirectLink,
-                theme: theme
-              })
-            }), /*#__PURE__*/jsxRuntime.jsx("section", {
-              children: /*#__PURE__*/jsxRuntime.jsx(MineSites, {
-                selectedPartners: selectedPartners,
-                t: t,
-                goTo: goTo,
-                getRedirectLink: getRedirectLink,
-                theme: theme,
-                APP: APP,
-                options: options
-              })
-            }), /*#__PURE__*/jsxRuntime.jsx("section", {
-              children: /*#__PURE__*/jsxRuntime.jsx(RisksWidget, {
-                selectedPartners: selectedPartners,
-                t: t,
-                goTo: goTo,
-                getRedirectLink: getRedirectLink,
-                theme: theme,
-                APP: APP,
-                options: options
-              })
-            })]
-          })
-        })
+    }),
+    children: [/*#__PURE__*/jsxRuntime.jsx("section", {
+      children: /*#__PURE__*/jsxRuntime.jsx(KeyIndicators, {
+        selectedPartners: selectedPartners,
+        partners: informationSources > 0 ? informationSources : selectedPartners?.partners?.length > 0 ? selectedPartners?.partners?.length : 0,
+        t: t,
+        goTo: goTo,
+        getRedirectLink: getRedirectLink,
+        theme: theme
+      })
+    }), /*#__PURE__*/jsxRuntime.jsx("section", {
+      children: /*#__PURE__*/jsxRuntime.jsx(MineSites, {
+        selectedPartners: selectedPartners,
+        t: t,
+        goTo: goTo,
+        getRedirectLink: getRedirectLink,
+        theme: theme,
+        APP: APP,
+        options: options
+      })
+    }), /*#__PURE__*/jsxRuntime.jsx("section", {
+      children: /*#__PURE__*/jsxRuntime.jsx(RisksWidget, {
+        selectedPartners: selectedPartners,
+        t: t,
+        goTo: goTo,
+        getRedirectLink: getRedirectLink,
+        theme: theme,
+        APP: APP,
+        options: options
       })
     })]
   });