Merge branch 'master' of https://github.com/glific/glific-frontend in…

…to update/types
glific · Jan 20, 2022 · 46b603c · 46b603c
2 parents 839e1f2 + 9e3f3cb
commit 46b603c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/src/common/utils.ts b/src/common/utils.ts
@@ -112,7 +112,7 @@ export const getDisplayName = (conversation: any) => {
     setLogs(er, 'error');
   }
 
-  if (contactFields.name) {
+  if (contactFields?.name) {
     displayName = contactFields.name.value;
   } else if (conversation.contact.name) {
     displayName = conversation.contact.name;

diff --git a/src/components/UI/Form/TimePicker/TimePicker.test.tsx b/src/components/UI/Form/TimePicker/TimePicker.test.tsx
@@ -39,7 +39,7 @@ describe('<TimePicker />', () => {
   it('test time change event', async () => {
     render(wrapper);
     const input = screen.getByRole('textbox');
-    UserEvent.type(input, '09:00 AM');
+    fireEvent.change(input, { target: { value: '09:00 AM' } });
     expect(input).toHaveValue('09:00 AM');
   });
 

diff --git a/src/components/UI/Form/TimePicker/TimePicker.tsx b/src/components/UI/Form/TimePicker/TimePicker.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import 'date-fns';
 import Grid from '@material-ui/core/Grid';
 import DateFnsUtils from '@date-io/date-fns';
@@ -28,6 +28,7 @@ export const TimePicker: React.SFC<TimePickerProps> = ({
 }) => {
   moment.defaultFormat = 'Thh:mm:ss';
   const dateValue = field.value ? moment(field.value, moment.defaultFormat).toDate() : null;
+  const [open, setOpen] = useState(false);
 
   const errorText = getIn(errors, field.name);
   const touchedVal = getIn(touched, field.name);
@@ -44,12 +45,15 @@ export const TimePicker: React.SFC<TimePickerProps> = ({
         <KeyboardTimePicker
           error={hasError}
           autoOk
+          open={open}
           variant={variant}
           inputVariant={inputVariant}
           label={placeholder}
           data-testid="time-picker"
           mask="__:__ _M"
           value={dateValue}
+          onClick={() => !disabled && setOpen(true)}
+          onClose={() => setOpen(false)}
           disabled={disabled}
           onChange={(date) => handleDateChange(date)}
           keyboardIcon={<ScheduleIcon />}

diff --git a/src/components/UI/Menu/Menu.tsx b/src/components/UI/Menu/Menu.tsx
@@ -12,9 +12,7 @@ const Menu: React.SFC<MenuProps> = (props) => {
   const { menus, children } = props;
   const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
 
-  const handleClick = (
-    event: React.MouseEvent<HTMLDivElement> | React.KeyboardEvent<HTMLDivElement>
-  ) => {
+  const handleClick = (event: React.MouseEvent<HTMLDivElement>) => {
     setAnchorEl(event.currentTarget);
   };
 
@@ -38,7 +36,7 @@ const Menu: React.SFC<MenuProps> = (props) => {
 
   return (
     <div data-testid="Menu">
-      <div onClick={handleClick} onKeyDown={handleClick} aria-hidden="true">
+      <div onMouseEnter={handleClick} aria-hidden="true">
         {children}
       </div>
       <MenuElement

diff --git a/src/containers/SettingList/Organisation/Organisation.tsx b/src/containers/SettingList/Organisation/Organisation.tsx
@@ -204,6 +204,14 @@ export const Organisation: React.SFC = () => {
     activeLanguages: Yup.array().required(t('Supported Languages is required.')),
     defaultLanguage: Yup.object().nullable().required(t('Default Language is required.')),
     signaturePhrase: Yup.string().nullable().required(t('Webhook signature is required.')),
+    endTime: Yup.string()
+      .test('is-midnight', t('End time cannot be 12 AM'), (value) => value !== 'T00:00:00')
+      .test('is-valid', t('Not a valid time'), (value) => value !== 'Invalid date'),
+    startTime: Yup.string().test(
+      'is-valid',
+      t('Not a valid time'),
+      (value) => value !== 'Invalid date'
+    ),
     newcontactFlowId: Yup.object()
       .nullable()
       .when('newcontactFlowEnabled', {