fix(get-workspaces-projects): projects list must be always linked to activeWs

Author: cannarocks

generate-devel-token copy.json

@@ -0,0 +1,5 @@
+{
+    "url": "https://dev.unguess.io/api",
+    "username": "luca.cannarozzo@unguess.io",
+    "password": "$Uh(5RCbY7owNAeu#h"
+}

package.json

@@ -3,7 +3,7 @@
   "version": "1.4.0",
   "private": true,
   "dependencies": {
-    "@appquality/unguess-design-system": "3.1.2-nav-beta",
+    "@appquality/unguess-design-system": "3.1.2",
     "@headwayapp/react-widget": "^0.0.4",
     "@reduxjs/toolkit": "^1.8.0",
     "@rtk-query/codegen-openapi": "^1.0.0-alpha.1",

src/common/components/navigation/sidebar/icons/campaigns-active.svg

@@ -46,7 +46,7 @@ export const AppSidebar = (props: PropsWithChildren<SidebarProps>) => {
   const prjRef = useRef<HTMLButtonElement>(null);
 
   const {
-    data: projects,
+    currentData: projects,
     isLoading,
     isFetching,
   } = useGetWorkspacesByWidProjectsQuery(
@@ -58,9 +58,7 @@ export const AppSidebar = (props: PropsWithChildren<SidebarProps>) => {
 
   const isMobile = isMaxMedia(appTheme.breakpoints.sm);
 
-  const navigateTo = (navRoute: string, parameter?: string) => {
-    const destination = navRoute + (parameter ? `/${parameter}` : '');
-
+  const navigateTo = (destination: string, parameter?: string) => {
     let localizedRoute = '';
     if (destination === 'home') {
       localizedRoute = i18n.language === 'en' ? '/' : `/${i18n.language}`;
@@ -80,8 +78,6 @@ export const AppSidebar = (props: PropsWithChildren<SidebarProps>) => {
     }
 
     navigate(localizedRoute, { replace: true });
-
-    // setNav(destination);
   };
 
   useEffect(() => {
@@ -93,6 +89,8 @@ export const AppSidebar = (props: PropsWithChildren<SidebarProps>) => {
     }
   }, [isSidebarOpen]);
 
+  console.log('route', route);
+
   const isLoadingOrFetching = isLoading || isFetching;
 
   return isLoadingOrFetching ? (
@@ -127,12 +125,12 @@ export const AppSidebar = (props: PropsWithChildren<SidebarProps>) => {
           >
             <NavAccordionItem.Section>
               <NavAccordionItem.Header>
+                <ProjectsIcon />
                 <NavAccordionItem.Label>
-                  <ProjectsIcon />
                   {t('__APP_SIDEBAR_PROJECTS_DIVIDER_LABEL')}{' '}
                 </NavAccordionItem.Label>
               </NavAccordionItem.Header>
-              <NavAccordionItem.Panel>
+              <NavAccordionItem.Panel style={{ padding: 0 }}>
                 {projects.items.map((project) => (
                   <NavItemProject
                     className="sidebar-project-item"

src/common/components/navigation/sidebar/icons/campaigns.svg

@@ -47,10 +47,10 @@
     ajv-draft-04 "^1.0.0"
     call-me-maybe "^1.0.1"
 
-"@appquality/unguess-design-system@3.1.2-nav-beta":
-  version "3.1.2-nav-beta"
-  resolved "https://registry.yarnpkg.com/@appquality/unguess-design-system/-/unguess-design-system-3.1.2-nav-beta.tgz#3c53ffe27893a1c044575fc038e30bb840f5a422"
-  integrity sha512-Rq63az4/Vlr14kPHThGrAHyVOx8/o3tsB1BMWzjCzGY23Rj4RkxLiTi6iGovt7ITcVAskJgLKF4t/pyZwYglUQ==
+"@appquality/unguess-design-system@3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@appquality/unguess-design-system/-/unguess-design-system-3.1.2.tgz#a4ad6c6d06ba01a0b5c5a8f542b94126974d8bd0"
+  integrity sha512-ke3y9/xO7/9HSkIGcJ6WQCA4gUuUkJAFzszV6RcmC34E+iG2+4/3bU1FBF+tVzCzNqfw5d0n4xQiE1AjnAMTCg==
   dependencies:
     "@nivo/bar" "^0.80.0"
     "@nivo/bullet" "^0.80.0"