datastake-daf 0.6.815 → 0.6.817

package/dist/services/index.js

@@ -1458,6 +1458,11 @@ class LinkedSubjectsService extends BaseService {
   getForm({
     namespace
   }, language = "en", scope) {
+    console.log({
+      namespace,
+      language,
+      scope
+    });
     return this.apiGet({
       url: `forms/${namespace === "documents" ? namespace : getNamespace(namespace)}`,
       isApp: true,
@@ -1727,6 +1732,201 @@ class PartnerService extends BaseService {
 }
 var PartnerService$1 = createLazyService(PartnerService);
 
+class EventsService extends BaseService {
+  getForm({
+    scope
+  }, language = "en") {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/event`,
+      params: {
+        scope,
+        language
+      }
+    });
+  }
+  getWithModule({
+    query,
+    signal,
+    module
+  }) {
+    return this.apiGet({
+      isApp: true,
+      url: `/${module}/event`,
+      params: query,
+      signal
+    });
+  }
+  getOne({
+    id,
+    module,
+    signal
+  }) {
+    return this.apiGet({
+      url: `/${module}/event/${id}`,
+      isApp: true,
+      signal
+    });
+  }
+  get(query, signal) {
+    return this.apiGet({
+      isApp: true,
+      url: "/event",
+      params: query,
+      signal
+    });
+  }
+  getData(id, sourceId, source, version) {
+    return this.apiGet({
+      isApp: true,
+      url: `/event/${id}`,
+      params: {
+        authorId: sourceId,
+        source,
+        version
+      }
+    });
+  }
+  getLinking(query) {
+    return this.apiGet({
+      isApp: true,
+      url: "/event/linking",
+      params: query
+    });
+  }
+  submit(payload) {
+    if (payload.id) {
+      return this.apiPut({
+        isApp: true,
+        url: `/event/${payload.id}`,
+        data: filterCreateData(payload)
+      });
+    }
+    if (payload?.form) {
+      delete payload.form;
+      return this.apiPut({
+        isApp: true,
+        url: "/event",
+        data: filterCreateData(payload)
+      });
+    }
+    return this.apiPost({
+      isApp: true,
+      url: "/event",
+      data: filterCreateData(payload)
+    });
+  }
+  submitStep(data, id) {
+    return this.apiPut({
+      isApp: true,
+      url: `/event/submit/${id}`,
+      data: filterCreateData(data)
+    });
+  }
+  remove(id, data) {
+    return this.apiDelete({
+      isApp: true,
+      url: `/event/${id}/remove`,
+      data: data
+    });
+  }
+  submitForm(id) {
+    const app = window.globalServicesConfig.application;
+    return this.apiPost({
+      isApp: true,
+      url: `/${app}/versioning/submit/Event/${id}`
+    });
+  }
+  getOptions() {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/options`,
+      params: {
+        id: "categoryOptions,eventsType,testimonialsType,eventCategory,countries,eventCategoryOptions"
+      }
+    });
+  }
+}
+var EventsService$1 = createLazyService(EventsService);
+
+class WorkersService extends BaseService {
+  get(params) {
+    return this.apiGet({
+      isApp: true,
+      url: "/stakeholder",
+      params
+    });
+  }
+  getForm(scope = "modalNashirikiWorker", language = "en") {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/stakeholder`,
+      params: {
+        scope,
+        language
+      }
+    });
+  }
+  getData(id, sourceId, version, source) {
+    return this.apiGet({
+      isApp: true,
+      url: `/stakeholder/${id}`,
+      params: {
+        authorId: sourceId,
+        version,
+        source
+      }
+    });
+  }
+  submit(payload) {
+    if (payload.id) {
+      // const { id, ...data } = payload;
+      return this.apiPut({
+        isApp: true,
+        url: `/stakeholder/${payload.id}`,
+        data: filterCreateData(payload)
+      });
+    }
+    if (payload?.form) {
+      delete payload.form;
+      return this.apiPost({
+        isApp: true,
+        url: "/stakeholder",
+        data: filterCreateData(payload)
+      });
+    }
+    return this.apiPost({
+      isApp: true,
+      url: "/stakeholder",
+      data: filterCreateData(payload)
+    });
+  }
+  submitStep(data, id) {
+    return this.apiPut({
+      isApp: true,
+      url: `/stakeholder/submit/${id}`,
+      data: filterCreateData(data)
+    });
+  }
+  remove(id, data) {
+    return this.apiDelete({
+      isApp: true,
+      url: `/stakeholder/${id}/remove`,
+      data: data
+    });
+  }
+  getOptions() {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/options`,
+      params: {
+        id: "activityAtSiteOptions,category,countries,optionPositionSupplyChain,subCategory"
+      }
+    });
+  }
+}
+var WorkersService$1 = createLazyService(WorkersService);
+
 exports.AdminService = AdminService$1;
 exports.AuthenticationService = AuthenticationService$1;
 exports.BaseHTTPService = BaseHTTPService;
