@eohjsc/react-native-smart-city 0.4.41 → 0.4.42

package/src/hooks/IoT/__test__/useRemoteControl.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useRemoteControl } from '../index';
 import {
-  // BLUETOOOH_DEVICE_UNSTABLE,
+  BLUETOOOH_DEVICE_UNSTABLE,
   sendCommandOverBluetooth,
   SEND_COMMAND_OVER_BLUETOOTH_FAIL,
 } from '../../../iot/RemoteControl/Bluetooth';
@@ -35,7 +35,6 @@ describe('Test useRemoteControl', () => {
     sendCommandOverBluetooth.mockClear();
     sendCommandOverHomeAssistant.mockClear();
     sendCommandOverInternet.mockClear();
-    jest.useFakeTimers();
 
     sensor = {
       id: 1,
@@ -255,58 +254,58 @@ describe('Test useRemoteControl', () => {
     expect(sendCommandOverBluetooth).not.toBeCalled();
   });
 
-  // it('test send remote command via bluetooth case when bluetooh device unstable', async () => {
-  //   action.command_prefer_over_bluetooth = true;
-  //   action.command_prefer_over_internet = false;
-  //   const { result: sendRemoteCommand } = renderHook(() => useRemoteControl(), {
-  //     wrapper,
-  //   });
+  it('test send remote command via bluetooth case when bluetooh device unstable', async () => {
+    action.command_prefer_over_bluetooth = true;
+    action.command_prefer_over_internet = false;
+    const { result: sendRemoteCommand } = renderHook(() => useRemoteControl(), {
+      wrapper,
+    });
 
-  //   sendCommandOverBluetooth.mockImplementation(() => {
-  //     return BLUETOOOH_DEVICE_UNSTABLE;
-  //   });
-  //   await act(async () => {
-  //     await sendRemoteCommand.current(sensor, action, data, userId);
-  //   });
-  //   await flushPromises();
-  //   expect(sendCommandOverBluetooth).toBeCalledWith(
-  //     sensor,
-  //     action,
-  //     data,
-  //     userId
-  //   );
-  //   expect(sendCommandOverBluetooth).toBeCalledTimes(6);
-  // });
+    sendCommandOverBluetooth.mockImplementation(() => {
+      return BLUETOOOH_DEVICE_UNSTABLE;
+    });
+    await act(async () => {
+      await sendRemoteCommand.current(sensor, action, data, userId);
+    });
+    await flushPromises();
+    expect(sendCommandOverBluetooth).toBeCalledWith(
+      sensor,
+      action,
+      data,
+      userId
+    );
+    expect(sendCommandOverBluetooth).toBeCalledTimes(6);
+  });
 
   // eslint-disable-next-line max-len
-  // it('test send remote command via bluetooth case when bluetooh device unstable 5 times will switch send internet', async () => {
-  //   action.command_prefer_over_bluetooth = true;
-  //   action.command_prefer_over_internet = false;
-  //   const { result: sendRemoteCommand } = renderHook(() => useRemoteControl(), {
-  //     wrapper,
-  //   });
+  it('test send remote command via bluetooth case when bluetooh device unstable 5 times will switch send internet', async () => {
+    action.command_prefer_over_bluetooth = true;
+    action.command_prefer_over_internet = false;
+    const { result: sendRemoteCommand } = renderHook(() => useRemoteControl(), {
+      wrapper,
+    });
 
-  //   sendCommandOverBluetooth.mockImplementation(() => {
-  //     return BLUETOOOH_DEVICE_UNSTABLE;
-  //   });
-  //   sendCommandOverInternet.mockImplementation(async () => true);
-  //   await act(async () => {
-  //     await sendRemoteCommand.current(sensor, action, data, userId);
-  //   });
-  //   await flushPromises();
-  //   expect(sendCommandOverBluetooth).toBeCalledWith(
-  //     sensor,
-  //     action,
-  //     data,
-  //     userId
-  //   );
-  //   expect(sendCommandOverInternet).toBeCalledWith(
-  //     sensor,
-  //     action,
-  //     data,
-  //     'bluetooth'
-  //   );
-  //   expect(sendCommandOverBluetooth).toBeCalledTimes(6);
-  //   expect(sendCommandOverInternet).toBeCalledTimes(1);
-  // });
+    sendCommandOverBluetooth.mockImplementation(() => {
+      return BLUETOOOH_DEVICE_UNSTABLE;
+    });
+    sendCommandOverInternet.mockImplementation(async () => true);
+    await act(async () => {
+      await sendRemoteCommand.current(sensor, action, data, userId);
+    });
+    await flushPromises();
+    expect(sendCommandOverBluetooth).toBeCalledWith(
+      sensor,
+      action,
+      data,
+      userId
+    );
+    expect(sendCommandOverInternet).toBeCalledWith(
+      sensor,
+      action,
+      data,
+      'bluetooth'
+    );
+    expect(sendCommandOverBluetooth).toBeCalledTimes(6);
+    expect(sendCommandOverInternet).toBeCalledTimes(1);
+  });
 });

package/src/hooks/IoT/__test__/useWatchConfigs.test.js

@@ -40,8 +40,7 @@ describe('Test useWatchConfigs', () => {
     renderHook(() => useWatchConfigs([1]), {
       wrapper,
     });
-    // NOTE: Hinh will fix it later
-    expect(watchMultiConfigs).not.toBeCalledWith([1]);
-    expect(unwatchMultiConfigs).not.toBeCalledWith([1]);
+    expect(watchMultiConfigs).toBeCalledWith([1]);
+    expect(unwatchMultiConfigs).toBeCalledWith([1]);
   });
 });

