datastake-daf 0.6.600 → 0.6.602

package/dist/layouts/index.js

@@ -7597,6 +7597,9 @@ const Style$1 = dt.div`
 
   .select-navbar {
     padding: 0 .75rem;
+    display: flex;
+    align-items: center;
+    gap: 0;
 
     div {
       width: 4.625rem;
@@ -7608,6 +7611,17 @@ const Style$1 = dt.div`
       cursor: pointer;
     }
 
+    .chevron-icon {
+      color: #193E61;
+      transition: transform 0.3s ease;
+      cursor: pointer;
+      flex-shrink: 0;
+
+      &.rotated {
+        transform: rotate(180deg);
+      }
+    }
+
     .country-cont {
       justify-content: center;
       gap: 0.6rem;
@@ -7810,13 +7824,27 @@ const Select = ({
     };
   }, [toggled]);
   return /*#__PURE__*/jsxRuntime.jsxs(Style$1, {
-    children: [/*#__PURE__*/jsxRuntime.jsx("div", {
+    children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
       className: formatClassname(['select-navbar', bordered && 'bordered']),
       onClick: () => setToggled(p => !p),
       ref: ref,
-      children: /*#__PURE__*/jsxRuntime.jsx("div", {
+      children: [/*#__PURE__*/jsxRuntime.jsx("div", {
         children: valueLabel
-      })
+      }), /*#__PURE__*/jsxRuntime.jsx("svg", {
+        className: formatClassname(['chevron-icon', toggled && 'rotated']),
+        width: "16",
+        height: "16",
+        viewBox: "0 0 16 16",
+        fill: "none",
+        xmlns: "http://www.w3.org/2000/svg",
+        children: /*#__PURE__*/jsxRuntime.jsx("path", {
+          d: "M4 6L8 10L12 6",
+          stroke: "currentColor",
+          strokeWidth: "2",
+          strokeLinecap: "round",
+          strokeLinejoin: "round"
+        })
+      })]
     }), visible && /*#__PURE__*/jsxRuntime.jsx(Options, {
       value: value,
       secondRef: ref,

package/dist/utils/index.js

@@ -7782,6 +7782,24 @@ const mapModulesFromApps = (user, APP) => {
     }, {});
   }
 };
+function getRedirectPath(user, fallback = '', app, isDatastake) {
+  if (user.approvalStatus === "pending") {
+    const modules = Object.keys(user.modules);
+    const _app = modules[0] || app;
+    if (_app) {
+      return `/${_app}/confirm`;
+    }
+  }
+  if (user.modules && Object.keys(user.modules).length) {
+    const modules = Object.keys(user.modules);
+    const f = (fallback || '')[0] === '/' ? (fallback || '').substring(1) : fallback || '';
+    const fallbackRoute = f.split('/');
+    if (fallbackRoute.length > 1 && fallbackRoute[0] === 'app' && modules.includes(fallbackRoute[1])) {
+      return fallback;
+    }
+  }
+  return isDatastake ? `/${app}/app` : '/app';
+}
 
 const en = {
   "No planning required": "No planning required",
@@ -14092,6 +14110,7 @@ exports.getOptionConfig = getOptionConfig;
 exports.getOptionLabel = getOptionLabel;
 exports.getRangeOfTicks = getRangeOfTicks;
 exports.getRedirectLink = getRedirectLink;
+exports.getRedirectPath = getRedirectPath;
 exports.getTagColor = getTagColor;
 exports.getToken = getToken;
 exports.groupSubsections = groupSubsections;

package/package.json

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

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

@@ -126,6 +126,22 @@ export const Select = ({
         ref={ref}
       >
         <div>{valueLabel}</div>
+        <svg 
+          className={formatClassname(['chevron-icon', toggled && 'rotated'])}
+          width="16" 
+          height="16" 
+          viewBox="0 0 16 16" 
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path 
+            d="M4 6L8 10L12 6" 
+            stroke="currentColor" 
+            strokeWidth="2" 
+            strokeLinecap="round" 
+            strokeLinejoin="round"
+          />
+        </svg>
       </div>
       {visible && (
         <Options

package/src/@daf/layouts/AuthLayout/components/Select/style.js

@@ -27,6 +27,9 @@ const Style = styled.div`
 
   .select-navbar {
     padding: 0 .75rem;
+    display: flex;
+    align-items: center;
+    gap: 0;
 
     div {
       width: 4.625rem;
@@ -38,6 +41,17 @@ const Style = styled.div`
       cursor: pointer;
     }
 
+    .chevron-icon {
+      color: #193E61;
+      transition: transform 0.3s ease;
+      cursor: pointer;
+      flex-shrink: 0;
+
+      &.rotated {
+        transform: rotate(180deg);
+      }
+    }
+
     .country-cont {
       justify-content: center;
       gap: 0.6rem;

package/src/helpers/user.js

@@ -170,4 +170,26 @@ export const mapModulesFromApps = (user, APP) => {
         return all;
       }, {});
   }
-};
+};
+
+export function getRedirectPath(user, fallback = '', app, isDatastake) {
+  if (user.approvalStatus === "pending") {
+    const modules = Object.keys(user.modules);
+    const _app = modules[0] || app;
+
+    if (_app) {
+      return `/${_app}/confirm`;
+    }
+  }
+
+  if (user.modules && Object.keys(user.modules).length) {
+    const modules = Object.keys(user.modules);
+    const f = (fallback || '')[0] === '/' ? (fallback || '').substring(1) : (fallback || '');
+    const fallbackRoute = f.split('/');
+    if (fallbackRoute.length > 1 && fallbackRoute[0] === 'app' && modules.includes(fallbackRoute[1])) {
+      return fallback;
+    }
+  }
+
+  return isDatastake ? `/${app}/app` : '/app';
+}

package/src/utils.js

@@ -21,7 +21,7 @@ export { getOptionConfig, getOptionLabel } from './@daf/core/components/DynamicV
 
 export { defaultMapConfig } from './@daf/hooks/useMapHelper.js';
 
-export { getInterface, modules, isSuperAdmin, isModuleApproved, userHasInterface, userIsAdmin, createModule, mapModulesFromApps } from './helpers/user.js'
+export { getInterface, modules, isSuperAdmin, isModuleApproved, userHasInterface, userIsAdmin, createModule, mapModulesFromApps, getRedirectPath } from './helpers/user.js'
 
 export { default as locales } from './constants/locales/index.js';