datastake-daf 0.6.738 → 0.6.740

package/dist/layouts/index.js

@@ -7094,7 +7094,7 @@ const getAjaxData = async ({
   apiUrl,
   app
 }) => {
-  const noQuerryApps = ["nashiriki", "straatos"];
+  const noQuerryApps = ["nashiriki", "straatos", "wazi", "hatua"];
   const data = await axios__default["default"].post(noQuerryApps.includes(app) ? "/query" : "/query/options", {
     entity,
     method,

package/dist/pages/index.js

@@ -5316,7 +5316,7 @@ const getAjaxData = async ({
   apiUrl,
   app
 }) => {
-  const noQuerryApps = ["nashiriki", "straatos"];
+  const noQuerryApps = ["nashiriki", "straatos", "wazi", "hatua"];
   const data = await axios__default["default"].post(noQuerryApps.includes(app) ? "/query" : "/query/options", {
     entity,
     method,
@@ -16041,8 +16041,8 @@ const getColumns$4 = ({
     });
   }
 }, {
-  dataIndex: 'category',
-  title: t('Category'),
+  dataIndex: 'country',
+  title: t('Country'),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -16051,15 +16051,15 @@ const getColumns$4 = ({
         className: "daf-default-cell"
       });
     }
-    const category = findOptions(v, data?.options?.locationCategories);
-    return category ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: category,
-      children: category
+    const country = findOptions(v, options?.countries);
+    return country ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: country,
+      children: country
     }) : '-';
   }
 }, {
-  dataIndex: 'country',
-  title: t('Country'),
+  dataIndex: 'type',
+  title: t('Type'),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -16068,15 +16068,17 @@ const getColumns$4 = ({
         className: "daf-default-cell"
       });
     }
-    const country = findOptions(v, options?.countries);
-    return country ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: country,
-      children: country
+
+    // const category = findOptions(v, data?.options?.locationCategories);
+
+    return v ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
     }) : '-';
   }
 }, {
-  dataIndex: 'administrativeLevel1',
-  title: t('Region'),
+  dataIndex: 'registration',
+  title: t('Registration'),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -16092,8 +16094,8 @@ const getColumns$4 = ({
     }) : '-';
   }
 }, {
-  dataIndex: 'administrativeLevel2',
-  title: t('District'),
+  dataIndex: 'status',
+  title: t('Status'),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -16108,24 +16110,6 @@ const getColumns$4 = ({
       children: district
     }) : '-';
   }
-}, {
-  title: t("Last Update"),
-  dataIndex: "updatedAt",
-  key: "updatedAt",
-  width: 125,
-  render: (date, all) => {
-    if (all.empty) {
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "daf-default-cell"
-      });
-    }
-    const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: _date,
-      children: _date
-    });
-  },
-  ellipsis: true
 }, {
   title: t("Sources"),
   dataIndex: "sources",
@@ -16145,6 +16129,24 @@ const getColumns$4 = ({
       items: val
     });
   }
