datastake-daf 0.6.601 → 0.6.603

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",
@@ -14041,6 +14059,9 @@ const createAdminTheme = ({
   keysToRemove.forEach(key => {
     delete mergedTheme[key];
   });
+  console.log({
+    mergedTheme
+  });
   return mergedTheme;
 };
 
@@ -14092,6 +14113,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.601",
+	"version": "0.6.603",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/helpers/theme.js

@@ -327,5 +327,7 @@ export const createAdminTheme = ({appTheme = {}, overrides = {}}) => {
         delete mergedTheme[key];
     });
 
+    console.log({mergedTheme})
+
     return mergedTheme;
 }

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';