datastake-daf 0.6.618 → 0.6.620

package/dist/style/datastake/datastake.css

@@ -856,6 +856,15 @@ h1 {
   font-size: 15px !important;
 }
 
+.ant-menu-sub.ant-menu-inline .ant-menu-item:not(.selected-it) .ant-menu-title-content span {
+  color: var(--custom-sidenav-text-color, white) !important;
+}
+
+.components-layout.nested .sidenav-cont .menus-cont .sidemenu-cont .ant-menu-submenu,
+.components-layout.nested .sidenav-cont .menus-cont .sidemenu-cont .ant-menu-item {
+  color: var(#384250) !important;
+}
+ 
 ul.ant-menu.ant-menu-dark.ant-menu-root.ant-menu-inline,
 ul.ant-menu.ant-menu-dark.ant-menu-root.ant-menu-vertical {
   /* Track */
@@ -1489,6 +1498,32 @@ ul.ant-menu.ant-menu-dark.ant-menu-root.ant-menu-vertical::-webkit-scrollbar-thu
   margin-left: 2px;
 }
 
+.components-layout
+  .sidenav-cont
+  .menus-cont.is-collapsed
+  .selected
+  svg,
+.components-layout
+  .sidenav-cont
+  .menus-cont.is-collapsed
+  .ant-menu-submenu-selected
+  svg {
+  stroke: white !important;
+}
+
+.components-layout
+  .sidenav-cont
+  .menus-cont.is-collapsed
+  .selected
+  svg path,
+.components-layout
+  .sidenav-cont
+  .menus-cont.is-collapsed
+  .ant-menu-submenu-selected
+  svg path {
+  stroke: white !important;
+}
+
 .components-layout
   .sidenav-cont
   .ant-menu-sub
@@ -1511,11 +1546,6 @@ ul.ant-menu.ant-menu-dark.ant-menu-root.ant-menu-vertical::-webkit-scrollbar-thu
   color: var(--custom-sidenav-text-color, white) !important;
 }
 
-.components-layout.nested .sidenav-cont .menus-cont .sidemenu-cont .ant-menu-submenu,
-.components-layout.nested .sidenav-cont .menus-cont .sidemenu-cont .ant-menu-item {
-  color: var(--nested-sidenav-text-color, rgb(230, 5, 5)) !important;
-}
-
 .components-layout.nested
   .sidenav-cont
   .menus-cont
@@ -4387,6 +4417,12 @@ strong {
   line-height: 20px;
 }
 
+/* .ant-menu-submenu-title .ant-menu-title-content, */
+.ant-menu-submenu-title .ant-menu-item-icon,
+.ant-menu-submenu-title span {
+  color: var(--custom-sidenav-text-color, white) !important;
+}
+
 .sidenav-sider.tazama .ant-menu-item:hover {
   background-color: var(--base-gray-20) !important;
 }
@@ -4417,6 +4453,10 @@ strong {
   color: white !important;
 }
 
+.sidenav-sider.sidenav-sider-collapsed .ant-menu-submenu-title span {
+  color: var(--custom-sidenav-text-color, white) !important;
+}
+
 .sidenav-sider.sidenav-sider-collapsed .sidemenu-cont .ant-menu-submenu:hover {
   background-color: #243a47;
 }