package/src/hooks/useMqtt.js

@@ -47,11 +47,8 @@ const connectChipMqtt = (chip) => {
     client.subscribe(`eoh/chip/${code}/#`);
   });
   client.on('message', (topic, payload, packet) => {
-    try {
-      const payloadObject = JSON.parse(payload.toString());
-      handleMqttMessage(topic, payloadObject, code, chip, configById);
-      // eslint-disable-next-line no-empty
-    } catch {}
+    const payloadObject = JSON.parse(payload.toString());
+    handleMqttMessage(topic, payloadObject, code, chip, configById);
   });
 
   return client;

package/src/iot/mqtt.js

@@ -24,9 +24,7 @@ const uint_32 = (bytes_str, config_data = null) => {
   let bits = 32;
   let value = Number.parseInt(bytes_str, 16);
 
-  // eslint-disable-next-line no-bitwise
   if (value & (1 << (bits - 1))) {
-    // eslint-disable-next-line no-bitwise
     value -= 1 << bits;
   }
 

package/src/navigations/UnitStack.js

@@ -1,5 +1,5 @@
 import React, { memo, useContext, useEffect } from 'react';
-import { AppState, Platform, View } from 'react-native';
+import { AppState, View } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { createStackNavigator } from '@react-navigation/stack';
 import { BleManager } from 'react-native-ble-plx';
@@ -172,7 +172,7 @@ export const UnitStack = memo((props) => {
         headerTitleAlign: 'center',
         headerBackImage: () => (
           <IconOutline
-            name={Platform.OS === 'android' ? 'left-square' : 'left'}
+            name="left"
             size={27}
             color={Colors.Black}
             style={styles.icLeft}

package/src/screens/AddNewGateway/ConnectingDevice.js

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useState, useMemo } from 'react';
 import { useNavigation } from '@react-navigation/native';
 import { Alert } from 'react-native';
-import { v4 as uuidv4 } from 'uuid';
+import uuid from 'uuid';
 
 import Processing from '../../commons/Processing';
 import Routes from '../../utils/Route';
@@ -43,7 +43,7 @@ const ConnectingDevice = ({
   );
 
   const channelName = useMemo(() => {
-    return 'cache-' + uuidv4();
+    return 'cache-' + uuid.v4();
   }, []);
 
   const onPressContinue = useCallback(() => {

package/src/screens/AddNewGateway/ShareWifiPassword.js

@@ -15,7 +15,7 @@ import {
 import dgram from 'react-native-udp';
 import { useNavigation, useIsFocused } from '@react-navigation/native';
 import LottieView from 'lottie-react-native';
-import { v4 as uuidv4 } from 'uuid';
+import uuid from 'uuid';
 
 import { ToastBottomHelper } from '../../utils/Utils';
 import { useTranslations } from '../../hooks/Common/useTranslations';
@@ -76,7 +76,7 @@ const ShareWifiPassword = ({ route }) => {
   const [dataGateway, setDataGateway] = useState({ gateway: [], error: '' });
 
   const code = useMemo(() => {
-    return uuidv4();
+    return uuid.v4();
   }, []);
 
   const hidePopupPassword = useCallback(() => {

package/src/screens/AllGateway/DeviceModbusDetail/__test__/index.test.js

@@ -17,7 +17,7 @@ import api from '../../../../utils/Apis/axios';
 import { API } from '../../../../configs';
 import { PERMISSION_TYPE } from '../../../../configs/Constants';
 import Detail from '../../components/Detail';
-// import ModalPopupCT from '../../../../commons/ModalPopupCT';
+import ModalPopupCT from '../../../../commons/ModalPopupCT';
 import { fetchGatewayCT, flushPromises } from '../../test-utils';
 
 const mock = new MockAdapter(api.axiosInstance);
@@ -133,6 +133,8 @@ describe('Test DeviceModbusDetail', () => {
     const menuActionMore = detail?.findAllByType(MenuActionMore);
     expect(menuActionMore[0].props.isVisible).toEqual(true);
 
+    await flushPromises();
+
     await act(async () => {
       await menuActionMore[0].props.listMenuItem[0].doAction();
     });
@@ -143,39 +145,38 @@ describe('Test DeviceModbusDetail', () => {
     });
   });
 
-  // NOTE: Hinh will fix it later
-  // it('test render DeviceModbusDetail onPress more and onPress Delete modbus', async () => {
-  //   await act(async () => {
-  //     tree = await create(wrapComponent());
-  //   });
-  //   await flushPromises();
-  //   const instance = tree.root;
-  //   const detail = instance?.findByType(Detail);
-  //   await headerCustomOnPressMore(detail);
-  //   const menuActionMore = detail?.findByType(MenuActionMore);
-  //   expect(menuActionMore.props.isVisible).toEqual(true);
+  it('test render DeviceModbusDetail onPress more and onPress Delete modbus', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    await flushPromises();
+    const instance = tree.root;
+    const detail = instance?.findByType(Detail);
+    await headerCustomOnPressMore(detail);
+    const menuActionMore = detail?.findByType(MenuActionMore);
+    expect(menuActionMore.props.isVisible).toEqual(true);
 
-  //   await act(async () => {
-  //     menuActionMore.props.listMenuItem[1].doAction();
-  //   });
-  //   await flushPromises();
+    await act(async () => {
+      menuActionMore.props.listMenuItem[1].doAction();
+    });
+    await flushPromises();
 
-  //   const modal = instance.findByType(ModalPopupCT);
-  //   mock.onDelete(API.DEV_MODE.ZIGBEE.DEVICE_DETAIL(1, 1)).reply(200);
-  //   await act(async () => {
-  //     await modal.props.onPressConfirm();
-  //   });
-  //   await flushPromises();
+    const modal = instance.findByType(ModalPopupCT);
+    mock.onDelete(API.DEV_MODE.ZIGBEE.DEVICE_DETAIL(1, 1)).reply(200);
+    await act(async () => {
+      await modal.props.onPressConfirm();
+    });
+    await flushPromises();
 
-  //   expect(mockPop).toBeCalledWith(1);
-  //   expect(Toast.show).toBeCalledWith({
-  //     position: 'bottom',
-  //     text1: 'Delete successfully!',
-  //     text2: undefined,
-  //     type: 'success',
-  //     visibilityTime: 1000,
-  //   });
-  // });
+    expect(mockPop).toBeCalledWith(1);
+    expect(Toast.show).toBeCalledWith({
+      position: 'bottom',
+      text1: 'Delete successfully!',
+      text2: undefined,
+      type: 'success',
+      visibilityTime: 1000,
+    });
+  });
 
   it('test render DeviceZigbeeDetail onPress TabPanel config write', async () => {
     mock.onGet(API.DEV_MODE.MODBUS.REGISTER(1, 1)).reply(200, [

package/src/screens/Automate/AddNewAction/SetupConfigCondition.js

@@ -47,7 +47,7 @@ const SetupConfigCondition = () => {
         },
       ];
     }
-    if (item.evaluate_template === 'range') {
+    if (item.evaluate_configuration.ranges) {
       return item.evaluate_configuration.ranges.map((range, index) => ({
         title: range.evaluate?.text,
         condition: 'value_evaluation',
@@ -55,24 +55,8 @@ const SetupConfigCondition = () => {
         value: index,
       }));
     }
-    if (item.evaluate_template === 'boolean') {
-      return [
-        {
-          title: item.evaluate_configuration?.on?.text,
-          condition: 'value_evaluation',
-          config: item.id,
-          value: 0,
-        },
-        {
-          title: item.evaluate_configuration?.off?.text,
-          condition: 'value_evaluation',
-          config: item.id,
-          value: 1,
-        },
-      ];
-    }
     return [];
-  }, [item.evaluate_configuration, item.evaluate_template, item.id, t]);
+  }, [item.evaluate_configuration, item.id, t]);
 
   const onOpenModal = useCallback(() => {
     setIsShowModal(true);
@@ -147,7 +131,6 @@ const SetupConfigCondition = () => {
         <TouchableOpacity
           onPress={onOpenModal}
           style={[styles.itemCondition, styles.shadowView]}
-          accessibilityLabel="open-modal"
         >
           <Text type="Body" color={Colors.Gray7}>
             {t('condition')}

package/src/screens/Automate/AddNewAction/__test__/{SetupConfigCondition.test.js → SetupSensor.test.js}

@@ -8,8 +8,6 @@ import SetupConfigCondition from '../SetupConfigCondition';
 import { useNavigation, useRoute } from '@react-navigation/native';
 import _TextInput from '../../../../commons/Form/TextInput';
 import { ToastBottomHelper } from '../../../../utils/Utils';
-import { ModalCustom } from '../../../../commons/Modal';
-import { Text } from '../../../../commons';
 
 jest.mock('react', () => {
   return {
@@ -31,7 +29,6 @@ describe('Test SetupConfigCondition', () => {
 
   let tree;
   beforeEach(() => {
-    tree = null;
     mockGoBack.mockReset();
     useRoute.mockClear();
     spyToastError.mockClear();
@@ -83,99 +80,6 @@ describe('Test SetupConfigCondition', () => {
     expect(mockGoBack).toBeCalled();
   });
 
-  it('render range value evaluation', async () => {
-    useRoute.mockReturnValue({
-      params: {
-        item: {
-          id: 1,
-          decimal_behind: 0,
-          title: 'is below (<)',
-          sensor_type: 'air_quality',
-          evaluate_configuration: {
-            ranges: [
-              {
-                evaluate: {
-                  text: 'Case 1',
-                },
-              },
-              {
-                evaluate: {
-                  text: 'Case 2',
-                },
-              },
-              {
-                evaluate: {
-                  text: 'Case 3',
-                },
-              },
-            ],
-          },
-          evaluate_template: 'range',
-        },
-        sensorData: [],
-      },
-    });
-    await act(async () => {
-      tree = await create(wrapComponent());
-    });
-    const instance = tree.root;
-
-    await act(async () => {
-      instance
-        .findByProps({ accessibilityLabel: 'open-modal' })
-        .props.onPress();
-    });
-
-    const modalCustom = instance.find(
-      (el) => el.type === ModalCustom && el.props.isVisible
-    );
-    const texts = modalCustom.findAllByType(Text);
-    expect(texts).toHaveLength(3);
-    expect(texts[0].props.children).toEqual('Case 1');
-    expect(texts[1].props.children).toEqual('Case 2');
-    expect(texts[2].props.children).toEqual('Case 3');
-  });
-
-  it('render boolean value evaluation', async () => {
-    useRoute.mockReturnValue({
-      params: {
-        item: {
-          id: 1,
-          title: 'is below (<)',
-          sensor_type: 'air_quality',
-          evaluate_configuration: {
-            on: {
-              text: 'Case On',
-            },
-            off: {
-              text: 'Case Off',
-            },
-          },
-          evaluate_template: 'boolean',
-        },
-        sensorData: [],
-      },
-    });
-    await act(async () => {
-      tree = await create(wrapComponent());
-    });
-    const instance = tree.root;
-
-    await act(async () => {
-      instance
-        .findByProps({ accessibilityLabel: 'open-modal' })
-        .props.onPress();
-    });
-
-    const modalCustom = instance.find(
-      (el) => el.type === ModalCustom && el.props.isVisible
-    );
-    const texts = modalCustom.findAllByType(Text);
-    expect(texts).toHaveLength(2);
-    expect(texts[0].props.children).toEqual('Case On');
-    expect(texts[1].props.children).toEqual('Case Off');
-  });
-
   const testConditionValue = async (value, message) => {
     useRoute.mockReturnValue({
       params: {
@@ -213,7 +117,6 @@ describe('Test SetupConfigCondition', () => {
   it('Test render when have input not number', async () => {
     await testConditionValue('abc', 'Please enter a number');
   });
-
   it('Test render when have input value must be 6 digits or less', async () => {
     await testConditionValue(
       '123456789',

package/src/screens/Automate/EditActionsList/__tests__/index.test.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars */
 import React from 'react';
 import DraggableFlatList from 'react-native-draggable-flatlist';
 import { create, act } from 'react-test-renderer';
@@ -38,78 +37,78 @@ describe('EditActionsList', () => {
     mockedNavigate.mockClear();
   });
   it('render EditActionsList', async () => {
-    // await act(async () => {
-    //   tree = await create(wrapComponent());
-    // });
-    // const instance = tree.root;
-    // const draggableFlatList = instance.findAllByType(DraggableFlatList);
-    // const modalBottom = instance.findAllByType(ModalBottom);
-    // expect(draggableFlatList).toHaveLength(1);
-    // expect(modalBottom).toHaveLength(1);
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const draggableFlatList = instance.findAllByType(DraggableFlatList);
+    const modalBottom = instance.findAllByType(ModalBottom);
+    expect(draggableFlatList).toHaveLength(1);
+    expect(modalBottom).toHaveLength(1);
+  });
+  it('EditActionsList onPress cancel', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const buttonCancel = instance.find(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.BUTTON_CANCEL_EDIT_ACTION_LIST &&
+        el.type === TouchableOpacity
+    );
+    expect(buttonCancel).toBeDefined();
+    await act(async () => {
+      buttonCancel.props.onPress();
+    });
+    expect(mockedNavigate).toHaveBeenCalled();
   });
-  // it('EditActionsList onPress cancel', async () => {
-  //   await act(async () => {
-  //     tree = await create(wrapComponent());
-  //   });
-  //   const instance = tree.root;
-  //   const buttonCancel = instance.find(
-  //     (el) =>
-  //       el.props.accessibilityLabel ===
-  //         AccessibilityLabel.BUTTON_CANCEL_EDIT_ACTION_LIST &&
-  //       el.type === TouchableOpacity
-  //   );
-  //   expect(buttonCancel).toBeDefined();
-  //   await act(async () => {
-  //     buttonCancel.props.onPress();
-  //   });
-  //   expect(mockedNavigate).toHaveBeenCalled();
-  // });
-  // it('EditActionsList onPress save', async () => {
-  //   mock.onPut(API.AUTOMATE.ORDER_SCRIPT_ACTION(1)).reply(200);
-  //   await act(async () => {
-  //     tree = await create(wrapComponent());
-  //   });
-  //   const instance = tree.root;
-  //   const buttonSave = instance.find(
-  //     (el) =>
-  //       el.props.accessibilityLabel ===
-  //         AccessibilityLabel.BUTTON_SAVE_EDIT_ACTION_LIST &&
-  //       el.type === TouchableOpacity
-  //   );
-  //   expect(buttonSave).toBeDefined();
+  it('EditActionsList onPress save', async () => {
+    mock.onPut(API.AUTOMATE.ORDER_SCRIPT_ACTION(1)).reply(200);
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const buttonSave = instance.find(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.BUTTON_SAVE_EDIT_ACTION_LIST &&
+        el.type === TouchableOpacity
+    );
+    expect(buttonSave).toBeDefined();
 
-  //   await act(async () => {
-  //     buttonSave.props.onPress();
-  //   });
+    await act(async () => {
+      buttonSave.props.onPress();
+    });
 
-  //   expect(mock.history.put).toHaveLength(1);
-  // });
+    expect(mock.history.put).toHaveLength(1);
+  });
 
-  // it('EditActionsList has remove button', async () => {
-  //   await act(async () => {
-  //     tree = await create(wrapComponent());
-  //   });
-  //   const instance = tree.root;
-  //   const buttonRemove = instance.find(
-  //     (el) =>
-  //       el.props.accessibilityLabel ===
-  //         AccessibilityLabel.BUTTON_REMOVE_EDIT_ACTION_LIST &&
-  //       el.type === TouchableOpacity
-  //   );
-  //   expect(buttonRemove).toBeDefined();
-  // });
+  it('EditActionsList has remove button', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const buttonRemove = instance.find(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.BUTTON_REMOVE_EDIT_ACTION_LIST &&
+        el.type === TouchableOpacity
+    );
+    expect(buttonRemove).toBeDefined();
+  });
 
-  // it('EditActionsList modal onPress remove', async () => {
-  //   await act(async () => {
-  //     tree = await create(wrapComponent());
-  //   });
-  //   const instance = tree.root;
-  //   const modalBottom = instance.findAllByType(ModalBottom);
-  //   await act(async () => {
-  //     modalBottom[0].props.onRemove();
-  //   });
+  it('EditActionsList modal onPress remove', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const modalBottom = instance.findAllByType(ModalBottom);
+    await act(async () => {
+      modalBottom[0].props.onRemove();
+    });
 
-  //   mock.onDelete(API.AUTOMATE.DELETE_SCRIPT_ACTION(1, 1)).reply(200);
-  //   expect(mock.history.delete).toHaveLength(1);
-  // });
+    mock.onDelete(API.AUTOMATE.DELETE_SCRIPT_ACTION(1, 1)).reply(200);
+    expect(mock.history.delete).toHaveLength(1);
+  });
 });