datastake-daf 0.6.831 → 0.6.833

package/dist/services/index.js

@@ -1516,6 +1516,14 @@ class DashboardService extends BaseService {
       isUserManager: true
     });
   }
+
+  // getWidgetConflictManagement({ url, params = {}, filters = {} }) {
+  //   return this.apiGet({
+  //     url: `/dashboard/conflict-management${url}`,
+  //     params: { ...params, ...filters },
+  //     isApp: true,
+  //   });
+  // }
 }
 var DashboardService$1 = createLazyService(DashboardService);
 

package/dist/utils/index.js

@@ -7850,6 +7850,7 @@ function mapUser(user) {
 }
 
 const en = {
+  "conflict-management": "Conflict Management",
   "review-requests": "Review Requests",
   "create-account": "Create Account",
   "manage-users": "Manage Users",
@@ -15103,10 +15104,10 @@ const formatDataForTable = (data, options) => {
           children
         };
       }),
-      meta: dataObj.data
+      meta: dataObj?.meta
     },
-    ...(Object.keys(options)?.length > 0 && options),
-    totalItems: Array.isArray(dataObj?.meta) ? dataObj?.meta?.[0]?.total : dataObj?.meta?.total || 0
+    options: options || {},
+    totalItems: dataObj?.meta?.total || dataObj?.data?.length || 0
   };
 };
 

package/package.json

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

package/src/@daf/core/components/Screens/Admin/AdminScreens/Documents.jsx

@@ -42,6 +42,8 @@ export default function AdminLocationScreen({ config }) {
 		refetchTrigger,
 		getData,
 		user,
+		APP,
+		apiUrl
 	} = config;
 
 
@@ -75,6 +77,8 @@ export default function AdminLocationScreen({ config }) {
 			}}
 			user={user}
 			options={options}
+			APP={APP}
+			apiUrl={apiUrl}
 		/>
 	);
 }

package/src/@daf/core/components/Screens/Admin/AdminScreens/Events.jsx

@@ -42,6 +42,8 @@ export default function AdminEventsScreen({ config }) {
 		refetchTrigger,
 		getData,
 		user,
+		APP,	
+		apiUrl
 	} = config;
 
 
@@ -71,6 +73,8 @@ export default function AdminEventsScreen({ config }) {
 				options:options}}
 			user={user}
 			options={options}
+			APP={APP}
+			apiUrl={apiUrl}
 		/>
 	);
 }

package/src/@daf/core/components/Screens/Admin/AdminScreens/Location.jsx

@@ -43,6 +43,8 @@ export default function AdminLocationScreen({ config }) {
 		refetchTrigger,
 		getData,
 		user,
+		APP,
+		apiUrl
 	} = config;
 
 	const handleMergeLocations = useCallback(
@@ -92,6 +94,8 @@ export default function AdminLocationScreen({ config }) {
 			}}
 			user={user}
 			options={options}
+			APP={APP}
+			apiUrl={apiUrl}
 		/>
 	);
 }

package/src/@daf/core/components/Screens/Admin/AdminScreens/Subjects.jsx

@@ -43,6 +43,8 @@ export default function AdminSubjectsScreen({ config }) {
 		refetchTrigger,
 		getData,
 		user,
+		APP,
+		apiUrl
 	} = config;
 
 	const handleMergeSubjects = useCallback(
@@ -92,6 +94,8 @@ export default function AdminSubjectsScreen({ config }) {
 			}}
 			user={user}
 			options={options}
+			APP={APP}
+			apiUrl={apiUrl}
 		/>
 	);
 }

package/src/@daf/core/components/Screens/Admin/AdminTables/DocumentsTable/helper.js

