Update whiteboards from develop (#5596)

* Change mutation to contact leads (#5591)

* Non-first user is able to edit a Realtime Whiteboard (#5594)

---------

Co-authored-by: Aleksandar Stojanovic <[email protected]>
Co-authored-by: Andrew Pazniak <[email protected]>

Author: 3 people

src/core/apollo/generated/apollo-hooks.ts

@@ -11140,21 +11140,6 @@ export const CommunityUserPrivilegesWithParentCommunityDocument = gql`
               }
             }
           }
-          adminUsers: usersInRole(role: ADMIN) {
-            id
-            profile {
-              id
-              displayName
-              avatar: visual(type: AVATAR) {
-                ...VisualUri
-              }
-              location {
-                id
-                country
-                city
-              }
-            }
-          }
         }
       }
     }

src/core/apollo/generated/graphql-schema.ts

@@ -17597,19 +17597,6 @@ export type CommunityUserPrivilegesWithParentCommunityQuery = {
                   };
                 }>
               | undefined;
-            adminUsers?:
-              | Array<{
-                  __typename?: 'User';
-                  id: string;
-                  profile: {
-                    __typename?: 'Profile';
-                    id: string;
-                    displayName: string;
-                    avatar?: { __typename?: 'Visual'; id: string; uri: string; name: string } | undefined;
-                    location?: { __typename?: 'Location'; id: string; country: string; city: string } | undefined;
-                  };
-                }>
-              | undefined;
           }
         | undefined;
     };

src/domain/common/whiteboard/excalidraw/collab/Collab.ts

@@ -8,7 +8,6 @@ import {
   SYNC_FULL_SCENE_INTERVAL_MS,
   WS_SCENE_EVENT_TYPES,
 } from './excalidrawAppConstants';
-import { ImportedDataState } from '@alkemio/excalidraw/types/data/types';
 import { ExcalidrawElement } from '@alkemio/excalidraw/types/element/types';
 import { getSceneVersion, newElementWith, restoreElements } from '@alkemio/excalidraw';
 import { isImageElement, UserIdleState } from './utils';
@@ -129,7 +128,7 @@ class Collab {
     }
   };
 
-  startCollaboration = async (existingRoomLinkData: { roomId: string }): Promise<ImportedDataState | null> =>
+  startCollaboration = async (existingRoomLinkData: { roomId: string }): Promise<void> =>
     new Promise(async (resolve, reject) => {
       const { roomId } = existingRoomLinkData;
 
@@ -158,6 +157,7 @@ class Collab {
                       init: true,
                     });
                   }
+                  resolve();
                   break;
                 }
                 case WS_SCENE_EVENT_TYPES.SCENE_UPDATE: {
@@ -206,12 +206,12 @@ class Collab {
               }
             },
             'first-in-room': async () => {
-              const sceneData = await this.initializeRoom({
+              await this.initializeRoom({
                 fetchScene: true,
                 roomLinkData: existingRoomLinkData,
               });
 
-              resolve(sceneData);
+              resolve();
             },
           }
         );
@@ -251,8 +251,6 @@ class Collab {
     } else {
       this.portal.socketInitialized = true;
     }
-
-    return null;
   };
 
   private reconcileElements = (

src/domain/community/application/applicationButton/OpportunityApplicationButton.tsx

@@ -1,31 +1,24 @@
 import { Button as MuiButton, CircularProgress } from '@mui/material';
-import React, { forwardRef, Ref } from 'react';
+import React, { forwardRef, Ref, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link as RouterLink } from 'react-router-dom';
 import { buildLoginUrl } from '../../../../main/routing/urlBuilders';
 import { AddOutlined } from '@mui/icons-material';
-import RootThemeProvider from '../../../../core/ui/themes/RootThemeProvider';
-import useDirectMessageDialog from '../../../communication/messaging/DirectMessaging/useDirectMessageDialog';
+import { DirectMessageDialog } from '../../../communication/messaging/DirectMessaging/DirectMessageDialog';
 
 export interface OpportunityApplicationButtonProps {
   isAuthenticated?: boolean;
   isMember: boolean;
   isParentMember?: boolean;
   parentUrl?: string;
+  sendMessageToCommunityLeads: (message: string) => Promise<void>;
   leadUsers: {
     id: string;
     displayName?: string;
     city?: string;
     country?: string;
     avatarUri?: string;
   }[];
-  adminUsers: {
-    id: string;
-    displayName?: string;
-    city?: string;
-    country?: string;
-    avatarUri?: string;
-  }[];
   loading: boolean;
   component?: typeof MuiButton;
   extended?: boolean;
@@ -41,23 +34,21 @@ export const OpportunityApplicationButton = forwardRef<
       isMember = false,
       isParentMember = false,
       parentUrl,
+      sendMessageToCommunityLeads,
       leadUsers,
-      adminUsers,
       loading = false,
       component: Button = MuiButton,
       extended = false,
     },
     ref
   ) => {
     const { t } = useTranslation();
-    const { sendMessage, directMessageDialog } = useDirectMessageDialog({
-      dialogTitle: t('send-message-dialog.direct-message-title'),
-    });
-
-    const contactUsers = leadUsers.length > 0 ? leadUsers : adminUsers;
-
-    const handleSendMessageToParentLeads = () => {
-      sendMessage('user', ...contactUsers);
+    const [isContactLeadUsersDialogOpen, setIsContactLeadUsersDialogOpen] = useState(false);
+    const openContactLeadsDialog = () => {
+      setIsContactLeadUsersDialogOpen(true);
+    };
+    const closeContactLeadsDialog = () => {
+      setIsContactLeadUsersDialogOpen(false);
     };
 
     const renderApplicationButton = () => {
@@ -99,29 +90,33 @@ export const OpportunityApplicationButton = forwardRef<
         );
       }
 
-      if (contactUsers.length === 0) {
+      if (leadUsers.length === 0) {
         return null;
       }
 
       return (
-        <Button
-          ref={ref as Ref<HTMLButtonElement>}
-          startIcon={extended ? <AddOutlined /> : undefined}
-          onClick={handleSendMessageToParentLeads}
-          variant="contained"
-          sx={extended ? { textTransform: 'none' } : undefined}
-        >
-          {t(`components.application-button.contactOpportunityLeads.${extended ? 'full' : 'short'}` as const)}
-        </Button>
+        <>
+          <Button
+            ref={ref as Ref<HTMLButtonElement>}
+            startIcon={extended ? <AddOutlined /> : undefined}
+            onClick={openContactLeadsDialog}
+            variant="contained"
+            sx={extended ? { textTransform: 'none' } : undefined}
+          >
+            {t(`components.application-button.contactOpportunityLeads.${extended ? 'full' : 'short'}` as const)}
+          </Button>
+          <DirectMessageDialog
+            title={t('send-message-dialog.community-message-title', { contact: t('community.leads') })}
+            open={isContactLeadUsersDialogOpen}
+            onClose={closeContactLeadsDialog}
+            onSendMessage={sendMessageToCommunityLeads}
+            messageReceivers={leadUsers}
+          />
+        </>
       );
     };
 
-    return (
-      <>
-        {renderApplicationButton()}
-        <RootThemeProvider>{directMessageDialog}</RootThemeProvider>
-      </>
-    );
+    return <>{renderApplicationButton()}</>;
   }
 );
 

src/domain/community/application/containers/OpportunityApplicationButtonContainer.tsx

@@ -8,6 +8,7 @@ import { CommunityMembershipStatus } from '../../../../core/apollo/generated/gra
 import { useCommunityContext } from '../../community/CommunityContext';
 import { useAuthenticationContext } from '../../../../core/auth/authentication/hooks/useAuthenticationContext';
 import { SimpleContainerProps } from '../../../../core/container/SimpleContainer';
+import useSendMessageToCommunityLeads from '../../CommunityLeads/useSendMessageToCommunityLeads';
 
 interface ApplicationContainerState {
   loading: boolean;
@@ -48,30 +49,24 @@ export const OpportunityApplicationButtonContainer: FC<OpportunityApplicationBut
 
   const parentUrl = challengeNameId ? buildChallengeUrl(spaceNameId, challengeNameId) : buildSpaceUrl(spaceNameId);
   const communityLeadUsers = _communityPrivileges?.space?.opportunity?.community?.leadUsers ?? [];
-  const communityAdminUsers = _communityPrivileges?.space?.opportunity?.community?.adminUsers ?? [];
   const leadUsers = communityLeadUsers.map(user => ({
     id: user.id,
     displayName: user.profile.displayName,
     country: user.profile.location?.country,
     city: user.profile.location?.city,
     avatarUri: user.profile.avatar?.uri,
   }));
-  const adminUsers = communityAdminUsers.map(user => ({
-    id: user.id,
-    displayName: user.profile.displayName,
-    country: user.profile.location?.country,
-    city: user.profile.location?.city,
-    avatarUri: user.profile.avatar?.uri,
-  }));
+  const communityId = _communityPrivileges?.space.opportunity?.community?.id;
+  const sendMessageToCommunityLeads = useSendMessageToCommunityLeads(communityId);
 
   const loading = communityPrivilegesLoading;
 
   const applicationButtonProps: OpportunityApplicationButtonProps = {
     isAuthenticated,
     isMember,
     isParentMember,
+    sendMessageToCommunityLeads,
     leadUsers,
-    adminUsers,
     parentUrl,
     loading,
   };

src/domain/community/application/containers/communityUserPrivilegesWithParentCommunity.graphql

@@ -59,21 +59,6 @@ query communityUserPrivilegesWithParentCommunity(
             }
           }
         }
-        adminUsers: usersInRole(role: ADMIN) {
-          id
-          profile {
-            id
-            displayName
-            avatar: visual(type: AVATAR) {
-              ...VisualUri
-            }
-            location {
-              id
-              country
-              city
-            }
-          }
-        }
       }
     }
   }