datastake-daf 0.6.716 → 0.6.718

package/package.json

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

package/src/@daf/core/components/AuthForm/index.jsx

@@ -55,7 +55,13 @@ function AuthForm ({
     }
   };
 
-  const prev = () => setCurrentStep((prev) => prev - 1);
+  const prev = () => {
+    // Save current step's values before going back (without validation)
+    const fieldNames = currentFields.map((f) => f.name);
+    const currentValues = formInstance.getFieldsValue(fieldNames);
+    setAllFormValues((prev) => ({ ...prev, ...currentValues }));
+    setCurrentStep((prev) => prev - 1);
+  };
 
   const handleSubmit = async (values) => {
     try {

package/src/@daf/core/components/Icon/configs/index.js

@@ -214,6 +214,8 @@ import ArcGis from "./ArcGis";
 import AppAdmin from "./AppAdmin";
 import Onboarding from "./Onboarding";
 import UnderDev from "./UnderDev";
+import userIcon from "./userIcon";
+import partnerIcon from "./partnerIcon";
 
 const config = {
 	AppAdmin,
@@ -432,6 +434,8 @@ const config = {
 	Straatos,
 	ArcGis,
 	UnderDev,
+	userIcon,
+	partnerIcon,
 };
 
 export default config;

package/src/@daf/core/components/Icon/configs/partnerIcon.js

@@ -0,0 +1,8 @@
+const config = {
+	viewBox: "0 0 18 14",
+	children: (
+        <path d="M5.08333 2.53462H0.75V8.75H1.50141C2.09639 8.75 2.67622 8.93763 3.15841 9.2862L7.44192 12.3827C7.74723 12.6034 8.15773 12.6105 8.47051 12.4006C8.95317 12.0765 9.00645 11.3867 8.5793 10.9924L6.81667 9.36538L9.68494 11.9601C9.95925 12.2082 10.366 12.2412 10.6767 12.0404C11.0996 11.7672 11.1772 11.1801 10.8398 10.8064L9.15 8.93462L11.4946 11.4923C11.828 11.8561 12.3838 11.9055 12.7762 11.6063C13.2258 11.2635 13.2802 10.607 12.8932 10.1948L11.0167 8.19615L13.3903 10.686C13.711 11.0223 14.2308 11.0702 14.6075 10.7981C15.0685 10.4651 15.1251 9.79991 14.727 9.39379L14.2167 8.87308M16.75 8.57952V2.79983M16.75 8.57952C16.75 8.57952 16.75 5.25112 16.75 2.79983M16.75 8.57952C16.75 8.72136 16.662 8.85066 16.5235 8.91219L15.2216 9.49081C15.0608 9.56228 14.8682 9.52676 14.7494 9.40375L8.66241 3.09692C8.52364 2.95315 8.28848 2.93195 8.1222 3.04823L7.31667 3.61154C6.63455 4.08854 5.73081 4.19895 4.93775 3.90217L4.14065 3.60388C3.96864 3.53951 3.93837 3.32657 4.08656 3.22341L6.64053 1.44562C7.4038 0.914316 8.33376 0.75 9.28973 0.75H9.89529C10.373 0.75 10.8476 0.821816 11.3003 0.962629L16.4777 2.44993C16.6404 2.50054 16.75 2.64134 16.75 2.79983" stroke="#722ED1" strokeWidth="1.5" strokeLinejoin="round"/>
+	),
+};
+
+export default config;

package/src/@daf/core/components/Icon/configs/userIcon.js

@@ -0,0 +1,8 @@
+const config = {
+	viewBox: "0 0 19 19",
+	children: (
+        <path d="M2.41669 17.2645C2.91883 17.4167 3.59708 17.4167 4.75 17.4167H13.4167C14.5696 17.4167 15.2478 17.4167 15.75 17.2645M2.41669 17.2645C2.30902 17.2319 2.20944 17.1923 2.11502 17.1442C1.64462 16.9045 1.26217 16.522 1.02248 16.0516C0.75 15.5169 0.75 14.8168 0.75 13.4167V4.75C0.75 3.34987 0.75 2.6498 1.02248 2.11502C1.26217 1.64462 1.64462 1.26217 2.11502 1.02248C2.6498 0.75 3.34987 0.75 4.75 0.75H13.4167C14.8168 0.75 15.5169 0.75 16.0516 1.02248C16.522 1.26217 16.9045 1.64462 17.1442 2.11502C17.4167 2.6498 17.4167 3.34987 17.4167 4.75V13.4167C17.4167 14.8168 17.4167 15.5169 17.1442 16.0516C16.9045 16.522 16.522 16.9045 16.0516 17.1442C15.9572 17.1923 15.8576 17.2319 15.75 17.2645M2.41669 17.2645C2.41696 16.5901 2.42101 16.2332 2.48072 15.933C2.74374 14.6107 3.7774 13.5771 5.0997 13.314C5.4217 13.25 5.80891 13.25 6.58333 13.25H11.5833C12.3578 13.25 12.745 13.25 13.067 13.314C14.3893 13.5771 15.4229 14.6107 15.686 15.933C15.7457 16.2332 15.7497 16.5901 15.75 17.2645M12.4167 7C12.4167 8.84095 10.9243 10.3333 9.08333 10.3333C7.24238 10.3333 5.75 8.84095 5.75 7C5.75 5.15905 7.24238 3.66667 9.08333 3.66667C10.9243 3.66667 12.4167 5.15905 12.4167 7Z" stroke="#08979C" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round"/>
+	),
+};
+
+export default config;

package/src/@daf/layouts/AuthLayout/components/Navbar/index.jsx

@@ -5,6 +5,7 @@ import Style, { GlobalNavbarStyles } from './style';
 import { languages } from "./config";
 import { Select } from "../Select/index.jsx";
 import CustomIcon from "../../../../core/components/Icon/CustomIcon.jsx";
+import { StorageManager } from "../../../../../helpers/StorageManager.js";
 
 const AuthNavbar = ({
   logo,
@@ -19,9 +20,10 @@ const AuthNavbar = ({
   showBack = false,
   backLabel = "Back",
   onBack,
-  defaultValue = "en",
+  defaultValue = StorageManager.get('datastakeLng') || 'en',
   onClose
 }) => {
+  console.log({navbarDefaultValue: defaultValue})
   return (
     <Style className={formatClassname([typeof onClose === 'function' && 'bordered'])}>
     <div className="d-navbar flex-c jus-c">

package/src/@daf/layouts/AuthLayout/index.jsx

@@ -23,7 +23,7 @@ const AuthLayout = ({
   showBack = false,
   onBack,
   backLabel = "Back",
-  defaultValue = "en",
+  defaultValue = StorageManager.get('datastakeLng') || 'en',
 }) => {
   const Wrapper = StyleComponent || "div";
   const wrapperClassName = formatClassname([

package/src/@daf/pages/dashboards/UserDashboard/config.js

@@ -0,0 +1,27 @@
+export const getActionWidgetsConfig = ({ goTo, getRedirectLink, APP, t }) => [
+    ...(APP === 'nashiriki' ? [{
+        icon: "MineSite",
+		title: t("nashiriki::create-mine-site"),
+		onClick: () => goTo(getRedirectLink("/app/scl?create=true")),
+    }] : null),
+	{
+		icon: "FileEdit",
+		title: t("nashiriki::report-activity"),
+		onClick: () => goTo(getRedirectLink("/app/corrective-actions?create=true")),
+	},
+	{
+		icon: "ReportIncidents",
+		title: t("nashiriki::report-incident"),
+		onClick: () => goTo(getRedirectLink("/app/incident?create=true")),
+	},
+	{
+		icon: "Search",
+		title: t("nashiriki::find-information"),
+		onClick: () => goTo(getRedirectLink("/app/find-information")),
+	},
+	{
+		icon: "Share",
+		title: t("nashiriki::share-information"),
+		onClick: () => goTo(getRedirectLink("/app/partners")),
+	},
+];

package/src/@daf/pages/dashboards/UserDashboard/index.jsx

@@ -0,0 +1,43 @@
+import React, { useMemo } from 'react'
+import { getActionWidgetsConfig } from './config'
+import ActionWidget from '../../../core/components/Dashboard/Widget/ActionWidget/index.jsx'
+import Header from '../../../core/components/Header/index.jsx'
+import DashboardLayout from '../../../core/components/Dashboard/DashboardLayout/index.jsx'
+
+function UserDashboard({
+    t = () => {},
+    goTo = () => {},
+    getRedirectLink = () => {},
+    APP,
+}) {
+
+    const actionsWidgetsConfig = useMemo(
+        () => getActionWidgetsConfig({ goTo, getRedirectLink, APP, t }),
+        [t, getRedirectLink, APP, t],
+    );
+
+    return (
+        <DashboardLayout
+            header={
+                <Header 
+                    title={t('Dashboard Title')}
+                />
+            }
+        >
+            <section>
+                {actionsWidgetsConfig.map((conf) => (
+                <ActionWidget
+                    key={conf.title}
+                    icon={conf.icon}
+                    title={t(conf.title)}
+                    onClick={conf.onClick}
+                    disabled={conf.disabled}
+                />
+                ))}
+            </section>
+
+        </DashboardLayout>
+    )
+}
+
+export default UserDashboard

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

@@ -4,7 +4,7 @@ import { createLazyService } from "./helpers/LazyService.js";
 class AuthenticationService extends BaseService {
     register(form) {
 		return this.apiPost({
-			url: '/auth/sign-up',
+			url: '/register',
 			data: form,
 		});
 	}
@@ -65,9 +65,9 @@ class AuthenticationService extends BaseService {
 	}
 
     verify(code) {
-		return this.apiPost({
+		return this.apiGet({
 			url: '/register/confirm',
-			data: { code },
+			params: {token: code},
 			isDaf: true,
 		});
 	}
@@ -210,12 +210,16 @@ class AuthenticationService extends BaseService {
 			'locationCategoriesOptions',
 			'documentationTypesOptions'
 		],
+		language,
+		...params
 	}) {
+		console.log({language})
 		return this.apiPost({
 			url: '/query/form-options',
 			isDaf: true,
 			data: {
 				references,
+				language
 			},
 		});
 	}

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

@@ -36,7 +36,7 @@ export class BaseService extends BaseHTTPService {
       getHeaders: () => {
         const config = getServicesConfig();
         return {
-          Language: config.language || StorageManager.get('datastakeLng') || 'en',
+          Language: StorageManager.get('datastakeLng') || 'en',
           'ngrok-skip-browser-warning': true,
           Application: config.application,
         };

package/src/@daf/services/helpers/BaseHTTPService.js

@@ -54,12 +54,9 @@ export class BaseHTTPService {
   }
 
   _ensureAxiosInitialized() {
-      console.log('[BaseHTTPService] Checking axios initialization:', this._axiosInitialized);
       if (!this._axiosInitialized) {
-          console.log('[BaseHTTPService] Setting up axios...');
           this.setupAxios();
           this._axiosInitialized = true;
-          console.log('[BaseHTTPService] Axios setup complete!');
       }
   }
 

package/src/styles/datastake/datastake.css

@@ -1541,13 +1541,13 @@ ul.ant-menu.ant-menu-dark.ant-menu-root.ant-menu-vertical::-webkit-scrollbar-thu
   color: var(--nested-sidenav-text-color, --custom-sidenav-text-color, white) !important;
 }
 
-.components-layout:not(.nested) .sidenav-sider:not(.custom) .sidenav-cont .menus-cont.not-collapsed .sidemenu-cont .ant-menu.ant-menu-root.ant-menu-inline.ant-menu-dark  
+.components-layout:not(.nested) .sidenav-sider:not(.custom):not(.straatos) .sidenav-cont .menus-cont.not-collapsed .sidemenu-cont .ant-menu.ant-menu-root.ant-menu-inline.ant-menu-dark  
 .ant-menu-item:not(.ant-menu-item-selected):not(.ant-menu-item-disabled) svg path
 {
   stroke: #ffffff !important;
 }
 
-.components-layout:not(.nested) .sidenav-sider:not(.custom) .sidenav-cont .menus-cont.not-collapsed .sidemenu-cont .ant-menu.ant-menu-root.ant-menu-inline.ant-menu-dark  
+.components-layout:not(.nested) .sidenav-sider:not(.custom):not(.straatos) .sidenav-cont .menus-cont.not-collapsed .sidemenu-cont .ant-menu.ant-menu-root.ant-menu-inline.ant-menu-dark  
 .ant-menu-item:not(.ant-menu-item-selected):not(.ant-menu-item-disabled) .ant-menu-title-content {
   color: #ffffff !important;
 }