+}, {
+  title: t("Last Update"),
+  dataIndex: "updatedAt",
+  key: "updatedAt",
+  width: 125,
+  render: (date, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: _date,
+      children: _date
+    });
+  },
+  ellipsis: true
 }, {
   id: 'actions',
   title: "",
@@ -16183,7 +16185,144 @@ const getFiltersConfig$4 = ({
   return {
     country: {
       type: 'select',
-      placeholder: t('Country'),
+      label: 'Country',
+      placeholder: t => `${t('Filter by')} ${t('Country').toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    },
+    administrativeLevel1: {
+      type: 'ajaxSelect',
+      label: ({
+        t = s => s,
+        options = {},
+        filters = {},
+        language = 'en'
+      }) => {
+        const {
+          administrativeLevel1
+        } = options;
+        if (administrativeLevel1) {
+          if (options.country) {
+            const _item = administrativeLevel1[filters.country];
+            if (_item) {
+              if (_item[language]) {
+                return _item[language];
+              }
+            }
+          }
+        }
+        return t('Province');
+      },
+      placeholder: t => `${t('Filter by')} ${t('Province').toLowerCase()}`,
+      filters: data => ({
+        country: data.country,
+        level: 'level_1'
+      }),
+      show: data => !data.country,
+      disabled: data => !data.country,
+      mapper: {
+        label: "name",
+        value: "id"
+      },
+      method: 'getOptions',
+      entity: 'AdministrativeLevel',
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      }
+    },
+    administrativeLevel2: {
+      type: 'ajaxSelect',
+      label: ({
+        t = s => s,
+        options = {},
+        filters = {},
+        language = 'en'
+      }) => {
+        const {
+          administrativeLevel2
+        } = options;
+        if (administrativeLevel2) {
+          if (options.country) {
+            const _item = administrativeLevel2[filters.country];
+            if (_item) {
+              if (_item[language]) {
+                return _item[language];
+              }
+            }
+          }
+        }
+        return t('Province');
+      },
+      show: data => !(data.country && data.administrativeLevel1),
+      placeholder: t => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
+      filters: data => ({
+        country: data.country,
+        level: 'level_2',
+        administrativeLevel1: data.administrativeLevel1
+      }),
+      disabled: data => !(data.country && data.administrativeLevel1),
+      mapper: {
+        label: "name",
+        value: "id"
+      },
+      method: 'getOptions',
+      entity: 'AdministrativeLevel',
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      }
+    },
+    subCategory: {
+      type: 'select',
+      label: 'Sub Category',
+      placeholder: t => `${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('corporation');
+              }
+            }
+          }
+        }
+        return true;
+      }
+    },
+    positionInTheMineralSupplyChain: {
+      type: 'select',
+      label: 'Position',
+      placeholder: t => `${t('Filter by')} ${t('Position').toLowerCase()}`,
       style: {
         flex: 1
       },
@@ -16192,6 +16331,19 @@ const getFiltersConfig$4 = ({
       },
       getLabel: option => option.label,
       getValue: option => option.value
+    },
+    status: {
+      type: "select",
+      label: "Status",
+      placeholder: t => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        fley: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
     }
   };
 };
@@ -16201,10 +16353,32 @@ const filtersConfig$4 = {
 };
 const getFilterOptions$4 = (options, t) => {
   const {
-    countries
+    statusOptions = [],
+    categoryOptions = [],
+    countries = [],
+    subCategory = [],
+    subCategoriesOptions,
+    stakeholderCategoryOptions,
+    stakeholderSubCategoriesOptions,
+    administrativeLevel1,
+    administrativeLevel2
   } = options || {};
+  console.log({
+    options
+  });
   const _default = {
-    country: countries
+    category: stakeholderCategoryOptions || categoryOptions,
+    country: countries,
+    administrativeLevel1,
+    administrativeLevel2,
+    subCategory: subCategoriesOptions,
+    status: [{
+      value: "submitted",
+      label: "Submitted"
+    }, {
+      value: "private",
+      label: "Private"
+    }]
   };
   return _default;
 };