@@ -1,32 +1,22 @@
-export const selectFiltersConfig = {
-	category: {
-		type: "select",
-		label: "Category",
-		placeholder: (t) => t("Category"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-	country: {
-		type: "select",
-		label: "Country",
-		placeholder: (t) => t("Country"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-	sources: {
-		type: "select",
-		label: "Sources",
-		placeholder: (t) => t("Sources"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-};
+export const getFiltersConfig = ({t}) => {
+    return {
+		timeframe: {
+			type: "timeframe",
+			label: "Timeframe",
+			style: { flex: 1 },
+		},
+    }
+}
+
+export const getFilterOptions = (options, t) => {
+	const { timeframe = []	 } = options || {};
+	const _default  = {
+		timeframe: timeframe,
+	}
+
+	return _default;
+}
+
 
 export const filtersConfig = {
 	name: "",

package/src/@daf/core/components/Screens/Admin/AdminTables/DocumentsTable/index.jsx

@@ -5,7 +5,8 @@ import DAFTable from "../../../../Table/index.jsx";
 import { theme, Tag, message } from "antd";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import {
-	selectFiltersConfig,
+	getFiltersConfig,
+	getFilterOptions,
 	filtersConfig,
 	defaultUrlParams,
 	checkboxConfig,
@@ -31,12 +32,22 @@ export default function DocumentsTable({
 	refetchTrigger,
 	user,
 	options,
+	APP,
+	apiUrl
 }) {
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
 	const [selectedDocuments, setSelectedDocuments] = useState([]);
 	const { token } = useToken();
 
+	const selectFiltersConfig = useMemo(() => {
+		return getFiltersConfig({t});
+	}, [t]);
+
+	const filterOptions = useMemo(() => {
+		return getFilterOptions(options, t);
+	}, [options, t]);
+
 	const {
 		filter,
 		activeTab,
@@ -103,7 +114,7 @@ export default function DocumentsTable({
 				hasError={hasError}
 				setHasError={setHasError}
 				canClearSearch={canClearSearch}
-				selectOptions={selectOptions}
+				selectOptions={filterOptions}
 				checkboxConfig={checkboxConfig}
 				defaultTableFilters={{}}
 				breadcrumbs={breadcrumbs}
@@ -132,7 +143,7 @@ export default function DocumentsTable({
 					hideOnLoading={false}
 					pagination={filter.pagination}
 					rowKey="id"
-					selectOptions={selectOptions}
+					selectOptions={filterOptions}
 					doEmptyRows
 					setShowFilters={setShowFilters}
 					filtersConfig={selectFiltersConfig}
@@ -140,6 +151,8 @@ export default function DocumentsTable({
 					showFilters={showFilters}
 					defaultFilters={filter.defaultFilters}
 					onChange={filter.onTableChange}
+					app={APP}
+					apiUrl={apiUrl}
 				/>
 			</AdminTable>
 

package/src/@daf/core/components/Screens/Admin/AdminTables/EventsTable/helper.js

@@ -15,31 +15,26 @@ export const getTabs = ({ t }) => {
 	];
 };
 
-export const selectFiltersConfig = {
-	eventsType: {
-		type: "select",
-		label: "type",
-		placeholder: (t) => t("type"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-};
-
-export const getSelectFiltersConfig = ({t}) => {
-	return {
-		eventsType: {
-			type: "select",
-			label: "type",
-			placeholder: t("type"),
+export const getFiltersConfig = ({t}) => {
+    return {
+		typeOfEvent:{
+			type: 'select',
+			label: 'type',
+			placeholder: (t) => `${t('Filter by')} ${t('type').toLowerCase()}`,
 			style: { flex: 1 },
 			labelStyle: { flex: 1 },
 			getLabel: (option) => option.label,
 			getValue: (option) => option.value,
-		},
+		}
 	}
-};
+}
+
+export const getFilterOptions = (options, t) => {
+	const { eventsType } = options || {};
+	return {
+		typeOfEvent: eventsType || [],
+	}
+}
 
 export const filtersConfig = {
 	name: "",

package/src/@daf/core/components/Screens/Admin/AdminTables/EventsTable/index.jsx

@@ -8,7 +8,8 @@ import {
 	filtersConfig,
 	defaultUrlParams,
 	checkboxConfig,
-	getSelectFiltersConfig,
+	getFiltersConfig,
+	getFilterOptions,
 } from "./helper.js";
 import { getColumns } from "./column.js";
 import { getTabs } from "../helper.js";
@@ -31,6 +32,8 @@ export default function EventsTable({
 	refetchTrigger,
 	user,
 	options,
+	APP,
+	apiUrl
 }) {
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
@@ -38,9 +41,13 @@ export default function EventsTable({
 	const { token } = useToken();
 
 	const selectFiltersConfig = useMemo(() => {
-		return getSelectFiltersConfig({t});
+		return getFiltersConfig({t});
 	}, [t]);
 
+	const filterOptions = useMemo(() => {
+		return getFilterOptions(options, t);
+	}, [options, t]);
+
 	const {
 		filter,
 		activeTab,
@@ -105,7 +112,7 @@ export default function EventsTable({
 				hasError={hasError}
 				setHasError={setHasError}
 				canClearSearch={canClearSearch}
-				selectOptions={selectOptions}
+				selectOptions={filterOptions}
 				checkboxConfig={checkboxConfig}
 				defaultTableFilters={{}}
 				breadcrumbs={breadcrumbs}
@@ -134,7 +141,7 @@ export default function EventsTable({
 					hideOnLoading={false}
 					pagination={filter.pagination}
 					rowKey="id"
-					selectOptions={selectOptions}
+					selectOptions={filterOptions}
 					doEmptyRows
 					setShowFilters={setShowFilters}
 					filtersConfig={selectFiltersConfig}
@@ -142,6 +149,8 @@ export default function EventsTable({
 					showFilters={showFilters}
 					defaultFilters={filter.defaultFilters}
 					onChange={filter.onTableChange}
+					app={APP}
+					apiUrl={apiUrl}
 				/>
 			</AdminTable>
 

package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/helper.js

@@ -1,32 +1,117 @@
-export const selectFiltersConfig = {
-	category: {
-		type: "select",
-		label: "Category",
-		placeholder: (t) => t("Category"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-	country: {
-		type: "select",
-		label: "Country",
-		placeholder: (t) => t("Country"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-	sources: {
-		type: "select",
-		label: "Sources",
-		placeholder: (t) => t("Sources"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-};
+export const getFiltersConfig = ({t}) => {
+    return {
+		category:{
+			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,
+		},
+		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,
+		},
+		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('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('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 },
+		},
+	}
+}
+
+export const getFilterOptions = (options, t) => {
+	const {
+		statusOptions = [],
+		categoryOptions = [],
+		countries = [],
+		product=[],
+		subCategory = [],
+		subCategoriesOptions,
+		stakeholderCategoryOptions,
+		stakeholderSubCategoriesOptions,
+		administrativeLevel1,
+		administrativeLevel2,
+		mineralOptions,
+		minerals,
+		productionSiteCategories,
+		locationCategories = [],
+	  } = options || {};
+
+	const _default  = {
+		// category: stakeholderCategoryOptions || categoryOptions,
+		country: countries || [],
+		administrativeLevel1,
+		administrativeLevel2,
+		category: locationCategories || [],
+	}
+
+	return _default;
+}
 
 export const filtersConfig = {
 	name: "",

package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/index.jsx

@@ -5,10 +5,11 @@ import DAFTable from "../../../../Table/index.jsx";
 import { theme, Tag, message } from "antd";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import {
-	selectFiltersConfig,
 	filtersConfig,
 	defaultUrlParams,
 	checkboxConfig,
+	getFiltersConfig,
+	getFilterOptions,
 } from "./helper.js";
 import { getColumns } from "./column.js";
 import CombineLocationModal from "../../AdminModals/CombineLocation/index.jsx";
@@ -33,6 +34,8 @@ export default function LocationTable({
 	refetchTrigger,
 	user,
 	options,
+	APP,
+	apiUrl
 }) {
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
@@ -42,6 +45,14 @@ export default function LocationTable({
     const { token } = useToken();
 	const [isCombineModalOpen, setIsModalOpen] = useState(false);
 
+	const selectFiltersConfig = useMemo(() => {
+		return getFiltersConfig({t});
+	}, [t]);
+
+	const filterOptions = useMemo(() => {
+		return getFilterOptions(options, t);
+	}, [options, t]);
+
 	const {
 		filter,
 		activeTab,
@@ -107,7 +118,7 @@ export default function LocationTable({
 				hasError={hasError}
 				setHasError={setHasError}
 				canClearSearch={canClearSearch}
-				selectOptions={selectOptions}
+				selectOptions={filterOptions}
 				checkboxConfig={checkboxConfig}
 				defaultTableFilters={{}}
 				breadcrumbs={breadcrumbs}
@@ -136,7 +147,7 @@ export default function LocationTable({
 					hideOnLoading={false}
 					pagination={filter.pagination}
 					rowKey="id"
-					selectOptions={selectOptions}
+					selectOptions={filterOptions}
 					doEmptyRows
 					setShowFilters={setShowFilters}
 					filtersConfig={selectFiltersConfig}
@@ -144,6 +155,8 @@ export default function LocationTable({
 					showFilters={showFilters}
 					defaultFilters={filter.defaultFilters}
 					onChange={filter.onTableChange}
+					app={APP}
+					apiUrl={apiUrl}
 				/>
 			</AdminTable>
 

package/src/@daf/core/components/Screens/Admin/AdminTables/SubjectsTable/helper.js

@@ -1,32 +1,32 @@
-export const selectFiltersConfig = {
-	category: {
-		type: "select",
-		label: "Category",
-		placeholder: (t) => t("Category"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-	country: {
-		type: "select",
-		label: "Country",
-		placeholder: (t) => t("Country"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-	sources: {
-		type: "select",
-		label: "Sources",
-		placeholder: (t) => t("Sources"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-};
+export const getFiltersConfig = ({t}) => {
+    return {
+        country: {
+			type: 'select',
+			placeholder: t('Country'),
+			style: { flex: 1 },
+			labelStyle: { flex: 1 },
+			getLabel: (option) => option.label,
+			getValue: (option) => option.value,
+		},
+		category:{
+			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,
+		}
+	}
+}
+
+export const getFilterOptions = (options, t) => {
+	const { countries, category, categoriesOptions } = options || {};
+	return {
+		country: countries || [],
+		category: categoriesOptions || category || [],
+	}
+}
 
 export const filtersConfig = {
 	name: "",

package/src/@daf/core/components/Screens/Admin/AdminTables/SubjectsTable/index.jsx

@@ -5,7 +5,8 @@ import DAFTable from "../../../../Table/index.jsx";
 import { theme, Tag, message } from "antd";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import {
-	selectFiltersConfig,
+	getFiltersConfig,
+	getFilterOptions,
 	filtersConfig,
 	defaultUrlParams,
 	checkboxConfig,
@@ -33,6 +34,8 @@ export default function SubjectsTable({
 	refetchTrigger,
 	user,
 	options,
+	APP,
+	apiUrl
 }) {
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
@@ -40,6 +43,14 @@ export default function SubjectsTable({
 	const { token } = useToken();
 	const [isCombineModalOpen, setIsModalOpen] = useState(false);
 
+	const selectFiltersConfig = useMemo(() => {
+		return getFiltersConfig({t});
+	}, [t]);
+
+	const filterOptions = useMemo(() => {
+		return getFilterOptions(options, t);
+	}, [options, t]);
+
 	const {
 		filter,
 		activeTab,
@@ -104,7 +115,7 @@ export default function SubjectsTable({
 				hasError={hasError}
 				setHasError={setHasError}
 				canClearSearch={canClearSearch}
-				selectOptions={selectOptions}
+				selectOptions={filterOptions}
 				checkboxConfig={checkboxConfig}
 				defaultTableFilters={{}}
 				breadcrumbs={breadcrumbs}
@@ -133,7 +144,7 @@ export default function SubjectsTable({
 					hideOnLoading={false}
 					pagination={filter.pagination}
 					rowKey="id"
-					selectOptions={selectOptions}
+					selectOptions={filterOptions}
 					doEmptyRows
 					setShowFilters={setShowFilters}
 					filtersConfig={selectFiltersConfig}
@@ -141,6 +152,8 @@ export default function SubjectsTable({
 					showFilters={showFilters}
 					defaultFilters={filter.defaultFilters}
 					onChange={filter.onTableChange}
+					app={APP}
+					apiUrl={apiUrl}
 				/>
 			</AdminTable>
 

package/src/@daf/core/components/Screens/Admin/AdminTables/hook.js

@@ -124,6 +124,7 @@ export const useGetParams = ({location}) => {
 			...(Object.keys(rest)?.length > 0 && rest ),
 			...(Object.keys(cleanSearchParams)?.length > 0 && { search: cleanSearchParams }),
 			tab: activeTab,
+			...(activeTab === "deleted" && {status: 'deleted'})
 		}
 	}, [location.search]);