datastake-daf 0.6.821 → 0.6.823

package/dist/components/index.js

@@ -25049,6 +25049,13 @@ const Content$1 = _ref => {
       }
       return all;
     }, {});
+    console.log({
+      groups,
+      singleGroupsKeys,
+      addedContent,
+      _length,
+      groupped
+    });
     return Object.keys(groupped).map(key => {
       const groups = groupped[key];
       return /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
@@ -42100,10 +42107,7 @@ const useCombinedPrefilledValues = (combinedPrefilledValues, values, parentValue
       }
     });
     if (hasChanges) {
-      setValues(prevValues => ({
-        ...prevValues,
-        ...resolvedValues
-      }));
+      setValues(prevValues => _objectSpread2(_objectSpread2({}, prevValues), resolvedValues));
       MainForm.setFieldsValue(resolvedValues);
     }
   }, [values, parentValues, combinedPrefilledValues, setValues, MainForm]);
@@ -53963,7 +53967,6 @@ function useAdminTable({
     defaultPageSize: defaultPageSize || 20,
     getRedirectLink
   });
-  console.log(filter, "filter.activeFilters");
   const activeTab = React.useMemo(() => filter.activeFilters.activeTab, [filter.activeFilters]);
   const canClearSearch = React.useMemo(() => {
     return !!filter.activeFilters.search;
@@ -55043,6 +55046,9 @@ const getAdminLevelName = (data, level) => {
   const entry = Object.values(data || {}).find(item => item.level === level);
   return entry?.name || "-";
 };
+const getAdminLevel = (data, level) => {
+  return Object.values(data || {})?.find(item => item.level === level);
+};
 
 const getColumns$6 = ({
   t,
@@ -55127,7 +55133,8 @@ const getColumns$6 = ({
           className: "daf-default-cell"
         });
       }
-      const category = findOptions(value, options?.locationCategories || []) || "--";
+      const categories = [...(options?.locationCategories || []), ...(options?.productionSiteCategories || [])];
+      const category = findOptions(value, categories) || "-";
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: category,
         children: category
@@ -55145,7 +55152,7 @@ const getColumns$6 = ({
           className: "daf-default-cell"
         });
       }
-      const country = findOptions(value, selectOptions?.country || []) || "--";
+      const country = findOptions(value, selectOptions?.countries || []) || "-";
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: country,
         children: country
@@ -55301,7 +55308,8 @@ const getColumns$5 = ({
     key: "category",
     show: true,
     render: (value, all) => {
-      const label = findOptions(value, selectOptions?.category);
+      const categories = [...(selectOptions?.locationCategories || []), ...(selectOptions?.productionSiteCategories || [])];
+      const label = findOptions(value, categories);
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label,
         children: label
@@ -55313,7 +55321,7 @@ const getColumns$5 = ({
     key: "country",
     show: true,
     render: (value, all) => {
-      const label = findOptions(value, selectOptions?.country);
+      const label = findOptions(value, selectOptions?.countries);
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label,
         children: label
@@ -55375,6 +55383,11 @@ function CombineLocationModal({
   } = useToken$5();
   const [MainForm] = antd.Form.useForm();
   const [isDisabled, setIsDisabled] = React.useState(true);
+
+  // Watch form values for cross-filtering
+  const selectedCountry = antd.Form.useWatch('country', MainForm);
+  const selectedProvince = antd.Form.useWatch('administrativeLevel1', MainForm);
+  const selectedTerritory = antd.Form.useWatch('administrativeLevel2', MainForm);
   const columns = React.useMemo(() => {
     return getColumns$5({
       t,
@@ -55384,6 +55397,29 @@ function CombineLocationModal({
       entity
     });
   }, [selectedLocations, t, selectOptions, module, entity]);
+  const categories = [...(selectOptions?.locationCategories || []), ...(selectOptions?.productionSiteCategories || [])];
+  const getFilteredLocations = () => {
+    return selectedLocations.filter(location => {
+      if (selectedCountry && location.country !== selectedCountry) {
+        return false;
+      }
+      if (selectedProvince) {
+        const provinceData = getAdminLevel(location?.linking?.SCL, "level_1") || location?.linking?.SCL?.[location?.administrativeLevel1];
+        const provinceCountry = provinceData?.country || location.country;
+        if (provinceData?.id !== selectedProvince || selectedCountry && provinceCountry !== selectedCountry) {
+          return false;
+        }
+      }
+      if (selectedTerritory) {
+        const territoryData = getAdminLevel(location?.linking?.SCL, "level_2") || location?.linking?.SCL?.[location?.administrativeLevel2];
+        const territoryCountry = territoryData?.country || location.country;
+        if (territoryData?.id !== selectedTerritory || selectedCountry && territoryCountry !== selectedCountry) {
+          return false;
+        }
+      }
+      return true;
+    });
+  };
   const onSubmit = () => {
     MainForm.validateFields().then(data => {
       const ids = selectedLocations.map(location => location.id);
@@ -55438,10 +55474,54 @@ function CombineLocationModal({
         form: MainForm,
         clearOnDestroy: true,
         className: "select-container",
-        onValuesChange: () => {
-          setIsDisabled(prev => {
+        onValuesChange: changedValues => {
+          if (changedValues.country !== undefined) {
+            const currentValues = MainForm.getFieldsValue();
+            const newCountry = changedValues.country;
+            if (currentValues.administrativeLevel1) {
+              const isProvinceValid = selectedLocations.some(location => {
+                const provinceData = location?.linking?.SCL?.[location?.administrativeLevel1];
+                return location.country === newCountry && provinceData?.id === currentValues.administrativeLevel1;
+              });
+              if (!isProvinceValid) {
+                MainForm.setFieldsValue({
+                  administrativeLevel1: undefined,
+                  administrativeLevel2: undefined
+                });
+              }
+            }
+            if (currentValues.administrativeLevel2) {
+              const isTerritoryValid = selectedLocations.some(location => {
+                const territoryData = getAdminLevel(location?.linking?.SCL, "level_2") || location?.linking?.SCL?.[location?.administrativeLevel2];
+                return location.country === newCountry && territoryData?.id === currentValues.administrativeLevel2;
+              });
+              if (!isTerritoryValid) {
+                MainForm.setFieldsValue({
+                  administrativeLevel2: undefined
+                });
+              }
+            }
+          }
+          if (changedValues.administrativeLevel1 !== undefined) {
+            const currentValues = MainForm.getFieldsValue();
+            const newProvince = changedValues.administrativeLevel1;
+            if (currentValues.administrativeLevel2) {
+              const isTerritoryValid = selectedLocations.some(location => {
+                const provinceData = location?.linking?.SCL?.[location?.administrativeLevel1];
+                const territoryData = getAdminLevel(location?.linking?.SCL, "level_2") || location?.linking?.SCL?.[location?.administrativeLevel2];
+                return provinceData?.id === newProvince && territoryData?.id === currentValues.administrativeLevel2;
+              });
+              if (!isTerritoryValid) {
+                MainForm.setFieldsValue({
+                  administrativeLevel2: undefined
+                });
+              }
+            }
+          }
+          setIsDisabled(() => {
             const values = MainForm.getFieldsValue();
-            return Object.keys(values).some(key => values[key] === undefined);
+            const requiredFields = entity?.includes("location") ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"] : ["id", "name", "category", "country"];
+            return requiredFields.some(field => values[field] === undefined);
           });
         },
         style: {
@@ -55457,7 +55537,8 @@ function CombineLocationModal({
                 value: location?.id || "-"
               };
             }),
-            placeholder: t("ID")
+            placeholder: t("ID"),
+            allowClear: true
           })
         }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
           className: "flex-1",
@@ -55471,23 +55552,25 @@ function CombineLocationModal({
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
             options: selectedLocations.map(location => {
               return {
-                label: (selectOptions?.category || []).find(option => option.value === location?.category)?.label || location?.category || "-",
+                label: (categories || []).find(option => option.value === location?.category)?.label || location?.category || "-",
                 value: location?.category || "-"
               };
             }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value)),
-            placeholder: t("Category")
+            placeholder: t("Category"),
+            allowClear: true
           })
         }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
           className: "flex-1",
           name: "country",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-            options: selectedLocations.map(location => {
+            options: getFilteredLocations().map(location => {
               return {
-                label: (selectOptions?.country || []).find(option => option.value === location?.country)?.label || location?.country || "-",
+                label: (selectOptions?.countries || []).find(option => option.value === location?.country)?.label || location?.country || "-",
                 value: location?.country || "-"
               };
             }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value)),
-            placeholder: t("admin::country")
+            placeholder: t("admin::country"),
+            allowClear: true
           })
         }), entity?.includes("location") && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
           children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
@@ -55495,26 +55578,28 @@ function CombineLocationModal({
             name: "administrativeLevel1",
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
               placeholder: t("Province"),
-              options: selectedLocations.map(location => {
-                const _data = getAdminLevelName(location?.linking?.SCL, "level_1");
+              options: getFilteredLocations().map(location => {
+                const _data = getAdminLevel(location?.linking?.SCL, "level_1") || location?.linking?.SCL?.[location?.administrativeLevel1];
                 return {
                   label: _data?.name || "-",
                   value: _data?.id || "-"
                 };
-              }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value))
+              }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value) && option.value !== "-"),
+              allowClear: true
             })
           }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
             className: "flex-1",
             name: "administrativeLevel2",
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
               placeholder: t("Territory"),
-              options: selectedLocations.map(location => {
-                const _data = getAdminLevelName(location?.linking?.SCL, "level_2");
+              options: getFilteredLocations().map(location => {
+                const _data = getAdminLevel(location?.linking?.SCL, "level_2") || location?.linking?.SCL?.[location?.administrativeLevel2];
                 return {
                   label: _data?.name || "-",
                   value: _data?.id || "-"
                 };
-              }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value))
+              }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value) && option.value !== "-"),
+              allowClear: true
             })
           })]
         })]