@@ -20238,7 +20412,7 @@ function Geolocation({
 }
 
 const noDafApps = ['tif', 'cukura']; //PACKAGE_CHANGE_LATER (remove sbg)
-const packageApps$1 = ["kota", "sbg", "nashiriki", "straatos"]; //PACKAGE_CHANGE_LATER (add sbg)
+const packageApps$1 = ["kota", "sbg", "nashiriki", "straatos", "wazi", "hatua"]; //PACKAGE_CHANGE_LATER (add sbg)
 
 function useAjaxModal$1({
   name = {},
@@ -24639,7 +24813,7 @@ function convertUndefinedToNull(obj) {
   return obj;
 }
 
-const packageApps = ["kota", "sbg", "nashiriki", "straatos"]; //PACKAGE_CHANGE_LATER (add sbg)
+const packageApps = ["kota", "sbg", "nashiriki", "straatos", "wazi", "hatua"]; //PACKAGE_CHANGE_LATER (add sbg)
 
 function useAjaxModal({
   name = {},
@@ -29961,7 +30135,10 @@ const StakeholdersCreate$2 = ({
     className: "daf-create-form",
     children: /*#__PURE__*/jsxRuntime.jsx(DynamicForm, {
       form: form,
-      data: data,
+      data: {
+        ...defaultData,
+        ...data
+      },
       showSaveAndNext: false,
       module: APP,
       onCancel: onCancel,
@@ -30036,7 +30213,8 @@ const OperatorsTable = ({
   formData = {},
   formValue = {},
   form = {},
-  extendingFilters = {}
+  extendingFilters = {},
+  createDefaultValues = {}
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState();
@@ -30061,32 +30239,26 @@ const OperatorsTable = ({
   } = useGetQueryParams({
     location
   });
-  const filters = React.useMemo(() => {
+  React.useMemo(() => {
     return {
       ...otherParams,
       ...extendingFilters
     };
   }, [otherParams, extendingFilters]);
   React.useEffect(() => {
-    console.log("fetching data");
     getData({
       pagination: paginationQuery,
-      ...(Object.keys(filters).length > 0 && {
-        filters: filters
-      }),
       ...(Object.keys(searchParams).length > 0 && {
         search: searchParams
       }),
+      ...otherParams,
       tab: activeTab,
       sortBy: {
         [sortBy || "updatedAt"]: sortDir ? sortDir === "ascend" ? 1 : -1 : -1
-      }
+      },
+      ...extendingFilters
     }, 'operators');
-    console.log("data fetched");
   }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
-  console.log({
-    data
-  });
   const selectFiltersConfig = React.useMemo(() => {
     return getFiltersConfig$4({
       t
@@ -30128,6 +30300,7 @@ const OperatorsTable = ({
     children: ({
       onDrawerClose
     }) => /*#__PURE__*/jsxRuntime.jsx(StakeholdersCreate$2, {
+      defaultData: createDefaultValues,
       t: t,
       goTo: goTo,
       user: user,

package/dist/services/index.js

@@ -1439,14 +1439,6 @@ class LinkedSubjectsService extends BaseService {
 }
 var LinkedSubjects = createLazyService(LinkedSubjectsService);
 
-const namespaceEnums = {
-  scl: "location",
-  workers: "worker",
-  operators: "operator",
-  testimonials: "nashirikiEvent",
-  armedGroups: "armed-groups",
-  conflictAreas: "location"
-};
 class OperatorService extends BaseService {
   get(params) {
     return this.apiGet({
@@ -1457,7 +1449,7 @@ class OperatorService extends BaseService {
   }
   getForm(scope = "create", language = "en") {
     return this.apiGet({
-      url: `/forms/${namespaceEnums["operators"]}`,
+      url: `/forms/stakeholder`,
       isApp: true,
       params: {
         scope,

package/package.json

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

package/src/@daf/core/components/EditForm/components/DataLink/useAjaxModal.js

@@ -5,7 +5,7 @@ import { getToken } from "../../../../../../helpers/Token";
 import { noDafApps } from "../../../ViewForm/components/DataLink/useAjaxModal";
 import { sortForm } from "../../../../../../helpers/Forms";
 
-const packageApps = ["kota", "sbg", "nashiriki", "straatos"];  //PACKAGE_CHANGE_LATER (add sbg)
+const packageApps = ["kota", "sbg", "nashiriki", "straatos", "wazi", "hatua"];  //PACKAGE_CHANGE_LATER (add sbg)
 
 export default function useAjaxModal({
   name = {},

package/src/@daf/core/components/Filters/selectFilters/AjaxSelect.jsx

@@ -16,7 +16,7 @@ const getAjaxData = async ({
   apiUrl,
   app,
 }) => {
-  const noQuerryApps = ["nashiriki","straatos"];
+  const noQuerryApps = ["nashiriki","straatos", "wazi", "hatua"];
   const data = await axios.post(
     noQuerryApps.includes(app) ? "/query" : "/query/options",
     {

package/src/@daf/core/components/PdfForm/utils/useAjaxModal.js

@@ -4,7 +4,7 @@ import { getToken } from "../../../../../helpers/Token";
 import { noDafApps } from "../../ViewForm/components/DataLink/useAjaxModal";
 import { sortForm } from "../../../../../helpers/Forms";
 
-const packageApps = ["kota", "sbg", "nashiriki", "straatos"];  //PACKAGE_CHANGE_LATER (add sbg)
+const packageApps = ["kota", "sbg", "nashiriki", "straatos", "wazi", "hatua"];  //PACKAGE_CHANGE_LATER (add sbg)
 
 export default function useAjaxModal({
   name = {},

package/src/@daf/core/components/ViewForm/components/DataLink/useAjaxModal.js

@@ -3,7 +3,7 @@ import axios from "axios";
 import { sortForm } from "../../../../../../helpers/Forms";
 
 export const noDafApps = ['tif', 'cukura']; //PACKAGE_CHANGE_LATER (remove sbg)
-const packageApps = ["kota", "sbg", "nashiriki", "straatos"]; //PACKAGE_CHANGE_LATER (add sbg)
+const packageApps = ["kota", "sbg", "nashiriki", "straatos", "wazi", "hatua"]; //PACKAGE_CHANGE_LATER (add sbg)
 
 export default function useAjaxModal({
   name = {},

package/src/@daf/pages/dashboards/Operations/Operators/columns.js

@@ -38,10 +38,10 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     
           return <Tooltip title={v}>{v}</Tooltip>;
         },
-    },     
+    },    
     {
-        dataIndex: 'category',
-        title: t('Category'),
+        dataIndex: 'country',
+        title: t('Country'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -49,14 +49,14 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const category = findOptions(v, data?.options?.locationCategories);
-    
-          return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
+          const country = findOptions(v, options?.countries);
+
+          return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
         },
-    },     
+    },  
     {
-        dataIndex: 'country',
-        title: t('Country'),
+        dataIndex: 'type',
+        title: t('Type'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -64,14 +64,14 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const country = findOptions(v, options?.countries);
-
-          return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
+          // const category = findOptions(v, data?.options?.locationCategories);
+    
+          return v ? <Tooltip title={v}>{v}</Tooltip> : '-';
         },
-    },      
+    },          
     {
-        dataIndex: 'administrativeLevel1',
-        title: t('Region'),
+        dataIndex: 'registration',
+        title: t('Registration'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -85,8 +85,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         },
     },    
     {
-        dataIndex: 'administrativeLevel2',
-        title: t('District'),
+        dataIndex: 'status',
+        title: t('Status'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -99,21 +99,6 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
         },
     },     
-    {
-        title: t("Last Update"),
-        dataIndex: "updatedAt",
-        key: "updatedAt",
-        width: 125,
-        render: (date, all) => {
-            if (all.empty) {
-                return <div className="daf-default-cell" />;
-            }
-
-            const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
-            return <Tooltip title={_date}>{_date}</Tooltip>;
-        },
-        ellipsis: true,
-    },
     {
         title: t("Sources"),
         dataIndex: "sources",
@@ -129,6 +114,21 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <AvatarGroup items={val}></AvatarGroup>;
         },
     },
+    {
+        title: t("Last Update"),
+        dataIndex: "updatedAt",
+        key: "updatedAt",
+        width: 125,
+        render: (date, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+            return <Tooltip title={_date}>{_date}</Tooltip>;
+        },
+        ellipsis: true,
+    },
     {
       id: 'actions',
       title: "",