datastake-daf 0.6.347 → 0.6.349

package/dist/components/index.js

@@ -55634,7 +55634,8 @@ const getColumns$2 = ({
   token,
   selectedLocations,
   setSelectedLocations,
-  selectOptions
+  selectOptions,
+  entity
 }) => {
   const cols = [{
     title: "",
@@ -55735,7 +55736,7 @@ const getColumns$2 = ({
     dataIndex: "administrativeLevel1",
     key: "administrativeLevel1",
     ellipsis: true,
-    show: true,
+    show: entity.includes("locations"),
     render: (value, all) => {
       if (all.empty) {
         return /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -55757,7 +55758,7 @@ const getColumns$2 = ({
     title: t("Territory"),
     dataIndex: "administrativeLevel2",
     key: "administrativeLevel2",
-    show: true,
+    show: entity.includes("locations"),
     ellipsis: true,
     render: (value, all) => {
       if (all.empty) {
@@ -55822,7 +55823,7 @@ const getColumns$2 = ({
     title: "",
     dataIndex: "actions",
     key: "actions",
-    width: 70,
+    width: 60,
     show: true,
     render: (value, all) => {
       if (all.empty) {
@@ -55849,12 +55850,14 @@ const getColumns$2 = ({
 const getColumns$1 = ({
   t,
   selectOptions,
-  module
+  module,
+  entity
 }) => {
   return [{
     title: t("admin::organisation_id"),
     dataIndex: "datastakeId",
     key: "datastakeId",
+    show: true,
     render: (value, all) => {
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: value,
@@ -55865,6 +55868,7 @@ const getColumns$1 = ({
     title: t("Name"),
     dataIndex: "name",
     key: "name",
+    show: true,
     render: (value, all) => {
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: value,
@@ -55875,6 +55879,7 @@ const getColumns$1 = ({
     title: t("Category"),
     dataIndex: "category",
     key: "category",
+    show: true,
     render: (value, all) => {
       const label = findOptions(value, selectOptions?.category);
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
@@ -55886,6 +55891,7 @@ const getColumns$1 = ({
     title: t("Country"),
     dataIndex: "country",
     key: "country",
+    show: true,
     render: (value, all) => {
       const label = findOptions(value, selectOptions?.country);
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
@@ -55898,7 +55904,7 @@ const getColumns$1 = ({
     dataIndex: "administrativeLevel1",
     key: "administrativeLevel1",
     ellipsis: true,
-    show: true,
+    show: entity.includes("locations"),
     render: (value, all) => {
       let label;
       if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
@@ -55915,6 +55921,7 @@ const getColumns$1 = ({
     title: t("Territory"),
     dataIndex: "administrativeLevel2",
     key: "administrativeLevel2",
+    show: entity.includes("locations"),
     render: (value, all) => {
       let label;
       if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
@@ -55927,7 +55934,7 @@ const getColumns$1 = ({
         children: label || '-'
       });
     }
-  }];
+  }].filter(c => c?.show);
 };
 
 const {
@@ -55940,7 +55947,8 @@ function CombineLocationModal({
   onSuccess,
   selectedLocations,
   selectOptions,
-  module
+  module,
+  entity
 }) {
   const {
     token
@@ -55952,9 +55960,10 @@ function CombineLocationModal({
       t,
       selectOptions,
       module,
-      selectedLocations
+      selectedLocations,
+      entity
     });
-  }, [selectedLocations, t, selectOptions, module]);
+  }, [selectedLocations, t, selectOptions, module, entity]);
   const onSubmit = () => {
     MainForm.validateFields().then(data => {
       const ids = selectedLocations.map(location => location._id);
@@ -55973,6 +55982,13 @@ function CombineLocationModal({
     width: 1100,
     disabled: isDisabled,
     destroyOnClose: true,
+    onValuesChange: () => {
+      setIsDisabled(() => {
+        const values = MainForm.getFieldsValue();
+        const requiredFields = entity === "location" ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"] : ["id", "name", "category", "country"];
+        return requiredFields.some(field => values[field] === undefined);
+      });
+    },
     children: [/*#__PURE__*/jsxRuntime.jsxs(Container, {
       children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
         className: "daf-table-wrapper no-pagination",
@@ -56051,32 +56067,34 @@ function CombineLocationModal({
             }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value)),
             placeholder: t("admin::country")
           })
-        }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-          className: "flex-1",
-          name: "administrativeLevel1",
-          children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-            placeholder: t("Province"),
-            options: selectedLocations.map(location => {
-              const _data = getNameByLevel(location?.linking?.SCL, "level_1");
-              return {
-                label: _data?.name || "-",
-                value: _data?.id || "-"
-              };
-            }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value))
-          })
-        }), /*#__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 = getNameByLevel(location?.linking?.SCL, "level_2");
-              return {
-                label: _data?.name || "-",
-                value: _data?.id || "-"
-              };
-            }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value))
-          })
+        }), entity.includes("locations") && /*#__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: selectedLocations.map(location => {
+                const _data = getNameByLevel(location?.linking?.SCL, "level_1");
+                return {
+                  label: _data?.name || "-",
+                  value: _data?.id || "-"
+                };
+              }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value))
+            })
+          }), /*#__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 = getNameByLevel(location?.linking?.SCL, "level_2");
+                return {
+                  label: _data?.name || "-",
+                  value: _data?.id || "-"
+                };
+              }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value))
+            })
+          })]
         })]
       })]
     }), /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -56155,9 +56173,10 @@ function LocationTable(_ref) {
       selectedLocations,
       setSelectedLocations,
       getRedirectLink,
-      selectOptions
+      selectOptions,
+      entity: headerTitle
     });
-  }, [t, goTo, module, token, selectedLocations, getRedirectLink, selectOptions]);
+  }, [t, goTo, module, token, selectedLocations, getRedirectLink, selectOptions, headerTitle]);
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/*#__PURE__*/jsxRuntime.jsxs(AdminTable, {
       filters: filter,
@@ -56234,7 +56253,8 @@ function LocationTable(_ref) {
       },
       selectedLocations: selectedLocations,
       selectOptions: selectOptions || {},
-      module: module
+      module: module,
+      entity: headerTitle
     })]
   });
 }

package/package.json

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

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineLocation/helper.js

@@ -2,12 +2,13 @@ import { findOptions } from "../../../../../../../helpers/StringHelper.js";
 import { Tooltip } from "antd";
 import { getNameByLevel } from "../../AdminTables/LocationTable/helper.js";
 
-export const getColumns = ({ t, selectOptions, module }) => {
+export const getColumns = ({ t, selectOptions, module, entity }) => {
 	return [
 		{
 			title: t("admin::organisation_id"),
 			dataIndex: "datastakeId",
 			key: "datastakeId",
+			show: true,
 			render: (value, all) => {
 				return <Tooltip title={value}>{value}</Tooltip>;
 			},
@@ -16,6 +17,7 @@ export const getColumns = ({ t, selectOptions, module }) => {
 			title: t("Name"),
 			dataIndex: "name",
 			key: "name",
+			show: true,
 			render: (value, all) => {
 				return <Tooltip title={value}>{value}</Tooltip>;
 			},
@@ -24,6 +26,7 @@ export const getColumns = ({ t, selectOptions, module }) => {
 			title: t("Category"),
 			dataIndex: "category",
 			key: "category",
+			show: true,
 			render: (value, all) => {
 				const label = findOptions(value, selectOptions?.category);
 				return <Tooltip title={label}>{label}</Tooltip>;
@@ -33,6 +36,7 @@ export const getColumns = ({ t, selectOptions, module }) => {
 			title: t("Country"),
 			dataIndex: "country",
 			key: "country",
+			show: true,
 			render: (value, all) => {
 				const label = findOptions(value, selectOptions?.country);
 				return <Tooltip title={label}>{label}</Tooltip>;
@@ -43,7 +47,7 @@ export const getColumns = ({ t, selectOptions, module }) => {
 			dataIndex: "administrativeLevel1",
 			key: "administrativeLevel1",
 			ellipsis: true,
-			show: true,
+			show: entity.includes("locations"),
 			render: (value, all) => {
 				let label;
 				if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
@@ -59,6 +63,7 @@ export const getColumns = ({ t, selectOptions, module }) => {
 			title: t("Territory"),
 			dataIndex: "administrativeLevel2",
 			key: "administrativeLevel2",
+			show: entity.includes("locations"),
 			render: (value, all) => {
 				let label;
 				if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
@@ -70,5 +75,5 @@ export const getColumns = ({ t, selectOptions, module }) => {
 				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
 			},
 		},
-	];
+	].filter((c) => c?.show);
 };

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineLocation/index.jsx

@@ -17,6 +17,7 @@ export default function CombineLocationModal({
 	selectedLocations,
 	selectOptions,
 	module,
+	entity,
 }) {
 	const { token } = useToken();
 	const [MainForm] = Form.useForm();
@@ -28,8 +29,9 @@ export default function CombineLocationModal({
 			selectOptions,
 			module,
 			selectedLocations,
+			entity,
 		});
-	}, [selectedLocations, t, selectOptions, module]);
+	}, [selectedLocations, t, selectOptions, module, entity]);
 
 	const onSubmit = () => {
 		MainForm.validateFields().then((data) => {
@@ -51,6 +53,18 @@ export default function CombineLocationModal({
 			width={1100}
 			disabled={isDisabled}
 			destroyOnClose={true}
+			onValuesChange={() => {
+				setIsDisabled(() => {
+				  const values = MainForm.getFieldsValue();
+			  
+				  const requiredFields =
+					entity === "location"
+					  ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"]
+					  : ["id", "name", "category", "country"];
+			  
+				  return requiredFields.some((field) => values[field] === undefined);
+				});
+			  }}
 		>
 			<Container>
 				<div className="daf-table-wrapper no-pagination">
@@ -155,37 +169,45 @@ export default function CombineLocationModal({
 						></Select>
 					</Form.Item>
 
-					<Form.Item className="flex-1" name="administrativeLevel1">
-						<Select
+					{entity.includes("locations") && (
+						<>
+						<Form.Item className="flex-1" name="administrativeLevel1">
+							<Select
 							placeholder={t("Province")}
-							options={selectedLocations.map((location) => {
+							options={selectedLocations
+								.map((location) => {
 								const _data = getNameByLevel(location?.linking?.SCL, "level_1");
 								return {
 									label: _data?.name || "-",
 									value: _data?.id || "-",
-								}
-							}).filter(
+								};
+								})
+								.filter(
 								(option, index, self) =>
 									index === self.findIndex((o) => o.value === option.value),
-							)}
-						></Select>
-					</Form.Item>
+								)}
+							/>
+						</Form.Item>
 
-					<Form.Item className="flex-1" name="administrativeLevel2">
-						<Select
+						<Form.Item className="flex-1" name="administrativeLevel2">
+							<Select
 							placeholder={t("Territory")}
-							options={selectedLocations.map((location) => {
+							options={selectedLocations
+								.map((location) => {
 								const _data = getNameByLevel(location?.linking?.SCL, "level_2");
 								return {
 									label: _data?.name || "-",
 									value: _data?.id || "-",
-								}
-							}).filter(
+								};
+								})
+								.filter(
 								(option, index, self) =>
 									index === self.findIndex((o) => o.value === option.value),
-							)}
-						></Select>
-					</Form.Item>
+								)}
+							/>
+						</Form.Item>
+						</>
+					)}
 				</Form>
 			</Container>
 			<div style={{ height: 57 }} />

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

@@ -460,6 +460,7 @@ export const Primary = {
 		loading: false,
 		isMobile: true,
 		module: "tif",
+		headerTitle: "locations",
 		config: {
 			options: {
 				countries: [

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

@@ -77,6 +77,7 @@ export const getColumns = ({
 	selectedLocations,
 	setSelectedLocations,
 	selectOptions,
+	entity,
 }) => {
 	const cols = [
 		{
@@ -173,7 +174,7 @@ export const getColumns = ({
 			dataIndex: "administrativeLevel1",
 			key: "administrativeLevel1",
 			ellipsis: true,
-			show: true,
+			show: entity.includes("locations"),
 			render: (value, all) => {
 				if (all.empty) {
 					return <div className="daf-default-cell" />;
@@ -193,7 +194,7 @@ export const getColumns = ({
 			title: t("Territory"),
 			dataIndex: "administrativeLevel2",
 			key: "administrativeLevel2",
-			show: true,
+			show: entity.includes("locations"),
 			ellipsis: true,
 			render: (value, all) => {
 				if (all.empty) {
@@ -263,7 +264,7 @@ export const getColumns = ({
 			title: "",
 			dataIndex: "actions",
 			key: "actions",
-			width: 70,
+			width: 60,
 			show: true,
 			render: (value, all) => {
 				if (all.empty) {

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

@@ -80,8 +80,9 @@ export default function LocationTable({
 			setSelectedLocations,
 			getRedirectLink,
 			selectOptions,
+			entity: headerTitle
 		});
-	}, [t, goTo, module, token, selectedLocations, getRedirectLink, selectOptions]);
+	}, [t, goTo, module, token, selectedLocations, getRedirectLink, selectOptions, headerTitle]);
 
 	return (
 		<>
@@ -172,6 +173,7 @@ export default function LocationTable({
 				selectedLocations={selectedLocations}
 				selectOptions={selectOptions || {}}
 				module={module}
+				entity={headerTitle}
 			/>
 		</>
 	);