datastake-daf 0.6.342 → 0.6.344

package/dist/components/index.js

@@ -54445,7 +54445,8 @@ function useAdminTable({
   filtersConfig,
   getRedirectLink,
   getData,
-  defaultPageSize
+  defaultPageSize,
+  refetchTrigger
 }) {
   const [totalPending, setTotalPending] = React.useState(0);
   const [initFetchDone, setInitFetchDone] = React.useState(false);
@@ -54510,7 +54511,7 @@ function useAdminTable({
     } catch (err) {
       console.log(err);
     }
-  }, [filter.activeFilters]);
+  }, [filter.activeFilters, refetchTrigger]);
   React.useEffect(() => {
     fetchData();
   }, [fetchData]);
@@ -55870,7 +55871,7 @@ const getColumns$1 = ({
       });
     }
   }, {
-    title: t("category"),
+    title: t("Category"),
     dataIndex: "category",
     key: "category",
     render: (value, all) => {
@@ -55881,7 +55882,7 @@ const getColumns$1 = ({
       });
     }
   }, {
-    title: t("country"),
+    title: t("Country"),
     dataIndex: "country",
     key: "country",
     render: (value, all) => {
@@ -55964,7 +55965,7 @@ function CombineLocationModal({
   };
   return /*#__PURE__*/jsxRuntime.jsxs(Modal, {
     open: isOpen,
-    title: t("admin:merge"),
+    title: t("admin::merge"),
     onClose: onClose,
     onSuccess: onSubmit,
     withModalFormWrapper: false,
@@ -55979,7 +55980,7 @@ function CombineLocationModal({
           style: {
             color: token.baseGray90
           },
-          children: t("admin::current_accounts")
+          children: t("admin::current_subjects")
         }), /*#__PURE__*/jsxRuntime.jsx(DAFTable, {
           columns: columns,
           data: selectedLocations,
@@ -56023,7 +56024,7 @@ function CombineLocationModal({
           className: "flex-1",
           name: "name",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
-            placeholder: t("name")
+            placeholder: t("Name")
           })
         }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
           className: "flex-1",
@@ -56035,7 +56036,7 @@ function CombineLocationModal({
                 value: location?.category || "-"
               };
             }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value)),
-            placeholder: t("category")
+            placeholder: t("Category")
           })
         }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
           className: "flex-1",
@@ -56102,7 +56103,8 @@ function LocationTable(_ref) {
     view,
     headerTitle,
     breadcrumbs,
-    mergeSubjectsFunction
+    mergeSubjectsFunction,
+    refetchTrigger
   } = _ref;
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
@@ -56131,7 +56133,8 @@ function LocationTable(_ref) {
     defaultPageSize,
     filtersConfig: filtersConfig$8,
     getRedirectLink,
-    getData
+    getData,
+    refetchTrigger
   });
   const selectOptions = React.useMemo(() => {
     var _config$options, _config$options2;

package/dist/utils/index.js

@@ -7468,7 +7468,8 @@ const en = {
     country: "Country",
     account_type: "Account Type",
     current_accounts: "Current Accounts",
-    merged_output: "Merged Output"
+    merged_output: "Merged Output",
+    current_subjects: "Current Subjects"
   }
 };
 

package/package.json

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

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

@@ -21,7 +21,7 @@ export const getColumns = ({ t, selectOptions, module }) => {
 			},
 		},
 		{
-			title: t("category"),
+			title: t("Category"),
 			dataIndex: "category",
 			key: "category",
 			render: (value, all) => {
@@ -30,7 +30,7 @@ export const getColumns = ({ t, selectOptions, module }) => {
 			},
 		},
 		{
-			title: t("country"),
+			title: t("Country"),
 			dataIndex: "country",
 			key: "country",
 			render: (value, all) => {

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

@@ -44,7 +44,7 @@ export default function CombineLocationModal({
 	return (
 		<Modal
 			open={isOpen}
-			title={t("admin:merge")}
+			title={t("admin::merge")}
 			onClose={onClose}
 			onSuccess={onSubmit}
 			withModalFormWrapper={false}
@@ -60,7 +60,7 @@ export default function CombineLocationModal({
 							color: token.baseGray90,
 						}}
 					>
-						{t("admin::current_accounts")}
+						{t("admin::current_subjects")}
 					</span>
 					<DAFTable
 						columns={columns}
@@ -108,7 +108,7 @@ export default function CombineLocationModal({
 					</Form.Item>
 
 					<Form.Item className="flex-1" name="name">
-						<Input placeholder={t("name")}></Input>
+						<Input placeholder={t("Name")}></Input>
 					</Form.Item>
 
 					<Form.Item className="flex-1" name="category">
@@ -129,7 +129,7 @@ export default function CombineLocationModal({
 									(option, index, self) =>
 										index === self.findIndex((o) => o.value === option.value),
 								)}
-							placeholder={t("category")}
+							placeholder={t("Category")}
 						></Select>
 					</Form.Item>
 

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

@@ -29,6 +29,7 @@ export default function LocationTable({
 	headerTitle,
 	breadcrumbs,
 	mergeSubjectsFunction,
+	refetchTrigger,
 }) {
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
@@ -57,6 +58,7 @@ export default function LocationTable({
 		filtersConfig,
 		getRedirectLink,
 		getData,
+		refetchTrigger,
 	});
 
 	const selectOptions = useMemo(() => {

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

@@ -14,6 +14,7 @@ export function useAdminTable({
 	getRedirectLink,
 	getData,
 	defaultPageSize,
+	refetchTrigger,
 }) {
 	const [totalPending, setTotalPending] = useState(0);
 	const [initFetchDone, setInitFetchDone] = useState(false);
@@ -74,7 +75,7 @@ export function useAdminTable({
 		} catch (err) {
 			console.log(err);
 		}
-	}, [filter.activeFilters]);
+	}, [filter.activeFilters, refetchTrigger]);
 
 	useEffect(() => {
 		fetchData();

package/src/constants/locales/en/translation.js

@@ -1363,6 +1363,7 @@ const en = {
     account_type: "Account Type",
     current_accounts: "Current Accounts",
     merged_output: "Merged Output",
+    current_subjects: "Current Subjects",
   },
 };