@@ -1736,6 +1936,7 @@ exports.DashboardService = DashboardService$1;
 exports.DataStoreService = DataStoreService$1;
 exports.ErrorHandler = ErrorHandler;
 exports.ErrorService = ErrorService;
+exports.EventsService = EventsService$1;
 exports.LinkedSubjectsService = LinkedSubjects;
 exports.NotificationService = NotificationService$1;
 exports.OperatorService = OperatorService$1;
@@ -1743,6 +1944,7 @@ exports.PartnerService = PartnerService$1;
 exports.QueryService = QueryService$1;
 exports.SourceService = SourceService$1;
 exports.UserService = UserService$1;
+exports.WorkersService = WorkersService$1;
 exports.configureServices = configureServices;
 exports.createLazyService = createLazyService;
 exports.getServicesConfig = getServicesConfig;

package/package.json

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

package/src/@daf/pages/Locations/ConflictAreas/columns.js

@@ -0,0 +1,140 @@
+import React from 'react';
+import { Tooltip } from 'antd';
+import { findOptions, getLinkValue } from '../../../../helpers/StringHelper.js';
+import { renderDateFormatted } from '../../../../helpers/Forms.js';
+import CustomIcon from '../../../core/components/Icon/CustomIcon.jsx';
+import AvatarGroup from '../../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
+import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
+import NavigationAction from '../../../core/components/Table/NavigationAction/index.jsx';
+import { renderStatusTag } from '../../../utils/tags.js';
+
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
+    {
+        dataIndex: 'datastakeId',
+        title: t('ID'),
+        ellipsis: true,
+        show: true,
+        key: "datastakeId",
+        sorter: () => 0 + 0,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: "name",
+        title: t('Name'),
+        ellipsis: true,
+        show: true,
+        key: "name",
+        sorter: () => 0 + 0,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },  
+    {
+        dataIndex: 'region',
+        title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const region = getLinkValue(all?.administrativeLevel1, all?.linking?.SCL);
+
+          return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
+        },
+    },   
+    {
+        dataIndex: 'territory',
+        title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const district = getLinkValue(all?.administrativeLevel2, all?.linking?.SCL);
+
+          return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
+        },
+    },     
+    {
+      title: t("Last Update"),
+      dataIndex: "updatedAt",
+      key: "updatedAt",
+      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",
+    key: "sources",
+    show: activeTab !== "own",
+    render: (val, all) => {
+        if (all.empty) {
+            return <div className="daf-default-cell" />;
+        }
+
+      if (!val || val?.length === 0) {
+        return "-";
+      }
+
+      const sources = sourceAvatarConfig(val, user, applications);
+
+      return <AvatarGroup items={sources} />;
+    },
+  },
+    {
+        title: t("Status"),
+        dataIndex: 'status',
+        ellipsis: true,
+        show: activeTab == "own",
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+          const _val = all?.published || all?.status === "submitted" ? "submitted" : v;
+
+          return renderStatusTag({ value: _val, t });
+        },
+    },
+    {
+        id: 'actions',
+        title: "",
+        width: 60,
+        render: (_, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />;
+          }
+  
+          const onClick = () => {
+            let link = `/app/view/${subject}/${all.datastakeId}`;
+            if (activeTab === "shared") {
+              link += `?sourceId=${all?.authorId?.id}`;
+            }
+            goTo(getRedirectLink(link));
+          };
+  
+          return <NavigationAction onClick={onClick} theme={theme} />;
+        }
+      }
+].filter((column) => column.show !== false);

