datastake-daf 0.6.716 → 0.6.717

package/dist/layouts/index.js

@@ -6794,7 +6794,7 @@ Timeframe.propTypes = {
  * @returns storage objects
  * @class StorageManager
  */
-class StorageManager {
+class StorageManager$1 {
   /**
    * @description Set or update given value in localStorage
    * @static
@@ -6929,11 +6929,11 @@ class StorageManager {
 const isProxy = () => {
   const pathname = window.location.pathname;
   if (pathname.includes('/proxy/pme') || pathname.includes('/proxy/cadd')) {
-    return window.opener || !!StorageManager.get('proxy_token');
+    return window.opener || !!StorageManager$1.get('proxy_token');
   }
   return false;
 };
-const getToken = () => isProxy() ? StorageManager.get('proxy_token') : StorageManager.get('token');
+const getToken = () => isProxy() ? StorageManager$1.get('proxy_token') : StorageManager$1.get('token');
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -8360,7 +8360,7 @@ function AppLayout({
                 color: 'white',
                 height: '30px'
               },
-              defaultValue: StorageManager.get('datastakeLng') || 'en',
+              defaultValue: StorageManager$1.get('datastakeLng') || 'en',
               bordered: false,
               onChange: lng => updateLanguage?.(lng),
               popupClassName: formatClassname(['dark-select-popup language-select', appName, theme.customHeaderColor && 'custom']),
@@ -9035,9 +9035,12 @@ const AuthNavbar = ({
   showBack = false,
   backLabel = "Back",
   onBack,
-  defaultValue = "en",
+  defaultValue = StorageManager$1.get('datastakeLng') || 'en',
   onClose
 }) => {
+  console.log({
+    navbarDefaultValue: defaultValue
+  });
   return /*#__PURE__*/jsxRuntime.jsx(style, {
     className: formatClassname([typeof onClose === 'function' && 'bordered']),
     children: /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -9522,7 +9525,7 @@ const AuthLayout = ({
   showBack = false,
   onBack,
   backLabel = "Back",
-  defaultValue = "en"
+  defaultValue = StorageManager.get('datastakeLng') || 'en'
 }) => {
   formatClassname(["auth-layout", appName, containerClassName]);
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {

package/dist/pages/index.js

@@ -5986,12 +5986,9 @@ class BaseHTTPService {
     this._axiosInitialized = false;
   }
   _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!');
     }
   }
   setupAxios() {
@@ -6316,7 +6313,7 @@ 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/dist/services/index.js

@@ -241,12 +241,9 @@ class BaseHTTPService {
     this._axiosInitialized = false;
   }
   _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!');
     }
   }
   setupAxios() {
@@ -662,7 +659,7 @@ class BaseService extends BaseHTTPService {
       getHeaders: () => {
         const config = getServicesConfig();
         return {
-          Language: config.language || StorageManager$1.get('datastakeLng') || 'en',
+          Language: StorageManager$1.get('datastakeLng') || 'en',
           'ngrok-skip-browser-warning': true,
           Application: config.application
         };
@@ -765,7 +762,7 @@ var AdminService$1 = createLazyService(AdminService);
 class AuthenticationService extends BaseService {
   register(form) {
     return this.apiPost({
-      url: '/auth/sign-up',
+      url: '/register',
       data: form
     });
   }
@@ -818,10 +815,10 @@ class AuthenticationService extends BaseService {
     });
   }
   verify(code) {
-    return this.apiPost({
+    return this.apiGet({
       url: '/register/confirm',
-      data: {
-        code
+      params: {
+        token: code
       },
       isDaf: true
     });
@@ -943,13 +940,19 @@ class AuthenticationService extends BaseService {
     });
   }
   getFormOptions({
-    references = ['countries', 'categoriesOptions', 'subCategoriesOptions', 'locationCategoriesOptions', 'documentationTypesOptions']
+    references = ['countries', 'categoriesOptions', 'subCategoriesOptions', 'locationCategoriesOptions', 'documentationTypesOptions'],
+    language,
+    ...params
   }) {
+    console.log({
+      language
+    });
     return this.apiPost({
       url: '/query/form-options',
       isDaf: true,
       data: {
-        references
+        references,
+        language
       }
     });
   }

package/dist/style/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;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.716",
+	"version": "0.6.717",
 	"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/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;
 }