@eohjsc/react-native-smart-city 0.6.2 → 0.7.0

package/src/commons/ActionGroup/TimerActionTemplate.js

@@ -1,9 +1,8 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import { Switch, TouchableOpacity, View } from 'react-native';
-import { Icon } from '@ant-design/react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import DateTimePickerModal from 'react-native-modal-datetime-picker';
 import moment from 'moment';
-import { IconOutline } from '@ant-design/icons-react-native';
 import { watchMultiConfigs } from '../../iot/Monitor';
 
 import { useTranslations } from '../../hooks/Common/useTranslations';
@@ -184,7 +183,7 @@ const TimerActionTemplate = ({ item = {}, doAction, sensor = {} }) => {
           <Text>{title}</Text>
           {configuration.config_hour && configuration.config_minute && (
             <View style={styles.wrapTimer}>
-              <Icon style={styles.iconClockCircle} name={'clock-circle'} />
+              <AntDesign style={styles.iconClockCircle} name={'clock-circle'} />
               <Text type="Label" color={Colors.Gray7}>
                 {textTimer ? textTimer : t('set_time')}
               </Text>
@@ -194,7 +193,7 @@ const TimerActionTemplate = ({ item = {}, doAction, sensor = {} }) => {
         {configuration.config_hour && !configuration.config_minute && (
           <View style={styles.timerButton}>
             <Text style={styles.textTimerEndLine}>{textTimer}</Text>
-            <IconOutline name="right" size={20} />
+            <AntDesign name="right" size={20} />
           </View>
         )}
       </TouchableOpacity>
@@ -210,7 +209,7 @@ const TimerActionTemplate = ({ item = {}, doAction, sensor = {} }) => {
       )}
       <DateTimePickerModal
         isVisible={showTime}
-        date={dataTime ? dataTime.valueOf() : moment().valueOf()}
+        date={new Date(dataTime ? dataTime.valueOf() : moment().valueOf())}
         mode="time"
         onConfirm={onConfirmTime}
         onCancel={onHideTime}

package/src/commons/ActionGroup/TwoButtonTemplate/index.js

@@ -1,4 +1,4 @@
-import { Icon } from '@ant-design/react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import React, { memo, useState, useCallback, useEffect } from 'react';
 import { TouchableOpacity, View } from 'react-native';
 
@@ -122,7 +122,7 @@ const TwoButtonTemplate = memo(({ item = {}, doAction, sensor = {} }) => {
             key={index}
           >
             <View style={styles.smallCircle}>
-              <Icon
+              <AntDesign
                 name={button?.isCheckOnOff ? button?.icon_on : button?.icon_off}
                 size={44}
                 color={button?.isCheckOnOff ? Colors.Green7 : Colors.Gray6}

package/src/commons/ActionGroup/__test__/ColorPickerTemplate.test.js

@@ -1,5 +1,5 @@
 import { watchMultiConfigs } from '../../../iot/Monitor';
-import React from 'react';
+import React, { useContext } from 'react';
 import { act, create } from 'react-test-renderer';
 import ColorPickerTemplate from '../ColorPickerTemplate';
 import { WheelColorPicker } from '../ColorPickerTemplate';
@@ -10,14 +10,6 @@ import ColorPicker from 'react-native-wheel-color-picker';
 import { DEVICE_TYPE } from '../../../configs/Constants';
 
 const mockSetAction = jest.fn();
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    useContext: () => ({
-      setAction: mockSetAction,
-    }),
-  };
-});
 
 jest.mock('../../../iot/Monitor');
 const mockDoAction = jest.fn();
@@ -55,6 +47,9 @@ describe('Test ColorPickerTemplate', () => {
       title: '',
     };
     mockSetAction.mockClear();
+    useContext.mockReturnValue({
+      setAction: mockSetAction,
+    });
   });
 
   it('render template ColorPickerTemplate', async () => {

package/src/commons/ActionGroup/__test__/NumberUpDownTemplate.test.js

@@ -13,13 +13,6 @@ jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: () => [{ 5: { value: 25 } }, null],
 }));
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 describe('Test NumberUpDownTemplate', () => {
   const actionData = {
     color: '#00979D',
@@ -27,7 +20,7 @@ describe('Test NumberUpDownTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };
@@ -396,7 +389,7 @@ describe('Test NumberUpDownTemplate', () => {
         command_prefer_over_googlehome: false,
         command_prefer_over_internet: false,
         googlehome_actions: [],
-        icon: 'caret-up',
+        icon: 'caretup',
         id: 20,
         key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
       },

package/src/commons/ActionGroup/__test__/OnOffButtonTemplate.test.js

@@ -18,13 +18,6 @@ const wrapComponent = (item, mockDoAction) => (
   </SCProvider>
 );
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 describe('Test OneBigButtonTemplate', () => {
   const actionOnData = {
     color: '#00979D',
@@ -32,7 +25,7 @@ describe('Test OneBigButtonTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };
@@ -43,7 +36,7 @@ describe('Test OneBigButtonTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };
@@ -51,11 +44,11 @@ describe('Test OneBigButtonTemplate', () => {
     configuration: {
       action_on: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
       action_on_data: actionOnData,
-      icon_on: 'caret-up',
+      icon_on: 'caretup',
       text_on: 'ON',
       action_off: '5ed1d4dc-a905-47cd-b0c9-f979644bd21b',
       action_off_data: actionOffData,
-      icon_off: 'caret-up',
+      icon_off: 'caretup',
       text_off: 'OFF',
       config: 1,
     },

package/src/commons/ActionGroup/__test__/OnOffSmartLock.test.js

@@ -13,13 +13,6 @@ jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: jest.fn(),
 }));
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 const wrapComponent = (item, doAction, sensor) => (
   <SCProvider initState={mockSCStore({})}>
     <OnOffSmartLock item={item} doAction={doAction} sensor={sensor} />
@@ -36,7 +29,7 @@ describe('Test OnOffTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: 'key-2',
   };
@@ -46,7 +39,7 @@ describe('Test OnOffTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: 'key-3',
   };

package/src/commons/ActionGroup/__test__/OnOffTemplate.test.js

@@ -1,8 +1,7 @@
 import React from 'react';
-import { View } from 'react-native';
 import { act, create } from 'react-test-renderer';
 
-import { DEVICE_TYPE, AccessibilityLabel } from '../../../configs/Constants';
+import { DEVICE_TYPE } from '../../../configs/Constants';
 import { watchMultiConfigs } from '../../../iot/Monitor';
 import OnOffTemplate from '../OnOffTemplate';
 import OnOffButtonTemplate from '../OnOffTemplate/OnOffButtonTemplate';
@@ -22,13 +21,6 @@ jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: () => [{ 5: { value: 2 } }, null],
 }));
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 describe('Test OnOffTemplate', () => {
   let displayItem;
   let tree;
@@ -40,7 +32,7 @@ describe('Test OnOffTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: 'key-1',
   };
@@ -50,7 +42,7 @@ describe('Test OnOffTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: 'key-2',
   };
@@ -60,7 +52,7 @@ describe('Test OnOffTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: 'key-3',
   };
@@ -113,14 +105,8 @@ describe('Test OnOffTemplate', () => {
     });
     const instance = tree.root;
 
-    const templateOnOffButton = instance.findAll(
-      (el) =>
-        el.props.accessibilityLabel ===
-          AccessibilityLabel.ON_OFF_BUTTON_ACTION_TEMPLATE && el.type === View
-    );
     const templateOnOffSimple = instance.findAllByType(OnOffSimpleTemplate);
 
-    expect(templateOnOffButton).not.toHaveLength(1);
     expect(templateOnOffSimple).not.toHaveLength(1);
   });
 

package/src/commons/ActionGroup/__test__/OneBigButtonTemplate.test.js

@@ -30,7 +30,7 @@ describe('Test OneBigButtonTemplate', () => {
       command_prefer_over_googlehome: false,
       command_prefer_over_internet: false,
       googlehome_actions: [],
-      icon: 'caret-up',
+      icon: 'caretup',
       id: 20,
       key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
     };
@@ -38,7 +38,7 @@ describe('Test OneBigButtonTemplate', () => {
       configuration: {
         action: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
         action_data: actionData,
-        icon: 'caret-up',
+        icon: 'caretup',
         text: 'UP',
       },
     };

package/src/commons/ActionGroup/__test__/OptionsDropdownTemplate.test.js

@@ -30,13 +30,6 @@ jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: () => [{ 5: { value: 2 } }, null],
 }));
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 describe('Test OptionsDropdownActionTemplate', () => {
   const actionData = {
     color: '#00979D',
@@ -44,7 +37,7 @@ describe('Test OptionsDropdownActionTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };

package/src/commons/ActionGroup/__test__/StatesGridActionTemplate.test.js

@@ -8,13 +8,6 @@ import { DEVICE_TYPE } from '../../../configs/Constants';
 const mockDoAction = jest.fn();
 const mockActionData = jest.fn();
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 describe('Test StatesGridActionTemplate', () => {
   let tree;
   let displayItem;

package/src/commons/ActionGroup/__test__/SwitchButtonTemplate.test.js

@@ -17,13 +17,6 @@ const wrapComponent = (item, mockDoAction, isOn) => (
   </SCProvider>
 );
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 describe('Test SwitchButtonTemplate', () => {
   const actionOnData = {
     color: '#00979D',
@@ -31,7 +24,7 @@ describe('Test SwitchButtonTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };
@@ -42,7 +35,7 @@ describe('Test SwitchButtonTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };
@@ -50,11 +43,11 @@ describe('Test SwitchButtonTemplate', () => {
     configuration: {
       action_on: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
       action_on_data: actionOnData,
-      icon_on: 'caret-up',
+      icon_on: 'caretup',
       text_on: 'ON',
       action_off: '5ed1d4dc-a905-47cd-b0c9-f979644bd21b',
       action_off_data: actionOffData,
-      icon_off: 'caret-up',
+      icon_off: 'caretup',
       text_off: 'OFF',
       config: 1,
     },
@@ -67,12 +60,8 @@ describe('Test SwitchButtonTemplate', () => {
     await act(async () => {
       wrapper = await create(wrapComponent(displayItem, mockDoAction));
     });
-
-    const renderJson = wrapper.toJSON();
     const switchButton = wrapper.root.findByType(Switch);
 
-    expect(renderJson[1].props?.visible).toEqual(false);
-    expect(renderJson[1]?.type).toEqual('Modal');
     expect(switchButton.props.value).toEqual(state);
   };
 

package/src/commons/ActionGroup/__test__/TerminalBoxTemplate.test.js

@@ -30,13 +30,6 @@ jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: () => [{ 5: { value: 2 } }, null],
 }));
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 describe('Test TerminalBoxTemplate', () => {
   let displayItem;
   let sensor;

package/src/commons/ActionGroup/__test__/TextBoxTemplate.test.js

@@ -27,13 +27,6 @@ jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: () => [{ 5: { value: 2 } }, null],
 }));
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 describe('Test TextBoxTemplate', () => {
   const actionData = {
     color: '#00979D',
@@ -41,7 +34,7 @@ describe('Test TextBoxTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };

package/src/commons/ActionGroup/__test__/TimerActionTemplate.test.js

@@ -17,13 +17,6 @@ jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: () => [{ 5: { value: 18 }, 6: { value: 30 } }, null],
 }));
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 const mockDoAction = jest.fn();
 
 const wrapComponent = (item, sensor) => (
@@ -39,7 +32,7 @@ describe('Test TimerActionTemplate success with config value', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };
@@ -90,15 +83,15 @@ describe('Test TimerActionTemplate success with config value', () => {
     });
     expect(mockDoAction).toBeCalled();
 
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
+    const touchableOpacities = instance.findAllByType(TouchableOpacity);
     await act(async () => {
-      await TouchableOpacities[0].props.onPress();
+      await touchableOpacities[0].props.onPress();
     });
 
     const dateTimePicker = instance.findByType(DateTimePickerModal);
     expect(dateTimePicker.props.isVisible).toBeTruthy();
     expect(dateTimePicker.props.date).toEqual(
-      moment('18:30', 'HH:mm').valueOf()
+      new Date(moment('18:30', 'HH:mm').valueOf())
     );
   });
 
@@ -127,13 +120,13 @@ describe('Test TimerActionTemplate success with config value', () => {
     await act(async () => {
       await dateTimePicker.props.onConfirm();
     });
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
-    expect(TouchableOpacities).toHaveLength(3);
+    const touchableOpacities = instance.findAllByType(TouchableOpacity);
+    expect(touchableOpacities).toHaveLength(3);
     await act(async () => {
-      await TouchableOpacities[0].props.onPress();
+      await touchableOpacities[0].props.onPress();
     });
     await act(async () => {
-      await TouchableOpacities[2].props.onPress(3);
+      await touchableOpacities[2].props.onPress(3);
     });
     expect(mockDoAction).toBeCalled();
   });

package/src/commons/ActionGroup/__test__/TimerActionTemplateWithutConfigValue.test.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { Switch } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import DateTimePickerModal from 'react-native-modal-datetime-picker';
-import moment from 'moment';
 
 import Text from '../../Text';
 import { watchMultiConfigs } from '../../../iot/Monitor';
@@ -16,13 +15,6 @@ jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: () => [{}, null],
 }));
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 const wrapComponent = (item, mockDoAction, is_managed_by_backend) => (
   <SCProvider initState={mockSCStore({})}>
     <TimerActionTemplate
@@ -40,7 +32,7 @@ describe('Test TimerActionTemplate without config value', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };
@@ -77,7 +69,7 @@ describe('Test TimerActionTemplate without config value', () => {
     const dateTimePicker = instance.findByType(DateTimePickerModal);
     expect(dateTimePicker.props.isVisible).toBeFalsy();
     expect(dateTimePicker.props.date).toEqual(
-      moment('2021-09-09T10:00:00.000Z').valueOf()
+      new Date('2021-09-09T10:00:00.000Z')
     );
   });
 

package/src/commons/ActionGroup/__test__/TwoButtonTemplate.test.js

@@ -1,21 +1,9 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import { DEVICE_TYPE } from '../../../configs/Constants';
 import TwoButtonTemplate from '../TwoButtonTemplate';
 
-jest.mock('react', () => ({
-  ...jest.requireActual('react'),
-  useState: jest.fn(),
-}));
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 describe('Test TwoButtonTemplate', () => {
   const actionOnData = {
     color: '#00979D',
@@ -23,7 +11,7 @@ describe('Test TwoButtonTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };
@@ -34,7 +22,7 @@ describe('Test TwoButtonTemplate', () => {
     command_prefer_over_googlehome: false,
     command_prefer_over_internet: false,
     googlehome_actions: [],
-    icon: 'caret-up',
+    icon: 'caretup',
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };
@@ -73,11 +61,7 @@ describe('Test TwoButtonTemplate', () => {
   };
   let wrapper;
 
-  const setState = jest.fn();
-  useState.mockImplementation((init) => [init, setState]);
-
   const assertRender = async (state, text) => {
-    useState.mockImplementationOnce((init) => [state, setState]);
     const mockDoAction = jest.fn();
     await act(async () => {
       wrapper = create(
@@ -101,7 +85,6 @@ describe('Test TwoButtonTemplate', () => {
   });
 
   const assertActionCall = async (state, action_data) => {
-    useState.mockImplementationOnce((init) => [state, setState]);
     const mockDoAction = jest.fn();
     await act(async () => {
       wrapper = create(