package/src/@daf/pages/Locations/ConflictAreas/config.js

@@ -0,0 +1,41 @@
+import { getStatusOptions } from '../../../utils/filters';
+
+export const getFiltersConfig = ({t}) => {
+    return {
+		status: {
+		  type: "select",
+		  label: "Status",
+		  placeholder: () => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { fley: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+        timeframe: {
+			type: "timeframe",
+			label: "Timeframe",
+			style: { flex: 1 },
+		},
+	}
+}
+
+export const getFilterOptions = (options, t) => {
+	const _default  = {
+		status: getStatusOptions(t) || [],
+        timeframe: [],
+	}
+
+	return _default;
+}
+
+export const formConfig = {
+	namespace: 'conflict-areas',
+	view: ['scoping', 'new'],
+	scope: 'conflictAreaCreate',
+	formType: 'conflict-area',
+}
+
+export const viewConfig = {
+	title: "Conflict Areas",
+	createTitle: "New Conflict Area",
+}

package/src/@daf/pages/Locations/MineSite/columns.js

@@ -50,7 +50,11 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return <div className="daf-default-cell" />
         }
 
-        const locationCategories = [...(data?.options?.locationCategories || []), ...(options?.productionSiteCategories || [])]
+        const locationCategories = [
+          ...(data?.options?.locationCategories || []), 
+          ...(options?.productionSiteCategories || []), 
+          ...(options?.locationCategories || [])
+        ]
 
         const category = findOptions(v, locationCategories);
   

package/src/@daf/pages/Locations/MineSite/config.js

@@ -1,6 +1,6 @@
 import { getStatusOptions } from '../../../utils/filters';
 
-export const getFiltersConfig = ({t}) => {
+export const getFiltersConfig = ({t, screen}) => {
     return {
 		country: {
 		  type: 'select',
@@ -91,6 +91,7 @@ export const getFiltersConfig = ({t}) => {
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
 		  getValue: (option) => option.value,
+		  show: () => screen === 'scl',
 		},
 		positionInTheMineralSupplyChain: {
 		  type: 'select',

package/src/@daf/pages/Stakeholders/ArmedGroups/columns.js

@@ -0,0 +1,110 @@
+import React from 'react';
+import { Tooltip } from 'antd';
+import { findOptions, getLinkValue } from '../../../../helpers/StringHelper.js';
+import { renderDateFormatted } from '../../../../helpers/Forms.js';
+import CustomIcon from '../../../core/components/Icon/CustomIcon.jsx';
+import AvatarGroup from '../../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
+import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
+import NavigationAction from '../../../core/components/Table/NavigationAction/index.jsx';
+import { renderStatusTag } from '../../../utils/tags.js';
+
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
+    {
+        dataIndex: 'datastakeId',
+        title: t('ID'),
+        ellipsis: true,
+        show: true,
+        key: "datastakeId",
+        sorter: () => 0 + 0,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: 'name',
+        title: t('Name'),
+        ellipsis: true,
+        show: true,
+        key: "name",
+        sorter: () => 0 + 0,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },      
+    {
+      title: t("Last Update"),
+      dataIndex: "updatedAt",
+      key: "updatedAt",
+      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",
+    key: "sources",
+    show: activeTab !== "own",
+    render: (val, all) => {
+        if (all.empty) {
+            return <div className="daf-default-cell" />;
+        }
+
+      if (!val || val?.length === 0) {
+        return "-";
+      }
+
+      const sources = sourceAvatarConfig(val, user, applications);
+
+      return <AvatarGroup items={sources} />;
+    },
+  },
+    {
+        title: t("Status"),
+        dataIndex: 'status',
+        ellipsis: true,
+        show: activeTab == "own",
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+          const _val = all?.published || all?.status === "submitted" ? "submitted" : v;
+
+          return renderStatusTag({ value: _val, t });
+        },
+    },
+    {
+        id: 'actions',
+        title: "",
+        width: 60,
+        render: (_, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />;
+          }
+  
+          const onClick = () => {
+            let link = `/app/view/${subject}/${all.datastakeId}`;
+            if (activeTab === "shared") {
+              link += `?sourceId=${all?.authorId?.id}`;
+            }
+            goTo(getRedirectLink(link));
+          };
+  
+          return <NavigationAction onClick={onClick} theme={theme} />;
+        }
+      }
+].filter((column) => column.show !== false);

package/src/@daf/pages/Stakeholders/ArmedGroups/config.js

@@ -0,0 +1,41 @@
+import { getStatusOptions } from '../../../utils/filters';
+
+export const getFiltersConfig = ({t}) => {
+    return {
+		status: {
+		  type: "select",
+		  label: "Status",
+		  placeholder: () => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { fley: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+        timeframe: {
+			type: "timeframe",
+			label: "Timeframe",
+			style: { flex: 1 },
+		},
+	}
+}
+
+export const getFilterOptions = (options, t) => {
+	const _default  = {
+		status: getStatusOptions(t) || [],
+        timeframe: [],
+	}
+
+	return _default;
+}
+
+export const formConfig = {
+	namespace: 'armed-groups',
+	view: ['scoping', 'new'],
+	scope: 'global',
+	formType: 'armed-group',
+}
+
+export const viewConfig = {
+	title: "Armed Groups",
+	createTitle: "New Armed Group",
+}

package/src/@daf/pages/Stakeholders/Operators/columns.js

@@ -49,7 +49,13 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const country = findOptions(v, data?.options?.positionSupplyChainOptions || data?.options?.optionPositionSupplyChain);
+          const positionSupplyChainOptions = [
+            ...(data?.options?.positionSupplyChainOptions || []), 
+            ...(options?.positionSupplyChainOptions || []),
+            ...(options?.optionPositionSupplyChain || [])
+          ]
+
+          const country = findOptions(v, positionSupplyChainOptions);
 
           return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
         },
@@ -66,7 +72,13 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const subCategory = findOptions(v, data?.options?.subCategoriesOptions || data?.options?.subCategory);
+          const subCategoriesOptions = [
+            ...(data?.options?.subCategoriesOptions || []), 
+            ...(options?.subCategoriesOptions || []),
+            ...(options?.subCategory || [])
+          ]
+
+          const subCategory = findOptions(v, subCategoriesOptions);
     
           return subCategory ? <Tooltip title={subCategory}>{subCategory}</Tooltip> : '-';
         },

package/src/@daf/pages/Stakeholders/Workers/columns.js

@@ -66,7 +66,13 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const activity = findOptions(v, data?.options?.activityAtSiteOptions || data?.options?.activityAtSite);
+          const activityAtSiteOptions = [
+            ...(data?.options?.activityAtSiteOptions || []), 
+            ...(options?.activityAtSiteOptions || []),
+            ...(options?.activityAtSite || [])
+          ]
+
+          const activity = findOptions(v, activityAtSiteOptions);
     
           return activity ? <Tooltip title={activity}>{activity}</Tooltip> : '-';
         },

package/src/@daf/pages/TablePage/config.js

@@ -16,7 +16,7 @@ export const getSelectFiltersConfig = ({ subject }) => {
 
 export const getFiltersConfig = ({ t, subject }) => {
   const registry = FILTER_REGISTRY[subject] || FILTER_REGISTRY[DEFAULT_SUBJECT];
-  return registry?.config({ t });
+  return registry?.config({ t , screen: subject});
 };
   
 export const getFilterOptions = ({ t, subject, options }) => {