bug fixed in meeting (#347)

packages/plugin-meetings-api/src/graphql/resolvers/queries/meeting.ts

@@ -20,7 +20,7 @@ const generateFilter = async (params, user) => {
     participantIds.length > 0 &&
     !participantIds.includes('')
   ) {
-    selector.participantIds = { $in: participantIds };
+    selector.participantIds = { $in: [user._id, ...participantIds] };
   }
   if (userId) {
     selector.createdBy = userId;

packages/plugin-meetings-api/src/models/Meetings.ts

@@ -72,7 +72,8 @@ export const loadMeetingClass = (model: IModels) => {
         createdBy: user._id
       });
       if (result) {
-        return model.Meetings.deleteOne({ _id });
+        await model.Meetings.deleteOne({ _id });
+        return await model.Topics.deleteMany({ meetingId: _id });
       }
       throw new Error('You cannot remove ');
     }

packages/plugin-meetings-ui/src/components/List.tsx

@@ -25,7 +25,6 @@ type Props = {
   refetchQueries?: any;
   currentUser: IUser;
   meetingQuery?: MeetingsQueryResponse;
-  participantUsers: IUser[];
 };
 
 function List(props: Props) {
@@ -35,8 +34,7 @@ function List(props: Props) {
     queryParams,
     history,
     currentUser,
-    meetingQuery,
-    participantUsers
+    meetingQuery
   } = props;
   const { meetingId, searchValue } = queryParams;
 
@@ -76,6 +74,7 @@ function List(props: Props) {
             queryParams={queryParams}
             meetings={meetings}
             loading={loading}
+            currentUser={currentUser}
           />
         );
         break;

packages/plugin-meetings-ui/src/components/myCalendar/ChooseOwnerForm.tsx

@@ -3,14 +3,16 @@ import { Button, ControlLabel, Form, SelectTeamMembers } from '@erxes/ui/src';
 import FormGroup from '@erxes/ui/src/components/form/Group';
 import { ModalFooter } from '@erxes/ui/src/styles/main';
 import { IButtonMutateProps } from '@erxes/ui/src/types';
+import { IUser } from '@erxes/ui/src/auth/types';
 
 type Props = {
   closeModal: () => void;
   pinnedUserIds: string[];
   renderButton: (props: IButtonMutateProps) => JSX.Element;
+  currentUser: IUser;
 };
 const ChooseOwnerForm = (props: Props) => {
-  const { pinnedUserIds } = props;
+  const { pinnedUserIds, currentUser } = props;
 
   const [pinnedIds, setPinnedUserIds] = useState([pinnedUserIds] || []);
 
@@ -43,7 +45,7 @@ const ChooseOwnerForm = (props: Props) => {
               <SelectTeamMembers
                 initialValue={pinnedUserIds}
                 customField="userIds"
-                filterParams={{}}
+                filterParams={{ excludeIds: true, ids: [currentUser?._id] }}
                 label={'Select team member'}
                 onSelect={onUserSelect}
                 name="userId"

packages/plugin-meetings-ui/src/components/myCalendar/SideBar.tsx

@@ -33,10 +33,11 @@ type Props = {
     userId: string;
     pinnedUsersInfo: IUser[];
   };
+  currentUser: IUser;
 };
 
 export const SideBar = (props: Props) => {
-  const { queryParams, meetings, loading, pinnedUsers } = props;
+  const { queryParams, meetings, loading, pinnedUsers, currentUser } = props;
   const { meetingId } = queryParams;
   const [filteredMeeting, setFilteredMeeting] = useState(meetings);
   const { pinnedUsersInfo = [] } = pinnedUsers;
@@ -192,6 +193,7 @@ export const SideBar = (props: Props) => {
       <ChooseOwnerFormContainer
         closeModal={closeModal}
         pinnedUserIds={pinnedUsers.pinnedUserIds}
+        currentUser={currentUser}
       />
     );
   };

packages/plugin-meetings-ui/src/components/myCalendar/meeting/Calendar.tsx

@@ -94,25 +94,28 @@ function CalendarComponent(props: Props) {
 
   return (
     <>
-      <FullCalendar
-        plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
-        headerToolbar={{
-          left: 'prev,next today',
-          center: 'title',
-          right: 'dayGridMonth,timeGridWeek,timeGridDay'
-        }}
-        height="80vh"
-        initialView="dayGridMonth"
-        editable={true}
-        selectMirror={true}
-        selectable={true}
-        dayMaxEvents={true}
-        events={events}
-        select={handleDateSelect}
-        eventContent={renderEventContent}
-        eventClick={handleEventClick}
-        eventChange={changeEvent}
-      />
+      <div style={{ width: '100%' }}>
+        <FullCalendar
+          plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
+          headerToolbar={{
+            left: 'prev,next today',
+            center: 'title',
+            right: 'dayGridMonth,timeGridWeek,timeGridDay'
+          }}
+          height="80vh"
+          initialView="dayGridMonth"
+          editable={true}
+          selectMirror={true}
+          selectable={true}
+          dayMaxEvents={true}
+          events={{}}
+          select={handleDateSelect}
+          eventContent={renderEventContent}
+          eventClick={handleEventClick}
+          eventChange={changeEvent}
+          firstDay={1}
+        />
+      </div>
       <Modal show={showModal} onHide={() => setShowModal(false)} size="lg">
         <Modal.Header closeButton={true}>
           <Modal.Title>Create Meeting</Modal.Title>

packages/plugin-meetings-ui/src/components/myCalendar/meeting/Detail.tsx

@@ -123,8 +123,8 @@ export const MeetingDetail = (props: Props) => {
             <span>Team members:</span>{' '}
             {meetingDetail?.participantUser?.map((user, index) => {
               if (index != meetingDetail?.participantUser?.length - 1)
-                return <>{user.details?.fullName},</>;
-              return <>{user.details?.fullName}</>;
+                return <div key={index}>{user.details?.fullName},</div>;
+              return <div key={index}>{user.details?.fullName}</div>;
             })}
           </MeetingDetailColumn>
         </MeetingDetailRow>

packages/plugin-meetings-ui/src/components/myMeetings/Row.tsx

@@ -33,12 +33,16 @@ export const Row = (props: Props) => {
 
   const content = props => <Form {...props} meeting={meeting} />;
 
+  const onTrClick = () => {
+    history.push(`/meetings/myCalendar?meetingId=${meeting._id}`);
+  };
+
+  const onClick = e => {
+    e.stopPropagation();
+  };
+
   return (
-    <tr
-      onClick={() => {
-        history.push(`/meetings/myCalendar?meetingId=${meeting._id}`);
-      }}
-    >
+    <tr onClick={onTrClick}>
       <td>{meeting.title}</td>
       <td>{meeting.createdUser?.username || ''}</td>
       <td>{meeting.createdAt}</td>
@@ -51,7 +55,7 @@ export const Row = (props: Props) => {
         </FlexCenter>
       </td>
       <td>{meeting.status}</td>
-      <td>
+      <td onClick={onClick}>
         <ActionButtons>
           <ModalTrigger
             title="Edit tag"

packages/plugin-meetings-ui/src/components/myMeetings/SideBar.tsx

@@ -21,8 +21,8 @@ type Props = {
 
 const LeftSideBar = (props: Props) => {
   const { history, queryParams } = props;
-  const [companyId, setCompanyId] = useState('');
-  const [userId, setUserId] = useState('');
+  const [companyId, setCompanyId] = useState(queryParams?.companyId || '');
+  const [userId, setUserId] = useState(queryParams?.ownerId || '');
   const [createdAtFrom, setCreatedForm] = useState(
     queryParams.createdAtFrom || ''
   );

packages/plugin-meetings-ui/src/containers/myCalendar/ChooseOwnerForm.tsx

@@ -4,10 +4,12 @@ import { mutations } from '../../graphql';
 import ChooseOwnerForm from '../../components/myCalendar/ChooseOwnerForm';
 import { IButtonMutateProps } from '@erxes/ui/src/types';
 import { ButtonMutate } from '@erxes/ui/src';
+import { IUser } from '@erxes/ui/src/auth/types';
 
 type Props = {
   closeModal: () => void;
   pinnedUserIds: string[];
+  currentUser: IUser;
 };
 export const ChooseOwnerFormContainer = (props: Props) => {
   const renderButton = ({

packages/plugin-meetings-ui/src/containers/myCalendar/SideBar.tsx

@@ -5,13 +5,15 @@ import { gql, useQuery } from '@apollo/client';
 import { queries as userQueries } from '@erxes/ui/src/team/graphql';
 import { Spinner } from '@erxes/ui/src/components';
 import { queries } from '../../graphql';
+import { IUser } from '@erxes/ui/src/auth/types';
 
 type Props = {
   history: any;
   currentTypeId?: string;
   queryParams: any;
   meetings: IMeeting[];
   loading: boolean;
+  currentUser: IUser;
 };
 
 const SideBarContainer = (props: Props) => {
@@ -32,7 +34,7 @@ const SideBarContainer = (props: Props) => {
   const updatedProps = {
     ...props,
     participantUsers: data.users,
-    pinnedUsers: pinnedUsers.meetingPinnedUsers || {
+    pinnedUsers: pinnedUsers?.meetingPinnedUsers || {
       pinnedUserIds: [],
       userId: '',
       pinnedUsersInfo: []

packages/plugin-meetings-ui/src/containers/myMeetings/List.tsx

@@ -44,7 +44,8 @@ const MyMeetingListContainer = (props: FinalProps) => {
       userId: ownerId,
       companyId,
       searchValue
-    }
+    },
+    fetchPolicy: 'no-cache'
   });
 
   const { data: countData, loading: countLoading } = useQuery(