Merge pull request #7107 from alkem-io/client-7033-menu

[Simple Homepage] Dashboard Menu + Activity Components

src/core/i18n/en/translation.en.json

@@ -2162,9 +2162,18 @@
     "home": {
       "title": "My Dashboard",
       "subtitle": "Ready to make some impact?",
+      "mainNavigation": {
+        "invitations": "Invitations",
+        "myLatestActivity": "My Latest Activity",
+        "myLatestSpacesActivity": "Latest Activity In My Spaces",
+        "tipsAndTricks": "Tips & Tricks",
+        "myAccount": "My Account",
+        "createSpace": "Create my own Space",
+        "activityView": "Activity View"
+      },
       "sections": {
         "latestContributions": {
-          "title": "Latest Contributions in my Spaces",
+          "title": "Latest Activity in my Spaces",
           "filter": {
             "space": {
               "label": "Space:",
@@ -2177,7 +2186,7 @@
           }
         },
         "myLatestContributions": {
-          "title": "My Latest Contributions",
+          "title": "My Latest Activity",
           "card": {
             "journey": "in: <journeyicon /> {{journey}}"
           },

src/domain/InnovationPack/admin/AdminInnovationPacks.graphql

@@ -93,3 +93,29 @@ fragment InnovationPackProviderProfileWithAvatar on Contributor {
     url
   }
 }
+
+fragment InnovationPackCard on InnovationPack {
+  id
+  nameID
+  profile {
+    id
+    displayName
+    description
+    tagset {
+      ...TagsetDetails
+    }
+    url
+  }
+  templatesSet {
+    id
+    postTemplatesCount
+    whiteboardTemplatesCount
+    innovationFlowTemplatesCount
+    calloutTemplatesCount
+    communityGuidelinesTemplatesCount
+  }
+  provider {
+    ...InnovationPackProviderProfileWithAvatar
+  }
+}
+

src/domain/community/pendingMembership/PendingMembershipsUserMenuItem.tsx

@@ -21,7 +21,6 @@ import InvitationActionsContainer from '../invitations/InvitationActionsContaine
 import { CommunityContributorType, VisualType } from '../../../core/apollo/generated/graphql-schema';
 import BackButton from '../../../core/ui/actions/BackButton';
 import useNavigate from '../../../core/routing/useNavigate';
-import { useNewMembershipsQuery } from '../../../core/apollo/generated/apollo-hooks';
 import { PendingMembershipsDialogType, usePendingMembershipsDialog } from './PendingMembershipsDialogContext';
 import { defer } from 'lodash';
 import { getChildJourneyTypeName } from '../../shared/utils/spaceLevel';
@@ -40,8 +39,6 @@ const PendingMembershipsUserMenuItem = ({ children }: PendingMembershipsUserMenu
 
   const navigate = useNavigate();
 
-  const { refetch: refetchNewMembershipsQuery } = useNewMembershipsQuery();
-
   const { openDialog, setOpenDialog } = usePendingMembershipsDialog();
 
   const closeDialog = () => setOpenDialog(undefined);
@@ -72,8 +69,6 @@ const PendingMembershipsUserMenuItem = ({ children }: PendingMembershipsUserMenu
   const pendingMembershipsCount = invitations && applications ? invitations.length + applications.length : undefined;
 
   const onInvitationAccept = () => {
-    refetchNewMembershipsQuery();
-
     if (openDialog?.journeyUri) {
       navigate(openDialog?.journeyUri);
       defer(closeDialog); // Deferring for appearance purpose only
@@ -83,7 +78,6 @@ const PendingMembershipsUserMenuItem = ({ children }: PendingMembershipsUserMenu
   };
 
   const onInvitationReject = () => {
-    refetchNewMembershipsQuery();
     setOpenDialog({ type: PendingMembershipsDialogType.PendingMembershipsList });
   };
 

src/domain/community/user/providers/UserProvider/UserProvider.graphql

@@ -4,6 +4,10 @@ query UserProvider {
       ...UserDetails
       account {
         id
+        authorization {
+          id
+          myPrivileges
+        }
       }
     }
   }

src/domain/community/user/providers/UserProvider/UserProvider.tsx

@@ -17,6 +17,7 @@ export interface UserContextValue {
   loadingMe: boolean; // Loading Authentication and Profile data. Once it's false that's enough for showing the page header and avatar.
   verified: boolean;
   isAuthenticated: boolean;
+  accountPrivileges: string[];
 }
 
 const UserContext = React.createContext<UserContextValue>({
@@ -26,6 +27,7 @@ const UserContext = React.createContext<UserContextValue>({
   loadingMe: true,
   verified: false,
   isAuthenticated: false,
+  accountPrivileges: [],
 });
 
 const UserProvider: FC<{}> = ({ children }) => {
@@ -73,6 +75,7 @@ const UserProvider: FC<{}> = ({ children }) => {
       loadingMe: loadingMeAndParentQueries,
       verified,
       isAuthenticated,
+      accountPrivileges: meData?.me.user?.account?.authorization?.myPrivileges ?? [],
     }),
     [userMetadata, loading, loadingMeAndParentQueries, verified, isAuthenticated]
   );

src/domain/innovationHub/InnovationHubHomePage/DashboardSpaces.graphql

@@ -0,0 +1,5 @@
+query DashboardSpaces($visibilities: [SpaceVisibility!] = [ACTIVE]) {
+  spaces(filter: { visibilities: $visibilities }) {
+    ...SpaceCard
+  }
+}

src/main/routing/urlBuilders.ts

@@ -71,3 +71,7 @@ export const buildInnovationHubUrl = (subdomain: string): string => {
     }
   }
 };
+
+export const getAccountLink = (profileUrl?: string) => {
+  return profileUrl ? `${profileUrl}/settings/account` : '';
+};

src/main/topLevelPages/Home/HomePage.tsx

@@ -1,9 +1,11 @@
-import React from 'react';
+import React, { Suspense } from 'react';
 import HomePageLayout from './HomePageLayout';
 import InnovationHubHomePage from '../../../domain/innovationHub/InnovationHubHomePage/InnovationHubHomePage';
 import Loading from '../../../core/ui/loading/Loading';
 import useInnovationHub from '../../../domain/innovationHub/useInnovationHub/useInnovationHub';
-import MyDashboard from '../myDashboard/MyDashboard';
+import PageContent from '../../../core/ui/content/PageContent';
+
+const MyDashboard = React.lazy(() => import('../myDashboard/MyDashboard'));
 
 const HomePage = () => {
   const { innovationHub, innovationHubLoading } = useInnovationHub();
@@ -20,7 +22,15 @@ const HomePage = () => {
     return <InnovationHubHomePage innovationHub={innovationHub} />;
   }
 
-  return <MyDashboard />;
+  return (
+    <HomePageLayout>
+      <PageContent>
+        <Suspense fallback={<Loading />}>
+          <MyDashboard />
+        </Suspense>
+      </PageContent>
+    </HomePageLayout>
+  );
 };
 
 export default HomePage;