Merge branch 'develop' into release

urfit-tech · Oct 16, 2024 · d339f93 · d339f93
2 parents 312f88f + 84bad41
commit d339f93
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 38 deletions.
diff --git a/src/components/appointment/AppointmentCard.tsx b/src/components/appointment/AppointmentCard.tsx
@@ -1,4 +1,4 @@
-import { gql, useApolloClient, useQuery } from '@apollo/client'
+import { gql, useQuery } from '@apollo/client'
 import { Icon } from '@chakra-ui/icons'
 import { Button, ButtonGroup, SkeletonCircle, SkeletonText, Spinner, Textarea } from '@chakra-ui/react'
 import { Divider, Dropdown, Form, Icon as AntdIcon, Menu, message, Modal } from 'antd'
@@ -17,7 +17,7 @@ import styled from 'styled-components'
 import hasura from '../../hasura'
 import { dateRangeFormatter, downloadFile, getFileDownloadableLink, handleError } from '../../helpers'
 import { useAppointmentPlan, useCancelAppointment, useUpdateAppointmentIssue } from '../../hooks/appointment'
-import { GetMeetByTargetAndPeriodAndSpecifyMember } from '../../hooks/meet'
+import { useGetMeetByTargetAndPeriodAndSpecifyMember } from '../../hooks/meet'
 import { useService } from '../../hooks/service'
 import DefaultAvatar from '../../images/avatar.svg'
 import { ReactComponent as CalendarOIcon } from '../../images/calendar-alt-o.svg'