@@ -4455,10 +4495,18 @@ strong {
   .ant-menu-submenu-selected
   .ant-menu-submenu-title {
   background-color: var(--color-primary-70) !important;
-  color: white;
+  color: white !important;
   border-radius: 0px;
 }
 
+.sidenav-sider.sidenav-sider-collapsed .selected .ant-menu-submenu-title span,
+.sidenav-sider.sidenav-sider-collapsed
+  .ant-menu-submenu-selected
+  .ant-menu-submenu-title
+  span {
+  color: white !important;
+}
+
 .sidenav-sider.nested.sidenav-sider-collapsed
   .selected
   .ant-menu-submenu-title

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.618",
+	"version": "0.6.620",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/utils/theme.js

@@ -63,6 +63,7 @@ export const mapTheme = (theme = {}) => ({
   '--nested-collapsed-sidenav-hover-color':theme.nestedCollapsedSidenavHoverColor,
   '--nested-sidenav-disabled-menu-item-color':theme.nestedSidenavDisabledMenuItemColor,
   '--nested-sidenav-submenu-bg-color':theme.nestedSidenavSubmenuBgColor,
+  '--nested-sidenav-text-color':theme.nestedSidenavTextColor,
 
   '--custom-header-color':theme.customHeaderColor,
 

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/styles/datastake/datastake.css

@@ -856,6 +856,15 @@ h1 {
   font-size: 15px !important;
 }
 
+.ant-menu-sub.ant-menu-inline .ant-menu-item:not(.selected-it) .ant-menu-title-content span {
+  color: var(--custom-sidenav-text-color, white) !important;
+}
+
+.components-layout.nested .sidenav-cont .menus-cont .sidemenu-cont .ant-menu-submenu,
+.components-layout.nested .sidenav-cont .menus-cont .sidemenu-cont .ant-menu-item {
+  color: var(#384250) !important;
+}
+ 
 ul.ant-menu.ant-menu-dark.ant-menu-root.ant-menu-inline,
 ul.ant-menu.ant-menu-dark.ant-menu-root.ant-menu-vertical {
   /* Track */
@@ -1489,6 +1498,32 @@ ul.ant-menu.ant-menu-dark.ant-menu-root.ant-menu-vertical::-webkit-scrollbar-thu
   margin-left: 2px;
 }
 
+.components-layout
+  .sidenav-cont
+  .menus-cont.is-collapsed
+  .selected
+  svg,
+.components-layout
+  .sidenav-cont
+  .menus-cont.is-collapsed
+  .ant-menu-submenu-selected
+  svg {
+  stroke: white !important;
+}
+
+.components-layout
+  .sidenav-cont
+  .menus-cont.is-collapsed
+  .selected
+  svg path,
+.components-layout
+  .sidenav-cont
+  .menus-cont.is-collapsed
+  .ant-menu-submenu-selected
+  svg path {
+  stroke: white !important;
+}
+
 .components-layout
   .sidenav-cont
   .ant-menu-sub
@@ -1511,11 +1546,6 @@ ul.ant-menu.ant-menu-dark.ant-menu-root.ant-menu-vertical::-webkit-scrollbar-thu
   color: var(--custom-sidenav-text-color, white) !important;
 }
 
-.components-layout.nested .sidenav-cont .menus-cont .sidemenu-cont .ant-menu-submenu,
-.components-layout.nested .sidenav-cont .menus-cont .sidemenu-cont .ant-menu-item {
-  color: var(--nested-sidenav-text-color, rgb(230, 5, 5)) !important;
-}
-
 .components-layout.nested
   .sidenav-cont
   .menus-cont
@@ -4387,6 +4417,12 @@ strong {
   line-height: 20px;
 }
 
+/* .ant-menu-submenu-title .ant-menu-title-content, */
+.ant-menu-submenu-title .ant-menu-item-icon,
+.ant-menu-submenu-title span {
+  color: var(--custom-sidenav-text-color, white) !important;
+}
+
 .sidenav-sider.tazama .ant-menu-item:hover {
   background-color: var(--base-gray-20) !important;
 }
@@ -4417,6 +4453,10 @@ strong {
   color: white !important;
 }
 
+.sidenav-sider.sidenav-sider-collapsed .ant-menu-submenu-title span {
+  color: var(--custom-sidenav-text-color, white) !important;
+}
+
 .sidenav-sider.sidenav-sider-collapsed .sidemenu-cont .ant-menu-submenu:hover {
   background-color: #243a47;
 }
@@ -4455,10 +4495,18 @@ strong {
   .ant-menu-submenu-selected
   .ant-menu-submenu-title {
   background-color: var(--color-primary-70) !important;
-  color: white;
+  color: white !important;
   border-radius: 0px;
 }
 
+.sidenav-sider.sidenav-sider-collapsed .selected .ant-menu-submenu-title span,
+.sidenav-sider.sidenav-sider-collapsed
+  .ant-menu-submenu-selected
+  .ant-menu-submenu-title
+  span {
+  color: white !important;
+}
+
 .sidenav-sider.nested.sidenav-sider-collapsed
   .selected
   .ant-menu-submenu-title

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

package/dist/style/datastake/mapbox-gl.css

@@ -1,330 +0,0 @@
-/* Isolated Mapbox GL CSS - Scoped to prevent Leaflet conflicts */
-
-/* Mapbox GL Core Styles - Scoped with .mapbox-gl-scope */
-.mapbox-gl-scope .mapboxgl-map {
-  font: 12px/20px Helvetica Neue, Arial, Helvetica, sans-serif;
-  overflow: hidden;
-  position: relative;
-  -webkit-tap-highlight-color: rgb(0 0 0/0);
-}
-
-.mapbox-gl-scope .mapboxgl-canvas {
-  left: 0;
-  position: absolute;
-  top: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-map:-webkit-full-screen {
-  height: 100%;
-  width: 100%;
-}
-
-.mapbox-gl-scope .mapboxgl-canary {
-  background-color: salmon;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive,
-.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass {
-  cursor: grab;
-  -webkit-user-select: none;
-  user-select: none;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive.mapboxgl-track-pointer {
-  cursor: pointer;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive:active,
-.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass:active {
-  cursor: grabbing;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate,
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate .mapboxgl-canvas {
-  touch-action: pan-x pan-y;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan,
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan .mapboxgl-canvas {
-  touch-action: pinch-zoom;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan,
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan .mapboxgl-canvas {
-  touch-action: none;
-}
-
-/* Control positioning */
-.mapbox-gl-scope .mapboxgl-ctrl-bottom,
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-left,
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-right,
-.mapbox-gl-scope .mapboxgl-ctrl-left,
-.mapbox-gl-scope .mapboxgl-ctrl-right,
-.mapbox-gl-scope .mapboxgl-ctrl-top,
-.mapbox-gl-scope .mapboxgl-ctrl-top-left,
-.mapbox-gl-scope .mapboxgl-ctrl-top-right {
-  pointer-events: none;
-  position: absolute;
-  z-index: 2;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-left {
-  left: 0;
-  top: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top {
-  left: 50%;
-  top: 0;
-  transform: translateX(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-right {
-  right: 0;
-  top: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-right {
-  right: 0;
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-right {
-  bottom: 0;
-  right: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom {
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-left {
-  bottom: 0;
-  left: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-left {
-  left: 0;
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl {
-  clear: both;
-  pointer-events: auto;
-  transform: translate(0);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-left .mapboxgl-ctrl {
-  float: left;
-  margin: 10px 0 0 10px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top .mapboxgl-ctrl {
-  float: left;
-  margin: 10px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-right .mapboxgl-ctrl {
-  float: right;
-  margin: 10px 10px 0 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-right .mapboxgl-ctrl,
-.mapbox-gl-scope .mapboxgl-ctrl-right .mapboxgl-ctrl {
-  float: right;
-  margin: 0 10px 10px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom .mapboxgl-ctrl {
-  float: left;
-  margin: 10px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-left .mapboxgl-ctrl,
-.mapbox-gl-scope .mapboxgl-ctrl-left .mapboxgl-ctrl {
-  float: left;
-  margin: 0 0 10px 10px;
-}
-
-/* Control group styling */
-.mapbox-gl-scope .mapboxgl-ctrl-group {
-  background: #fff;
-  border-radius: 4px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group:not(:empty) {
-  box-shadow: 0 0 0 2px #0000001a;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button {
-  background-color: initial;
-  border: 0;
-  box-sizing: border-box;
-  cursor: pointer;
-  display: block;
-  height: 29px;
-  outline: none;
-  overflow: hidden;
-  padding: 0;
-  width: 29px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button+button {
-  border-top: 1px solid #ddd;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button .mapboxgl-ctrl-icon {
-  background-position: 50%;
-  background-repeat: no-repeat;
-  display: block;
-  height: 100%;
-  width: 100%;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attrib-button:focus,
-.mapbox-gl-scope .mapboxgl-ctrl-group button:focus {
-  box-shadow: 0 0 2px 2px #0096ff;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button:disabled {
-  cursor: not-allowed;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button:disabled .mapboxgl-ctrl-icon {
-  opacity: .25;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button:first-child {
-  border-radius: 4px 4px 0 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button:last-child {
-  border-radius: 0 0 4px 4px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button:only-child {
-  border-radius: inherit;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button:not(:disabled):hover {
-  background-color: #0000000d;
-}
-
-/* Marker styles */
-.mapbox-gl-scope .mapboxgl-marker {
-  position: absolute;
-  z-index: 1;
-}
-
-.mapbox-gl-scope .mapboxgl-marker svg {
-  display: block;
-}
-
-/* Popup styles */
-.mapbox-gl-scope .mapboxgl-popup {
-  position: absolute;
-  text-align: center;
-  margin-bottom: 20px;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content-wrapper {
-  padding: 1px;
-  text-align: left;
-  border-radius: 12px;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content {
-  margin: 13px 24px 13px 20px;
-  line-height: 1.3;
-  font-size: 13px;
-  min-height: 1px;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content p {
-  margin: 17px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-tip-container {
-  width: 40px;
-  height: 20px;
-  position: absolute;
-  left: 50%;
-  margin-top: -1px;
-  margin-left: -20px;
-  overflow: hidden;
-  pointer-events: none;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-tip {
-  width: 17px;
-  height: 17px;
-  padding: 1px;
-  margin: -10px auto 0;
-  pointer-events: auto;
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  transform: rotate(45deg);
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content-wrapper,
-.mapbox-gl-scope .mapboxgl-popup-tip {
-  background: white;
-  color: #333;
-  box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4);
-}
-
-.mapbox-gl-scope .mapboxgl-popup-close-button {
-  position: absolute;
-  top: 0;
-  right: 0;
-  border: none;
-  text-align: center;
-  width: 24px;
-  height: 24px;
-  font: 16px/24px Tahoma, Verdana, sans-serif;
-  color: #757575;
-  text-decoration: none;
-  background: transparent;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-close-button:hover,
-.mapbox-gl-scope .mapboxgl-popup-close-button:focus {
-  color: #585858;
-}
-
-/* Attribution */
-.mapbox-gl-scope .mapboxgl-ctrl-attribution {
-  background: #fff;
-  background: rgba(255, 255, 255, 0.8);
-  margin: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attribution,
-.mapbox-gl-scope .mapboxgl-ctrl-scale-line {
-  padding: 0 5px;
-  color: #333;
-  line-height: 1.4;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attribution a {
-  text-decoration: none;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attribution a:hover,
-.mapbox-gl-scope .mapboxgl-ctrl-attribution a:focus {
-  text-decoration: underline;
-}
-
-/* Hide attribution by default */
-.mapbox-gl-scope .mapboxgl-ctrl-attribution {
-  display: none !important;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-logo {
-  display: none !important;
-}