@@ -55633,13 +55718,8 @@ function LocationTable(_ref) {
     refetchTrigger
   });
   const selectOptions = React.useMemo(() => {
-    var _config$options, _config$options2;
-    return {
-      category: (_config$options = config.options) === null || _config$options === void 0 ? void 0 : _config$options.category,
-      country: (_config$options2 = config.options) === null || _config$options2 === void 0 ? void 0 : _config$options2.countries,
-      sources: []
-    };
-  }, [config.options]);
+    return options;
+  }, [options]);
   const columns = React.useMemo(() => {
     return getColumns$6({
       t,
@@ -55885,11 +55965,7 @@ const getColumns$4 = ({
           className: "daf-default-cell"
         });
       }
-      console.log({
-        value,
-        options
-      });
-      const category = findOptions(value, options?.categoriesOptions || []) || "-";
+      const category = findOptions(value, options?.categoriesOptions || options?.category || []) || "-";
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: category,
         children: category
@@ -56029,21 +56105,6 @@ const getColumns$4 = ({
   return cols.filter(c => c[show]);
 };
 
-const mapToSelectOptions = (items, valueKey, selectOptions, optionKey, customMapper = null) => {
-  return items.map(item => {
-    if (customMapper) {
-      return customMapper(item);
-    }
-    const value = item?.[valueKey] || "-";
-    const optionsList = selectOptions?.[optionKey] || [];
-    const foundOption = optionsList.find(option => option.value === value);
-    return {
-      label: foundOption?.label || value,
-      value: value
-    };
-  }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value));
-};
-
 const getColumns$3 = ({
   t,
   selectOptions,
@@ -56078,7 +56139,11 @@ const getColumns$3 = ({
     key: "category",
     show: true,
     render: (value, all) => {
-      const label = findOptions(value, selectOptions?.category);
+      console.log({
+        value,
+        selectOptions
+      });
+      const label = findOptions(value, selectOptions?.categoriesOptions || selectOptions?.category || []);
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label,
         children: label
@@ -56090,7 +56155,7 @@ const getColumns$3 = ({
     key: "country",
     show: true,
     render: (value, all) => {
-      const label = findOptions(value, selectOptions?.country);
+      const label = findOptions(value, selectOptions?.countries || []);
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label,
         children: label
@@ -56161,6 +56226,28 @@ function CombineSubjectsModal({
       entity
     });
   }, [selectedSubjects, t, selectOptions, module, entity]);
+  const countryOptions = React.useMemo(() => {
+    return [...new Set(selectedSubjects.map(subject => subject?.country))].map(country => {
+      console.log({
+        country
+      });
+      return {
+        label: findOptions(country, selectOptions?.countries || []),
+        value: country || "-"
+      };
+    });
+  }, [selectedSubjects, selectOptions]);
+  const categoriesOptions = React.useMemo(() => {
+    return [...new Set(selectedSubjects.map(subject => subject?.category))].map(country => {
+      console.log({
+        country
+      });
+      return {
+        label: findOptions(country, selectOptions?.categoriesOptions || selectOptions?.category || []),
+        value: country || "-"
+      };
+    });
+  }, [selectedSubjects, selectOptions]);
   const onSubmit = () => {
     MainForm.validateFields().then(data => {
       const ids = selectedSubjects.map(subject => subject.id);
@@ -56232,7 +56319,8 @@ function CombineSubjectsModal({
               label: s?.datastakeId || "-",
               value: s?.id || "-"
             })),
-            placeholder: t("ID")
+            placeholder: t("ID"),
+            allowClear: true
           })
         }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
           className: "flex-1",
@@ -56244,44 +56332,18 @@ function CombineSubjectsModal({
           className: "flex-1",
           name: "category",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-            options: mapToSelectOptions(selectedSubjects, "category", selectOptions, "category"),
-            placeholder: t("Category")
+            options: categoriesOptions,
+            placeholder: t("Category"),
+            allowClear: true
           })
         }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
           className: "flex-1",
           name: "country",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-            options: mapToSelectOptions(selectedSubjects, "country", selectOptions, "country"),
-            placeholder: t("admin::country")
+            options: countryOptions,
+            placeholder: t("admin::country"),
+            allowClear: true
           })
-        }), entity.includes("location") && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-          children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-            className: "flex-1",
-            name: "administrativeLevel1",
-            children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-              placeholder: t("Province"),
-              options: mapToSelectOptions(selectedSubjects, null, selectOptions, null, subject => {
-                const _data = getAdminLevelName(subject?.linking?.SCL, "level_1");
-                return {
-                  label: _data?.name || "-",
-                  value: _data?.id || "-"
-                };
-              })
-            })
-          }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-            className: "flex-1",
-            name: "administrativeLevel2",
-            children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-              placeholder: t("Territory"),
-              options: mapToSelectOptions(selectedSubjects, null, selectOptions, null, subject => {
-                const _data = getAdminLevelName(subject?.linking?.SCL, "level_2");
-                return {
-                  label: _data?.name || "-",
-                  value: _data?.id || "-"
-                };
-              })
-            })
-          })]
         })]
       })]
     }), /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -56398,13 +56460,8 @@ function SubjectsTable(_ref) {
     refetchTrigger
   });
   const selectOptions = React.useMemo(() => {
-    var _config$options, _config$options2;
-    return {
-      category: (_config$options = config.options) === null || _config$options === void 0 ? void 0 : _config$options.category,
-      country: (_config$options2 = config.options) === null || _config$options2 === void 0 ? void 0 : _config$options2.countries,
-      sources: []
-    };
-  }, [config.options]);
+    return options;
+  }, [options]);
   const columns = React.useMemo(() => {
     return getColumns$4({
       t,
@@ -59288,6 +59345,9 @@ function getAdminRoutes(config) {
     userIsAdmin
   } = config;
   const APP_PREFIX = "APP_".concat(appName.toUpperCase());
+  console.log({
+    useAdminEventsConfig
+  });
   function DashboardWrapper() {
     const dashboardConfig = useAdminDashboardConfig();
     return /*#__PURE__*/jsxRuntime.jsx(AdminDashboardScreen, {

package/dist/pages/index.js

@@ -42183,6 +42183,19 @@ const getFiltersConfig$a = ({
   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
+    },
     status: {
       type: "select",
       label: "Status",
@@ -42196,11 +42209,40 @@ const getFiltersConfig$a = ({
       getLabel: option => option.label,
       getValue: option => option.value
     },
-    timeframe: {
-      type: "timeframe",
-      label: "Timeframe",
+    subCategory: {
+      type: 'select',
+      label: 'Sub Category',
+      placeholder: () => `${t('Filter by')} ${t('Sub 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('nonStateArmedGroup');
+              }
+            }
+          }
+        }
+        return true;
       }
     }
   };
@@ -42208,7 +42250,8 @@ const getFiltersConfig$a = ({
 const getFilterOptions$a = (options, t) => {
   const _default = {
     status: getStatusOptions(t) || [],
-    timeframe: []
+    country: options.countries || [],
+    subCategory: options.subCategory || []
   };
   return _default;
 };
@@ -42458,20 +42501,7 @@ const getFiltersConfig$9 = ({
         flex: 1
       }
     },
-    subCategory: {
-      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
-    },
-    category: {
+    eventCategory: {
       type: 'select',
       label: 'Category',
       placeholder: t => `${t('Filter by')} ${t('Category').toLowerCase()}`,
@@ -42515,7 +42545,7 @@ const getFilterOptions$9 = (options, t) => {
   return {
     timeframe: timeframe,
     country: countries || [],
-    category: catOptions || [],
+    eventCategory: catOptions || [],
     status: [{
       value: "submitted",
       label: t("Submitted")
@@ -50627,6 +50657,13 @@ const Content = ({
       }
       return all;
     }, {});
+    console.log({
+      groups,
+      singleGroupsKeys,
+      addedContent,
+      _length,
+      groupped
+    });
     return Object.keys(groupped).map(key => {
       const groups = groupped[key];
       return /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {