datastake-daf 0.6.318 → 0.6.319

package/.env

@@ -0,0 +1,8 @@
+REACT_APP_API_KEY=
+REACT_APP_AUTH_DOMAIN=
+REACT_APP_PROJECT_ID=
+REACT_APP_STORAGE_BUCKED=
+REACT_APP_SENDER_ID=
+REACT_APP_APP_ID=
+REACT_APP_MEASUREMENT_ID=
+REACT_APP_VAPID_KEY=

package/.vscode/settings.json

@@ -0,0 +1,13 @@
+{
+	"cSpell.words": ["cukura"],
+	"files.autoSave": "afterDelay",
+	"editor.wordWrap": "on",
+	"editor.autoClosingBrackets": "always",
+	"editor.autoClosingComments": "always",
+	"editor.autoClosingQuotes": "always",
+	"editor.defaultFormatter": "esbenp.prettier-vscode",
+	"editor.formatOnPaste": true,
+	"editor.formatOnSave": true,
+	"notebook.defaultFormatter": "esbenp.prettier-vscode",
+	"javascript.format.semicolons": "insert"
+}

package/dist/components/index.js

@@ -12666,7 +12666,7 @@ const {
   Paragraph: Paragraph$1
 } = antd.Typography;
 const checkHasActiveFilterValues = filtersConfig => {
-  if (!(filtersConfig !== null && filtersConfig !== void 0 && filtersConfig.filtersConfig) || !(filtersConfig !== null && filtersConfig !== void 0 && filtersConfig.selectedFilters)) return false;
+  if (!filtersConfig?.filtersConfig || !filtersConfig?.selectedFilters) return false;
   const filterConfigKeys = Object.keys(filtersConfig.filtersConfig);
   const selectedFilters = filtersConfig.selectedFilters;
   return filterConfigKeys.some(key => {
@@ -12674,28 +12674,27 @@ const checkHasActiveFilterValues = filtersConfig => {
     return value !== undefined && value !== null && value !== "";
   });
 };
-const useHeader = _ref => {
-  let {
-    title = "",
-    tooltip = "",
-    supportText = "",
-    tags = [],
-    actionButtons: _actionButtons = [],
-    titleTooltip,
-    className,
-    addedHeader = null,
-    addedHeaderFirst,
-    extraButtons: _extraButtons = [],
-    onDownload,
-    downloadDisabled,
-    goBackTo,
-    loading,
-    renderExtraComponents,
-    app = "",
-    isViewMode = false,
-    filtersConfig = {}
-  } = _ref;
-  const hasActiveFilterValues = React.useMemo(() => checkHasActiveFilterValues(filtersConfig), [filtersConfig === null || filtersConfig === void 0 ? void 0 : filtersConfig.filtersConfig, filtersConfig === null || filtersConfig === void 0 ? void 0 : filtersConfig.selectedFilters]);
+const useHeader = ({
+  title = "",
+  tooltip = "",
+  supportText = "",
+  tags = [],
+  actionButtons: _actionButtons = [],
+  titleTooltip,
+  className,
+  addedHeader = null,
+  addedHeaderFirst,
+  extraButtons: _extraButtons = [],
+  onDownload,
+  downloadDisabled,
+  goBackTo,
+  loading,
+  renderExtraComponents,
+  app = "",
+  isViewMode = false,
+  filtersConfig = {}
+}) => {
+  const hasActiveFilterValues = React.useMemo(() => checkHasActiveFilterValues(filtersConfig), [filtersConfig?.filtersConfig, filtersConfig?.selectedFilters]);
   const [showFilters, setShowFilters] = React.useState(() => checkHasActiveFilterValues(filtersConfig));
   const hasFilters = filtersConfig && Object.keys(filtersConfig).length > 0;
   React.useEffect(() => {
@@ -12738,9 +12737,9 @@ const useHeader = _ref => {
   const buttonCont = React.useRef();
   const [mainContWidth, setMainContWidth] = React.useState(600);
   const [buttonContWidth, setButtonContWidth] = React.useState(0);
-  const hasSupportText = !!(supportText !== null && supportText !== void 0 && supportText.length);
-  const hasTags = !!(tags !== null && tags !== void 0 && tags.length);
-  const hasButtons = !!(actionButtons !== null && actionButtons !== void 0 && actionButtons.length || extraButtons !== null && extraButtons !== void 0 && extraButtons.length);
+  const hasSupportText = !!supportText?.length;
+  const hasTags = !!tags?.length;
+  const hasButtons = !!(actionButtons?.length || extraButtons?.length);
   React.useEffect(() => {
     const mainContObserver = new ResizeObserver(entries => {
       const _mainEntry = entries[0];
@@ -19093,7 +19092,11 @@ function Map$3(_ref) {
     siderTitle = "Mine Description",
     renderTooltip = () => [],
     renderTooltipTags = () => {},
-    mapConfig = {},
+    mapConfig = {
+      maxZoom: 18,
+      center: [13, -15],
+      zoom: 5
+    },
     emptyDescriptionText = "No description provided",
     tooltipAsText = false,
     primaryLink = false,
@@ -34533,6 +34536,7 @@ const EditForm = _ref => {
         }, id);
     }
   };
+  console.log("values", values);
   return /*#__PURE__*/jsxRuntime.jsxs(EditProvider, {
     t: t,
     isReview: isReview,

package/package.json

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

package/src/@daf/core/components/Dashboard/Map/index.jsx

@@ -103,7 +103,7 @@ function Map({
 	siderTitle = "Mine Description",
 	renderTooltip = () => [],
 	renderTooltipTags = () => {},
-	mapConfig = {},
+	mapConfig = { maxZoom: 18, center: [13, -15], zoom: 5 },
 	emptyDescriptionText = "No description provided",
 	tooltipAsText = false,
 	primaryLink = false,
@@ -134,7 +134,7 @@ function Map({
 		t,
 		app,
 		renderTooltip,
-    renderTooltipTags,
+		renderTooltipTags,
 		onClickLink,
 		link,
 		mapConfig,

package/src/@daf/core/components/DynamicForm/DynamicForm.stories.js

@@ -1,75 +1,75 @@
 /* eslint-disable react/jsx-filename-extension */
-import './_index.scss';
-import DynamicForm from './index.jsx';
-import ThemeLayout from '../ThemeLayout';
-import { Form } from 'antd';
-import { useCallback, useState } from 'react';
-import { storyData } from './storyConfig.js';
+import "./_index.scss";
+import DynamicForm from "./index.jsx";
+import ThemeLayout from "../ThemeLayout";
+import { Form } from "antd";
+import { useCallback, useState } from "react";
+import { storyData } from "./storyConfig.js";
 // import Modal from '../Modal/index';
 // import { Drawer } from 'antd';
 
 const EForm = () => {
-  const [MainForm] = Form.useForm();
-  const [ajaxForms, setAjaxForms] = useState({});
-  const [ajaxOptions, setAjaxOptions] = useState({});
-  const [open, setOpen] = useState(true);
+	const [MainForm] = Form.useForm();
+	const [ajaxForms, setAjaxForms] = useState({});
+	const [ajaxOptions, setAjaxOptions] = useState({});
+	const [open, setOpen] = useState(true);
 
-  const changeAjaxForms = useCallback((key, value) => {
-    setAjaxForms((prev) => ({ ...prev, [key]: value }));
-  }, []);
+	const changeAjaxForms = useCallback((key, value) => {
+		setAjaxForms((prev) => ({ ...prev, [key]: value }));
+	}, []);
 
-  const changeAjaxOptions = useCallback((key, value) => {
-    setAjaxOptions((prev) => ({ ...prev, [key]: value }));
-  }, []);
+	const changeAjaxOptions = useCallback((key, value) => {
+		setAjaxOptions((prev) => ({ ...prev, [key]: value }));
+	}, []);
 
-  return (
-    <div
-    >
-      <DynamicForm
-        alertErrorsConfig={{
-          country: {
-            message: 'Error Test',
-            onClose: () => alert(1)
-          }
-        }}
-        goTo={() => { }}
-        ajaxForms={ajaxForms}
-        changeAjaxForms={changeAjaxForms}
-        ajaxOptions={ajaxOptions}
-        user={{ language: 'en' }}
-        changeAjaxOptions={changeAjaxOptions}
-        app="sbg"
-        query={null}
-        MainForm={MainForm}
-        form={storyData.form}
-        data={storyData.data}
-        getAppHeader={storyData.getAppHeader}
-        getApiBaseUrl={storyData.getApiBaseUrl}
-        submit={() => {
-          setOpen(false)
-        }}
-        staticWidth="720px"
-      />
-    </div>
-  )
-}
+	return (
+		<div>
+			<DynamicForm
+				alertErrorsConfig={{
+					country: {
+						message: "Error Test",
+						onClose: () => alert(1),
+					},
+				}}
+				goTo={() => {}}
+				ajaxForms={ajaxForms}
+				changeAjaxForms={changeAjaxForms}
+				ajaxOptions={ajaxOptions}
+				user={{ language: "en" }}
+				changeAjaxOptions={changeAjaxOptions}
+				app="sbg"
+				query={null}
+				MainForm={MainForm}
+				form={storyData.form}
+				data={storyData.data}
+				getAppHeader={storyData.getAppHeader}
+				getApiBaseUrl={storyData.getApiBaseUrl}
+				submit={(payload) => {
+					console.log("submit", payload);
+					setOpen(false);
+				}}
+				staticWidth="720px"
+			/>
+		</div>
+	);
+};
 
 export default {
-  title: 'Form/DynamicForm',
-  component: DynamicForm,
-  tags: ['autodocs'],
-  decorators: [
-    () => (
-      <div style={{ margin: '3em' }}>
-        <ThemeLayout>
-          <EForm />
-        </ThemeLayout>
-      </div>
-    ),
-  ],
-}
+	title: "Form/DynamicForm",
+	component: DynamicForm,
+	tags: ["autodocs"],
+	decorators: [
+		() => (
+			<div style={{ margin: "3em" }}>
+				<ThemeLayout>
+					<EForm />
+				</ThemeLayout>
+			</div>
+		),
+	],
+};
 
 export const Primary = {
-  name: 'Edit Form',
-  args: {},
-}
+	name: "Edit Form",
+	args: {},
+};

package/src/@daf/core/components/DynamicForm/storyConfig.js

@@ -1,7 +1,7 @@
-const getApiBaseUrl = () => "http://192.168.4.64:4020";
+const getApiBaseUrl = () => "http://192.168.4.252:3022";
 
 const getAppHeader = () => ({
-	Application: "sbg",
+	Application: "nashiriki",
 	Language: "en",
 });
 
@@ -12,115 +12,95 @@ export const storyData = {
 		form: {
 			id: "identification",
 			position: 1,
-			date: {
-				_id: "68961d98fb2b209b19efa48d",
-				id: "5dc1382e-5229-448f-9712-0835b6ad5baf",
-				dataId: "date",
+
+			areaOfInfluence: {
+				_id: "68d699bcab72f002b8f04a9e",
+				id: "d9db4b4d-a7bb-43d7-bdeb-e64bb38d41d1",
+				dataId: "areaOfInfluence",
 				section: "identification",
-				type: "date",
+				type: "drawTerritory",
 				meta: {
-					group: "identification",
+					comment: true,
 					notApplicable: false,
 					notAvailable: false,
-					comment: false,
-					versioning: true,
-					mandatory: true,
-					disableEdit: {
-						create: false,
-						edit: true,
-					},
+					mandatory: false,
+					group: "identification",
 				},
-				position: 3,
-				scope: ["modalActivity", "activityInfo", "modalFromMineSection"],
-				label: "Date",
-				createdAt: "2025-08-08T15:54:02.839Z",
-				updatedAt: "2025-08-08T15:54:02.839Z",
+
+				position: 6,
+				description:
+					"The area of influence is the area where actions of this armed group are happening",
+				scope: ["armedGroups", "location", "conflictArea"],
+				label: "Perimeter",
+				createdAt: "2025-09-26T13:48:44.363Z",
+				updatedAt: "2025-09-26T13:48:44.363Z",
 				__v: 0,
 			},
-			mine: {
-				_id: "68961d98fb2b209b19efa493",
-				id: "a17546cc-9bf7-4d6f-b5c9-122349c9a62c",
-				dataId: "mine",
+
+			locationId: {
+				_id: "68d699bcab72f002b8f04ab8",
+				id: "956303f0-7a0f-40e1-ba9d-21df5079a833",
+				dataId: "locationId",
 				section: "identification",
-				type: "dataLink",
+				type: "ajaxSelect",
 				meta: {
-					entity: "Location",
-					namespace: "location",
-					formScope: "activityMine",
-					path: "associatedMine",
-					maxRepeat: 1,
 					comment: false,
-					createUserVersion: false,
-					linkOptions: {
-						global: true,
-					},
 					notApplicable: false,
-					notAvailable: false,
-					automaticLinking: {
-						path: "associatedSubjects",
-						nature: "activity",
-					},
-					ajaxOptionsKey: "id",
-					mandatory: true,
-					versioning: true,
-					disableEdit: {
-						create: false,
-						edit: true,
-					},
-					tableKeys: ["datastakeId", "locationId"],
-					optionsView: {
-						editInputType: "ajaxSelect",
-						editInputKey: "locationId",
-						onViewInputType: "table",
-					},
-					application: "sbg",
-					noAddNew: true,
-					call: 'LOCATION::getOptions({\n    "ownAccount": "true",\n    "category": "mineSite"\n  })::{\n    "label": "name",\n    "name": "name",\n    "value": "_id",\n    "datastakeId": "datastakeId",\n    "gps": "gps",\n    "_id": "_id",\n    "id": "id",\n    "parent": "parent",\n    "administrativeLevel1": "administrativeLevel1",\n    "administrativeLevel2": "administrativeLevel2",\n    "category":"category",\n    "users": "users",\n    "country": "country"\n  }::["datastakeId", "gps", "administrativeLevel1", "administrativeLevel2", "category","parent", "_id"]',
-				},
-				position: 2,
-				scope: ["modalActivity", "activityInfo", "modalFromMineSection"],
-				label: {
-					"scope is modalActivity": "Mine",
-					"scope not modalActivity": "Associated Mine",
-				},
-				createdAt: "2025-08-08T15:54:02.839Z",
-				updatedAt: "2025-08-08T15:54:02.839Z",
-				__v: 0,
-			},
-			type: {
-				_id: "68961d98fb2b209b19efa495",
-				id: "8e421077-c542-46c0-a515-151cf2741f7d",
-				dataId: "type",
-				section: "identification",
-				type: "select",
-				meta: {
+					notAvailable: true,
+					application: "nashiriki",
 					group: "identification",
-					notApplicable: false,
-					notAvailable: false,
-					comment: false,
-					versioning: true,
 					mandatory: true,
-					defaultValue: "visit",
-					disableEdit: {
-						create: false,
-						edit: true,
+					onNewSetValueKey: "name",
+					store: {
+						location: {
+							path: "name",
+							global: true,
+						},
 					},
+					call: 'LOCATION::getOptions({\n    "country": "country",\n    "category": "category",\n    "administrativeLevel1": "administrativeLevel1",\n    "administrativeLevel2": "administrativeLevel2"\n  })::{\n    "label": "name",\n    "value": "_id",\n    "datastakeId": "datastakeId",\n    "gps": "gps",\n    "_id": "_id",\n    "parent": "parent",\n    "administrativeLevel1": "administrativeLevel1",\n    "administrativeLevel2": "administrativeLevel2",\n    "category":"category",\n    "users": "users",\n    "country": "country"\n  }::["datastakeId", "gps", "administrativeLevel1", "administrativeLevel2", "category", "parent", "country", "_id"]',
 				},
-				position: 1,
-				scope: ["modalActivity", "activityInfo"],
-				label: "Type",
-				options: [
+				position: 5,
+				dataLink: {
+					entity: "Location",
+					createUserVersion: true,
+					createNew: true,
+					collection: "nashiriki.global_location",
+					formNamespace: "location",
+					keys: [
+						"name",
+						"country",
+						"category",
+						"administrativeLevel1",
+						"administrativeLevel2",
+					],
+				},
+				rules: [
 					{
-						label: "Visit",
-						value: "visit",
+						required: true,
+						message: "errors::field is required",
 					},
 				],
-				createdAt: "2025-08-08T15:54:04.374Z",
-				updatedAt: "2025-08-08T15:54:04.374Z",
+				scope: [
+					"nashirikiOperatorLocation",
+					"nashirikiWorkerLocation",
+					"modalNashiriki",
+					"locationAssociatedVillage",
+					"locationAssociatedExportTown",
+					"workerPlaceOfBirth",
+					"armedGroups",
+					"locationSupplierTrade",
+					"modal",
+					"location",
+					"conflictArea",
+				],
+				label: "Name of the location",
+				tableLabel: "Name",
+				createdAt: "2025-09-26T13:48:44.502Z",
+				updatedAt: "2025-09-26T13:48:44.502Z",
 				__v: 0,
 			},
 			label: "Identification",
-			subTitle: "Identificación",
+			subTitle: "Identification",
 		},
 	},
 	data: {

package/src/@daf/core/components/EditForm/form.jsx

@@ -560,6 +560,8 @@ export const EditForm = ({
 		}
 	};
 
+	console.log("values", values);
+
 	return (
 		<EditProvider
 			t={t}