datastake-daf 0.6.738 → 0.6.740

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

@@ -5,15 +5,121 @@ export const checkboxConfig = {
 
 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,
+		country: {
+		  type: 'select',
+		  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 },
+		  labelStyle: { flex: 1 },
+		  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,
+		},
+	}
 }
 
 export const filtersConfig = {
@@ -22,9 +128,35 @@ export const filtersConfig = {
 };
 
 export const getFilterOptions = (options, t) => {
-	const { countries } = options || {};
+	const {
+		statusOptions = [],
+		categoryOptions = [],
+		countries = [],
+		subCategory = [],
+		subCategoriesOptions,
+		stakeholderCategoryOptions,
+		stakeholderSubCategoriesOptions,
+		administrativeLevel1,
+		administrativeLevel2,
+	  } = options || {};
+	console.log({options})
+
 	const _default  = {
+		category: stakeholderCategoryOptions || categoryOptions,
 		country: countries,
+		administrativeLevel1,
+		administrativeLevel2,
+		subCategory: subCategoriesOptions,
+		status: [
+			{
+				value: "submitted",
+				label: "Submitted",
+			},
+			{
+				value: "private",
+				label: "Private",
+			},
+		],
 	}
 
 	return _default;

package/src/@daf/pages/dashboards/Operations/Operators/create.jsx

@@ -51,7 +51,7 @@ const StakeholdersCreate = ({
         <div className="daf-create-form">
             <DynamicForm 
                 form={form}
-                data={data}
+                data={{...defaultData, ...data}}
                 showSaveAndNext={false}
                 module={APP}
                 onCancel={onCancel}

package/src/@daf/pages/dashboards/Operations/Operators/index.jsx

@@ -33,6 +33,7 @@ const OperatorsTable = ({
     formValue = {},
     form = {},
     extendingFilters = {},
+    createDefaultValues = {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState();
@@ -61,21 +62,18 @@ const OperatorsTable = ({
     }, [otherParams, extendingFilters])
 
     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 = useMemo(() => {
         return getFiltersConfig({t});
     }, [t]);
@@ -119,6 +117,7 @@ const OperatorsTable = ({
         >
             {({onDrawerClose}) => (
                 <StakeholdersCreate 
+                    defaultData={createDefaultValues}
                     t={t}
                     goTo={goTo}
                     user={user}

package/src/@daf/services/OperatorService.js

@@ -23,7 +23,7 @@ class OperatorService extends BaseService {
 
 	getForm(scope = "create", language = "en") {
 		return this.apiGet({
-			url: `/forms/${namespaceEnums["operators"]}`,
+			url: `/forms/stakeholder`,
 			isApp: true,
 			params: { scope, language },
 		});