datastake-daf 0.6.320 → 0.6.321

package/dist/components/index.js

@@ -12851,8 +12851,8 @@ const useHeader = _ref => {
         })]
       }), addedHeaderFirst ? /*#__PURE__*/jsxRuntime.jsxs("div", {
         className: "flex gap-2",
+        ref: buttonCont,
         children: [addedHeader, hasButtons && /*#__PURE__*/jsxRuntime.jsx("div", {
-          ref: buttonCont,
           children: /*#__PURE__*/jsxRuntime.jsx(Buttons, {
             extraButtons: extraButtons,
             actionButtons: actionButtons
@@ -12860,8 +12860,8 @@ const useHeader = _ref => {
         })]
       }) : /*#__PURE__*/jsxRuntime.jsxs("div", {
         className: "flex gap-2",
+        ref: buttonCont,
         children: [hasButtons && /*#__PURE__*/jsxRuntime.jsx("div", {
-          ref: buttonCont,
           children: /*#__PURE__*/jsxRuntime.jsx(Buttons, {
             extraButtons: extraButtons,
             actionButtons: actionButtons
@@ -19093,11 +19093,7 @@ function Map$3(_ref) {
     siderTitle = "Mine Description",
     renderTooltip = () => [],
     renderTooltipTags = () => {},
-    mapConfig = {
-      maxZoom: 18,
-      center: [13, -15],
-      zoom: 5
-    },
+    mapConfig = {},
     emptyDescriptionText = "No description provided",
     tooltipAsText = false,
     primaryLink = false,
@@ -34537,7 +34533,6 @@ const EditForm = _ref => {
         }, id);
     }
   };
-  console.log("values", values);
   return /*#__PURE__*/jsxRuntime.jsxs(EditProvider, {
     t: t,
     isReview: isReview,
@@ -50198,7 +50193,6 @@ const Style$g = dt.div`
 		display: flex;
 		justify-content: space-between;
 		align-items: space-between;
-		${"" /* height: ${props => props.height || '300px'}; */}
 
 		.weekDay {
 			width: 16px;
@@ -50218,7 +50212,6 @@ const Style$g = dt.div`
 				overflow: hidden;
 				.event {
 					width: 100%;
-					${"" /* background: blue; */}
 					border-radius: 2px;
 					z-index: 1;
 					margin-top: 2px;
@@ -50245,6 +50238,30 @@ const Style$g = dt.div`
 		}
 	}
 `;
+const StyleWrapper = dt.div`
+	.legend {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 12px;
+		margin-top: 12px;
+		font-size: 12px;
+		color: #333;
+		justify-content: center;
+
+		.legend-item {
+			display: flex;
+			align-items: center;
+			gap: 6px;
+
+			.legend-color {
+				width: 12px;
+				height: 12px;
+				border-radius: 2px;
+				display: inline-block;
+			}
+		}
+	}
+`;
 dt.div`
 	width: 200px;
 	display: flex;
@@ -50428,7 +50445,9 @@ function StackChart(_ref) {
     doConstraints = true,
     colors,
     valueField = "value",
-    height = 300
+    height = 300,
+    isPdf = false,
+    t = s => s
   } = _ref;
   const ref = React__default["default"].useRef();
   const {
@@ -50556,34 +50575,53 @@ function StackChart(_ref) {
       }));
     }
   }, [hoveredGroup]);
-  return /*#__PURE__*/jsxRuntime.jsxs(Style$g, _objectSpread2(_objectSpread2({}, isEmpty ? {
-    onMouseEnter: () => {
-      setHoveredGroup({
-        id: 0
-      });
-    },
-    onMouseLeave: () => {
-      setHoveredGroup(null);
-    },
-    onMouseMove: e => onMouseLeaveHandler(e, {}, 0)
-  } : {}), {}, {
-    className: formatClassname(["riskProfile", className]),
-    ref: ref,
-    style: {
-      height: "".concat(height, "px")
-    },
-    children: [typeof renderTooltip === "function" && !isEmpty ? hoveredGroup !== null ? renderTooltip({
-      mouseX,
-      mouseY,
-      item: hoveredGroup
-    }) : null : null, /*#__PURE__*/jsxRuntime.jsx("div", {
-      className: "timeline",
+  return /*#__PURE__*/jsxRuntime.jsxs(StyleWrapper, {
+    children: [/*#__PURE__*/jsxRuntime.jsxs(Style$g, _objectSpread2(_objectSpread2({}, isEmpty ? {
+      onMouseEnter: () => {
+        setHoveredGroup({
+          id: 0
+        });
+      },
+      onMouseLeave: () => {
+        setHoveredGroup(null);
+      },
+      onMouseMove: e => onMouseLeaveHandler(e, {}, 0)
+    } : {}), {}, {
+      className: formatClassname(["riskProfile", className]),
+      ref: ref,
       style: {
         height: "".concat(height, "px")
       },
-      children: content()
+      children: [typeof renderTooltip === "function" && !isEmpty ? hoveredGroup !== null ? renderTooltip({
+        mouseX,
+        mouseY,
+        item: hoveredGroup
+      }) : null : null, /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "timeline",
+        style: {
+          height: "".concat(height, "px")
+        },
+        children: content()
+      })]
+    })), isPdf && /*#__PURE__*/jsxRuntime.jsx("div", {
+      className: "legend",
+      children: Object.entries(seriesColors).map(_ref4 => {
+        let [series, color] = _ref4;
+        return /*#__PURE__*/jsxRuntime.jsxs("div", {
+          className: "legend-item",
+          children: [/*#__PURE__*/jsxRuntime.jsx("span", {
+            className: "legend-color",
+            style: {
+              backgroundColor: color || token.colorPrimary7
+            }
+          }), /*#__PURE__*/jsxRuntime.jsx("span", {
+            className: "legend-label",
+            children: t(series)
+          })]
+        }, series);
+      })
     })]
-  }));
+  });
 }
 
 const _excluded$3 = ["data", "xFieldKey", "yFieldKey", "seriesField", "renderTooltipContent", "tooltipConfig", "animated", "color", "formattedYAxis", "formattedXAxis", "fillOpacity", "height", "t", "isPdf", "extraLegendConfig", "width"];

package/package.json

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

package/src/@daf/core/components/Charts/StackChart/StackChart.stories.jsx

@@ -417,6 +417,7 @@ export const WithCustomObject = {
 			social: "#864dd7",
 			environmental: "#f9b836",
 		},
+		isPdf: true,
 	},
 	render: (args) => {
 		return <StackChart {...args} />;

package/src/@daf/core/components/Charts/StackChart/classes.js

@@ -4,7 +4,6 @@ export const Style = styled.div`
 		display: flex;
 		justify-content: space-between;
 		align-items: space-between;
-		${"" /* height: ${props => props.height || '300px'}; */}
 
 		.weekDay {
 			width: 16px;
@@ -24,7 +23,6 @@ export const Style = styled.div`
 				overflow: hidden;
 				.event {
 					width: 100%;
-					${"" /* background: blue; */}
 					border-radius: 2px;
 					z-index: 1;
 					margin-top: 2px;
@@ -52,6 +50,31 @@ export const Style = styled.div`
 	}
 `;
 
+export const StyleWrapper = styled.div`
+	.legend {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 12px;
+		margin-top: 12px;
+		font-size: 12px;
+		color: #333;
+		justify-content: center;
+
+		.legend-item {
+			display: flex;
+			align-items: center;
+			gap: 6px;
+
+			.legend-color {
+				width: 12px;
+				height: 12px;
+				border-radius: 2px;
+				display: inline-block;
+			}
+		}
+	}
+`;
+
 export const EventsTooltip = styled.div`
 	width: 200px;
 	display: flex;

package/src/@daf/core/components/Charts/StackChart/index.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Style } from "./classes.js";
+import { Style, StyleWrapper } from "./classes.js";
 import { formatClassname } from "../../../../../helpers/ClassesHelper";
 import { Popover, theme } from "antd";
 import { renderTooltipJsx as renderDafTooltip } from "../../../../utils/tooltip.js";
@@ -83,6 +83,8 @@ export default function StackChart({
 	colors,
 	valueField = "value",
 	height = 300,
+	isPdf = false,
+	t = (s) => s,
 }) {
 	const ref = React.useRef();
 	const { token } = useToken();
@@ -228,6 +230,7 @@ export default function StackChart({
 	);
 
 	return (
+		<StyleWrapper>
 		<Style
 			{...(isEmpty
 				? {
@@ -255,5 +258,19 @@ export default function StackChart({
 				{content()}
 			</div>
 		</Style>
+			{isPdf && (
+				<div className="legend">
+					{Object.entries(seriesColors).map(([series, color]) => (
+						<div key={series} className="legend-item">
+							<span
+								className="legend-color"
+								style={{ backgroundColor: color || token.colorPrimary7 }}
+							/>
+							<span className="legend-label">{t(series)}</span>
+						</div>
+					))}
+				</div>
+			)}
+		</StyleWrapper>
 	);
 }

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

@@ -103,7 +103,7 @@ function Map({
 	siderTitle = "Mine Description",
 	renderTooltip = () => [],
 	renderTooltipTags = () => {},
-	mapConfig = { maxZoom: 18, center: [13, -15], zoom: 5 },
+	mapConfig = {},
 	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={(payload) => {
-					console.log("submit", payload);
-					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={() => {
+          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.252:3022";
+const getApiBaseUrl = () => "http://192.168.4.64:4020";
 
 const getAppHeader = () => ({
-	Application: "nashiriki",
+	Application: "sbg",
 	Language: "en",
 });
 
@@ -12,95 +12,115 @@ export const storyData = {
 		form: {
 			id: "identification",
 			position: 1,
-
-			areaOfInfluence: {
-				_id: "68d699bcab72f002b8f04a9e",
-				id: "d9db4b4d-a7bb-43d7-bdeb-e64bb38d41d1",
-				dataId: "areaOfInfluence",
+			date: {
+				_id: "68961d98fb2b209b19efa48d",
+				id: "5dc1382e-5229-448f-9712-0835b6ad5baf",
+				dataId: "date",
 				section: "identification",
-				type: "drawTerritory",
+				type: "date",
 				meta: {
-					comment: true,
+					group: "identification",
 					notApplicable: false,
 					notAvailable: false,
-					mandatory: false,
-					group: "identification",
+					comment: false,
+					versioning: true,
+					mandatory: true,
+					disableEdit: {
+						create: false,
+						edit: true,
+					},
 				},
-
-				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",
+				position: 3,
+				scope: ["modalActivity", "activityInfo", "modalFromMineSection"],
+				label: "Date",
+				createdAt: "2025-08-08T15:54:02.839Z",
+				updatedAt: "2025-08-08T15:54:02.839Z",
 				__v: 0,
 			},
-
-			locationId: {
-				_id: "68d699bcab72f002b8f04ab8",
-				id: "956303f0-7a0f-40e1-ba9d-21df5079a833",
-				dataId: "locationId",
+			mine: {
+				_id: "68961d98fb2b209b19efa493",
+				id: "a17546cc-9bf7-4d6f-b5c9-122349c9a62c",
+				dataId: "mine",
 				section: "identification",
-				type: "ajaxSelect",
+				type: "dataLink",
 				meta: {
+					entity: "Location",
+					namespace: "location",
+					formScope: "activityMine",
+					path: "associatedMine",
+					maxRepeat: 1,
 					comment: false,
+					createUserVersion: false,
+					linkOptions: {
+						global: true,
+					},
 					notApplicable: false,
-					notAvailable: true,
-					application: "nashiriki",
-					group: "identification",
+					notAvailable: false,
+					automaticLinking: {
+						path: "associatedSubjects",
+						nature: "activity",
+					},
+					ajaxOptionsKey: "id",
 					mandatory: true,
-					onNewSetValueKey: "name",
-					store: {
-						location: {
-							path: "name",
-							global: true,
-						},
+					versioning: true,
+					disableEdit: {
+						create: false,
+						edit: true,
+					},
+					tableKeys: ["datastakeId", "locationId"],
+					optionsView: {
+						editInputType: "ajaxSelect",
+						editInputKey: "locationId",
+						onViewInputType: "table",
 					},
-					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"]',
+					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: 5,
-				dataLink: {
-					entity: "Location",
-					createUserVersion: true,
-					createNew: true,
-					collection: "nashiriki.global_location",
-					formNamespace: "location",
-					keys: [
-						"name",
-						"country",
-						"category",
-						"administrativeLevel1",
-						"administrativeLevel2",
-					],
+				position: 2,
+				scope: ["modalActivity", "activityInfo", "modalFromMineSection"],
+				label: {
+					"scope is modalActivity": "Mine",
+					"scope not modalActivity": "Associated Mine",
 				},
-				rules: [
+				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: {
+					group: "identification",
+					notApplicable: false,
+					notAvailable: false,
+					comment: false,
+					versioning: true,
+					mandatory: true,
+					defaultValue: "visit",
+					disableEdit: {
+						create: false,
+						edit: true,
+					},
+				},
+				position: 1,
+				scope: ["modalActivity", "activityInfo"],
+				label: "Type",
+				options: [
 					{
-						required: true,
-						message: "errors::field is required",
+						label: "Visit",
+						value: "visit",
 					},
 				],
-				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",
+				createdAt: "2025-08-08T15:54:04.374Z",
+				updatedAt: "2025-08-08T15:54:04.374Z",
 				__v: 0,
 			},
 			label: "Identification",
-			subTitle: "Identification",
+			subTitle: "Identificación",
 		},
 	},
 	data: {

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

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

package/src/@daf/core/components/Header/hook.js

@@ -243,10 +243,10 @@ export const useHeader = ({
 				</div>
 
 				{addedHeaderFirst ? (
-					<div className="flex gap-2">
+					<div className="flex gap-2" ref={buttonCont}>
 						{addedHeader}
 						{hasButtons && (
-							<div ref={buttonCont}>
+							<div>
 								<Buttons
 									extraButtons={extraButtons}
 									actionButtons={actionButtons}
@@ -255,9 +255,9 @@ export const useHeader = ({
 						)}
 					</div>
 				) : (
-					<div className="flex gap-2">
+					<div className="flex gap-2" ref={buttonCont}>
 						{hasButtons && (
-							<div ref={buttonCont}>
+							<div>
 								<Buttons
 									extraButtons={extraButtons}
 									actionButtons={actionButtons}

package/.env

@@ -1,8 +0,0 @@
-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

@@ -1,13 +0,0 @@
-{
-	"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"
-}