fix(meetings): bug fixes after test cases (#364)

erxes · Oct 10, 2023 · 368e75c · 368e75c
1 parent a75927b
commit 368e75c
Show file tree

Hide file tree

Showing 10 changed files with 186 additions and 69 deletions.
diff --git a/packages/plugin-meetings-api/src/models/Meetings.ts b/packages/plugin-meetings-api/src/models/Meetings.ts
@@ -53,8 +53,7 @@ export const loadMeetingClass = (model: IModels) => {
       }
       const result = await model.Meetings.findOne({
         _id: doc._id,
-        createdBy: user._id,
-        status: { $ne: 'completed' }
+        createdBy: user._id
       });
       if (result) {
         await model.Meetings.updateOne(

diff --git a/packages/plugin-meetings-ui/src/components/List.tsx b/packages/plugin-meetings-ui/src/components/List.tsx
@@ -2,7 +2,6 @@ import Button from '@erxes/ui/src/components/Button';
 import { __, router } from '@erxes/ui/src/utils';
 import React, { useEffect, useState } from 'react';
 import MeetingFormContainer from '../containers/myCalendar/meeting/Form';
-import MyMeetingListContainer from '../containers/myMeetings/List';
 import { Title } from '@erxes/ui-settings/src/styles';
 import ModalTrigger from '@erxes/ui/src/components/ModalTrigger';
 import Wrapper from '@erxes/ui/src/layout/components/Wrapper';
@@ -11,10 +10,9 @@ import DataWithLoader from '@erxes/ui/src/components/DataWithLoader';
 import { menuMeeting } from '../contants';
 import { MyCalendarList } from './myCalendar/MyCalendar';
 import SideBar from '../containers/myCalendar/SideBar';
-import SideBarContainer from '../containers/myMeetings/SideBar';
 import { IUser } from '@erxes/ui/src/auth/types';
-import { FormControl } from '@erxes/ui/src/components';
 import { MeetingsQueryResponse } from '../types';
+import MyMeetings from './myMeetings/MyMeetings';
 
 type Props = {
   meetings: any;
@@ -36,28 +34,17 @@ function List(props: Props) {
     currentUser,
     meetingQuery
   } = props;
-  const { meetingId, searchValue } = queryParams;
+  const { meetingId } = queryParams;
 
   const [component, setComponent] = useState(<div />);
   const [leftSideBar, setLeftSideBar] = useState(<div />);
 
-  const [searchText, setSearchValue] = useState(searchValue);
-
   const routePath = location.pathname.split('/').slice(-1)[0];
 
   useEffect(() => {
     switch (routePath) {
       case 'myMeetings':
-        setComponent(
-          <MyMeetingListContainer history={history} queryParams={queryParams} />
-        );
-        setLeftSideBar(
-          <SideBarContainer
-            history={history}
-            queryParams={queryParams}
-            currentUser={currentUser}
-          />
-        );
+        <MyMeetings {...props} />;
         break;
       default:
         setComponent(
@@ -102,48 +89,27 @@ function List(props: Props) {
     />
   );
 
-  const searchHandler = e => {
-    const searchValue = e.target.value;
-
-    setSearchValue(searchValue);
-
-    setTimeout(() => {
-      router.removeParams(history, 'page');
-      router.setParams(history, { searchValue });
-    }, 500);
-  };
   const backToCalendar = () => {
     router.removeParams(history, 'meetingId');
   };
-  const actionBarRight =
-    routePath === 'myCalendar' ? (
-      meetingId ? (
-        <Button
-          btnStyle="success"
-          size="small"
-          icon="calendar-alt"
-          onClick={backToCalendar}
-        >
-          {__('Back to calendar')}
-        </Button>
-      ) : (
-        <ModalTrigger
-          title={__('Create meetings')}
-          trigger={trigger}
-          content={modalContent}
-          enforceFocus={false}
-          size="xl"
-        />
-      )
-    ) : (
-      <FormControl
-        type="text"
-        placeholder={__('Type to search')}
-        defaultValue={searchText}
-        onChange={searchHandler}
-        autoFocus={true}
-      />
-    );
+  const actionBarRight = meetingId ? (
+    <Button
+      btnStyle="success"
+      size="small"
+      icon="calendar-alt"
+      onClick={backToCalendar}
+    >
+      {__('Back to calendar')}
+    </Button>
+  ) : (
+    <ModalTrigger
+      title={__('Create meetings')}
+      trigger={trigger}
+      content={modalContent}
+      enforceFocus={false}
+      size="xl"
+    />
+  );
 
   const title = !meetingId && (
     <Title capitalize={true}>{__('My Calendar')}</Title>

diff --git a/packages/plugin-meetings-ui/src/components/myCalendar/SideBar.tsx b/packages/plugin-meetings-ui/src/components/myCalendar/SideBar.tsx
@@ -226,7 +226,7 @@ export const SideBar = (props: Props) => {
         </Box>
       )}
       {tommorowMeetings(filteredMeeting)?.length > 0 && (
-        <Box title="Tommorow" name={`tomorrow`} isOpen={true}>
+        <Box title="Tomorrow" name={`tomorrow`} isOpen={true}>
           <SidebarList noTextColor noBackground id="SideBar">
             {tommorowMeetings(filteredMeeting)?.map(meeting => {
               return ListItem(meeting);

diff --git a/packages/plugin-meetings-ui/src/components/myCalendar/meeting/Detail.tsx b/packages/plugin-meetings-ui/src/components/myCalendar/meeting/Detail.tsx
@@ -15,9 +15,13 @@ import {
 import { IMeeting, ITopic } from '../../../types';
 
 import { TopicFormContainer } from '../../../containers/myCalendar/topic/Form';
+import Form from '../../../containers/myCalendar/meeting/Form';
+
 import Button from '@erxes/ui/src/components/Button';
 import { Link } from 'react-router-dom';
 import { DrawerDetail } from '@erxes/ui-automations/src/styles';
+import queries from '../../../graphql/queries';
+import { gql } from '@apollo/client';
 
 type Props = {
   meetingDetail: IMeeting;
@@ -88,6 +92,25 @@ export const MeetingDetail = (props: Props) => {
     />
   );
 
+  const editTrigger = (
+    <Button id={'EditMeetingButton'} btnStyle="success" icon="edit-3">
+      Edit
+    </Button>
+  );
+
+  const editModalContent = props => (
+    <Form
+      {...props}
+      meeting={meetingDetail}
+      refetch={[
+        {
+          query: gql(queries.meetingDetail),
+          variables: { _id: meetingDetail._id }
+        }
+      ]}
+    />
+  );
+
   const renderTabContent = () => {
     return (
       <>
@@ -195,6 +218,14 @@ export const MeetingDetail = (props: Props) => {
               ? 'Start meeting'
               : 'End meeting'}
           </Button>
+
+          <ModalTrigger
+            title={__('Edit meeting')}
+            trigger={editTrigger}
+            content={editModalContent}
+            enforceFocus={false}
+            size="xl"
+          />
         </MeetingDetailFooter>
       )}
     </MeetingWrapper>

diff --git a/packages/plugin-meetings-ui/src/components/myCalendar/meeting/Form.tsx b/packages/plugin-meetings-ui/src/components/myCalendar/meeting/Form.tsx
@@ -5,7 +5,7 @@ import Button from '@erxes/ui/src/components/Button';
 import { ModalFooter } from '@erxes/ui/src/styles/main';
 import ControlLabel from '@erxes/ui/src/components/form/Label';
 import { IButtonMutateProps, IFormProps, IOption } from '@erxes/ui/src/types';
-import { __ } from '@erxes/ui/src/utils';
+import { __, Alert } from '@erxes/ui/src/utils';
 import React, { useEffect, useState } from 'react';
 import { ICommonFormProps } from '@erxes/ui-settings/src/common/types';
 import { IMeeting } from '../../../types';
@@ -44,7 +44,7 @@ export const MeetingForm = (props: Props) => {
   let dealInitialId = dealId ? [dealId] : '';
 
   const [userIds, setUserIds] = useState([props.currentUser._id] || []);
-  const [companyId, setCompanyId] = useState('');
+  const [companyId, setCompanyId] = useState(meeting?.companyId || '');
   const [title, setTitle] = useState('');
   const [selectedMethod, setSelectedMethod] = useState('');
   const [dealIds, setDealIds] = useState(dealInitialId);
@@ -53,7 +53,7 @@ export const MeetingForm = (props: Props) => {
     calendarDate?.startDate || new Date()
   );
   const [endDate, setEndDate] = useState<string | Date>(
-    calendarDate?.endDate || new Date()
+    calendarDate?.endDate || ''
   );
 
   useEffect(() => {
@@ -112,7 +112,9 @@ export const MeetingForm = (props: Props) => {
   };
 
   const onEndDateChange = dateVal => {
-    setEndDate(dateVal);
+    if (new Date() < dateVal) {
+      setEndDate(dateVal);
+    } else Alert.warning('Please choose the correct date');
   };
 
   const renderDatePicker = () => {
@@ -160,7 +162,6 @@ export const MeetingForm = (props: Props) => {
     const { closeModal, renderButton } = props;
     const { values, isSubmitted } = formProps;
     const object = meeting || ({} as IMeeting);
-
     let dealOptions =
       (deals &&
         deals.map((deal: any) => ({
@@ -182,6 +183,7 @@ export const MeetingForm = (props: Props) => {
             name="companyId"
             onSelect={onCompanySelect}
             multi={false}
+            initialValue={companyId}
           />
         </FormGroup>
 
@@ -263,7 +265,7 @@ export const MeetingForm = (props: Props) => {
           </Button>
 
           {renderButton({
-            passedName: 'meetings',
+            passedName: 'meeting',
             values: generateDoc(values),
             isSubmitted,
             callback: closeModal,

diff --git a/packages/plugin-meetings-ui/src/components/myMeetings/MyMeetings.tsx b/packages/plugin-meetings-ui/src/components/myMeetings/MyMeetings.tsx
@@ -0,0 +1,87 @@
+import { __, router } from '@erxes/ui/src/utils';
+import React, { useState } from 'react';
+
+import Wrapper from '@erxes/ui/src/layout/components/Wrapper';
+import DataWithLoader from '@erxes/ui/src/components/DataWithLoader';
+
+import SideBarContainer from '../myMeetings/SideBar';
+import { IUser } from '@erxes/ui/src/auth/types';
+import { FormControl } from '@erxes/ui/src/components';
+import { MeetingsQueryResponse } from '../../types';
+import MyMeetingListContainer from '../../containers/myMeetings/List';
+import { menuMeeting } from '../../contants';
+
+type Props = {
+  meetings: any;
+  loading: boolean;
+  queryParams: any;
+  route?: string;
+  history: string;
+  refetchQueries?: any;
+  currentUser: IUser;
+  meetingQuery?: MeetingsQueryResponse;
+};
+
+function MyMeetings(props: Props) {
+  const { loading, queryParams, history, currentUser } = props;
+  const { searchValue } = queryParams;
+  const [searchText, setSearchValue] = useState(searchValue);
+
+  const searchHandler = e => {
+    const searchValue = e.target.value;
+
+    setSearchValue(searchValue);
+
+    setTimeout(() => {
+      router.removeParams(history, 'page');
+      router.setParams(history, { searchValue });
+    }, 500);
+  };
+
+  const leftSideBar = (
+    <SideBarContainer
+      history={history}
+      queryParams={queryParams}
+      currentUser={currentUser}
+    />
+  );
+
+  const actionBarRight = (
+    <FormControl
+      type="text"
+      placeholder={__('Type to search')}
+      defaultValue={searchText}
+      onChange={searchHandler}
+      autoFocus={true}
+    />
+  );
+
+  const actionBar = <Wrapper.ActionBar right={actionBarRight} wideSpacing />;
+  return (
+    <Wrapper
+      header={
+        <Wrapper.Header title={__('My Meetings')} submenu={menuMeeting()} />
+      }
+      actionBar={actionBar}
+      content={
+        <DataWithLoader
+          data={
+            <MyMeetingListContainer
+              history={history}
+              queryParams={queryParams}
+            />
+          }
+          loading={loading}
+          count={1}
+          emptyText={__('Theres no meetings')}
+          emptyImage="/images/actions/8.svg"
+        />
+      }
+      leftSidebar={leftSideBar}
+      transparent={true}
+      hasBorder
+    />
+  );
+}
+
+export default MyMeetings;
diff --git a/packages/plugin-meetings-ui/src/components/myMeetings/Row.tsx b/packages/plugin-meetings-ui/src/components/myMeetings/Row.tsx
@@ -31,7 +31,9 @@ export const Row = (props: Props) => {
     );
   };
 
-  const content = props => <Form {...props} meeting={meeting} />;
+  const content = props => (
+    <Form {...props} meeting={meeting} refetch={['meetings']} />
+  );
 
   const onTrClick = () => {
     history.push(`/meetings/myCalendar?meetingId=${meeting._id}`);
@@ -58,7 +60,7 @@ export const Row = (props: Props) => {
       <td onClick={onClick}>
         <ActionButtons>
           <ModalTrigger
-            title="Edit tag"
+            title="Edit meeting"
             trigger={editTrigger}
             content={content}
           />

diff --git a/packages/plugin-meetings-ui/src/containers/myMeetings/List.tsx b/packages/plugin-meetings-ui/src/containers/myMeetings/List.tsx
@@ -34,6 +34,7 @@ const MyMeetingListContainer = (props: FinalProps) => {
     companyId,
     searchValue
   } = queryParams;
+
   const { data, loading } = useQuery(gql(queries.meetings), {
     variables: {
       perPage: parseInt(perPage?.toString()) || 10,
@@ -44,8 +45,7 @@ const MyMeetingListContainer = (props: FinalProps) => {
       userId: ownerId,
       companyId,
       searchValue
-    },
-    fetchPolicy: 'no-cache'
+    }
   });
 
   const { data: countData, loading: countLoading } = useQuery(

diff --git a/packages/plugin-meetings-ui/src/graphql/queries.ts b/packages/plugin-meetings-ui/src/graphql/queries.ts
@@ -80,6 +80,8 @@ query MeetingDetail($_id: String!) {
     createdAt
     status
     companyId
+    participantIds
+    dealIds
     deals{
       _id
       boardId
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,6 +80,8 @@ query MeetingDetail($_id: String!) { @@
         createdAt
         status
         companyId
+        participantIds
+        dealIds
         deals{
           _id
           boardId
@@ Expand Down @@