@@ -181,8 +181,7 @@ const AppointmentCard: React.VFC<AppointmentCardProps> = ({
   onRefetch,
   form,
 }) => {
-  const apolloClient = useApolloClient()
-  const { id: appId, enabledModules } = useApp()
+  const { enabledModules } = useApp()
   const { formatMessage } = useIntl()
   const { authToken, currentMemberId, currentMember } = useAuth()
   const [issueModalVisible, setIssueModalVisible] = useState(false)
@@ -205,6 +204,8 @@ const AppointmentCard: React.VFC<AppointmentCardProps> = ({
     appointmentPlanId,
     memberId,
   )
+  const { meet } = useGetMeetByTargetAndPeriodAndSpecifyMember(appointmentPlanId, orderProduct, memberId)
+
   const updateAppointmentIssue = useUpdateAppointmentIssue(orderProductId, orderProduct.options)
   const cancelAppointment = useCancelAppointment(orderProductId, orderProduct.options)
 
@@ -286,21 +287,8 @@ const AppointmentCard: React.VFC<AppointmentCardProps> = ({
     if (!appointmentPlan) return message.error(formatMessage(appointmentMessages.AppointmentCard.noAppointmentPlan))
     if (!appointmentPlan.creator)
       return message.error(formatMessage(appointmentMessages.AppointmentCard.noAppointmentPlanCreator))
-    const { data } = await apolloClient.query<
-      hasura.GetMeetByTargetAndPeriodAndSpecifyMember,
-      hasura.GetMeetByTargetAndPeriodAndSpecifyMemberVariables
-    >({
-      query: GetMeetByTargetAndPeriodAndSpecifyMember,
-      variables: {
-        appId,
-        target: appointmentPlanId,
-        startedAt: orderProduct.startedAt,
-        endedAt: orderProduct.endedAt,
-        memberId: currentMemberId,
-      },
-    })
-    if (data.meet.length !== 0 && data.meet[0].options?.joinUrl) {
-      joinUrl = data.meet[0].options.joinUrl
+    if (meet?.options?.joinUrl) {
+      joinUrl = meet?.options.joinUrl
     } else if (enabledModules.meet_service && appointmentPlan.defaultMeetGateway === 'zoom') {
       // create zoom meeting than get joinUrl
       try {
@@ -408,24 +396,8 @@ const AppointmentCard: React.VFC<AppointmentCardProps> = ({
                 return message.error(formatMessage(appointmentMessages.AppointmentCard.noAppointmentPlan))
               if (!currentMemberId)
                 return message.error(formatMessage(appointmentMessages.AppointmentCard.noCurrentUserId))
-              const { data } = await apolloClient.query<
-                hasura.GetMeetByTargetAndPeriodAndSpecifyMember,
-                hasura.GetMeetByTargetAndPeriodAndSpecifyMemberVariables
-              >({
-                query: GetMeetByTargetAndPeriodAndSpecifyMember,
-                variables: {
-                  appId,
-                  target: appointmentPlanId,
-                  startedAt: orderProduct.startedAt,
-                  endedAt: orderProduct.endedAt,
-                  memberId,
-                },
-              })
-              if (!data) return message.error(formatMessage(appointmentMessages.AppointmentCard.noMeetingInfo))
               const link = await getFileDownloadableLink(
-                data.meet[0].recording_url
-                  ? data.meet[0].recording_url
-                  : `meets/${data.meet[0].id}.${data.meet[0].recording_type}`,
+                meet?.recordingUrl ? meet?.recordingUrl : `meets/${meet?.id}.${meet?.recordingType}`,
                 authToken,
               )
               return downloadFile(
@@ -472,7 +444,7 @@ const AppointmentCard: React.VFC<AppointmentCardProps> = ({
                     .replace('{{TITLE}}', appointmentPlan.title)
                     .replace('{{STARTED_AT}}', moment(orderProduct.startedAt).format('YYYYMMDDTHHmmss'))
                     .replace('{{ENDED_AT}}', moment(orderProduct.endedAt).format('YYYYMMDDTHHmmss'))
-                    .replace('{{DETAILS}}', orderProduct.appointmentUrl),
+                    .replace('{{DETAILS}}', meet?.options?.joinUrl || appointmentPlan.meetingLinkUrl),
                 )
               }
             >
@@ -481,7 +453,7 @@ const AppointmentCard: React.VFC<AppointmentCardProps> = ({
 
             {loadingAppointmentPlan ? (
               <SkeletonText noOfLines={1} spacing="4" w="90px" />
-            ) : !orderProduct.options?.joinUrl &&
+            ) : !meet?.options?.joinUrl &&
               !appointmentPlan.meetingLinkUrl &&
               appointmentPlan.meetGenerationMethod === 'manual' ? (
               <StyledLabel>{formatMessage(appointmentMessages.AppointmentCard.noLinkSet)}</StyledLabel>

diff --git a/src/hooks/meet.ts b/src/hooks/meet.ts
@@ -74,6 +74,37 @@ export const useMeetByTargetAndPeriod = (target: string, startedAt: Date, endedA
   }
 }
 
+export const useGetMeetByTargetAndPeriodAndSpecifyMember = (
+  appointmentPlanId: string,
+  orderProduct: { startedAt: Date | null; endedAt: Date | null },
+  memberId: string,
+) => {
+  const { id: appId } = useApp()
+  const { data, error, loading } = useQuery<
+    hasura.GetMeetByTargetAndPeriodAndSpecifyMember,
+    hasura.GetMeetByTargetAndPeriodAndSpecifyMemberVariables
+  >(GetMeetByTargetAndPeriodAndSpecifyMember, {
+    variables: {
+      appId,
+      target: appointmentPlanId,
+      startedAt: orderProduct.startedAt,
+      endedAt: orderProduct.endedAt,
+      memberId: memberId || '',
+    },
+    skip: !memberId,
+  })
+  const meet =
+    loading || !data?.meet || error
+      ? null
+      : {
+          id: data.meet[0]?.id,
+          recordingUrl: data.meet[0]?.recording_url,
+          recordingType: data.meet[0]?.recording_type,
+          options: data.meet[0]?.options,
+        }
+  return { meet }
+}
+
 export const GetMeetByTargetAndPeriod = gql`
   query GetMeetByTargetAndPeriod($appId: String!, $target: uuid!, $startedAt: timestamptz!, $endedAt: timestamptz!) {
     meet(