@eohjsc/react-native-smart-city 0.4.47 → 0.4.49

package/src/screens/AddNewGateway/__test__/ConnectingWifiGuide.test.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
-import Toast from 'react-native-toast-message';
 import { Platform, TouchableOpacity, Alert } from 'react-native';
 import WifiManager from 'react-native-wifi-reborn';
 import dgram from 'react-native-udp';
@@ -13,7 +12,7 @@ import AccessibilityLabel from '../../../configs/AccessibilityLabel';
 
 const mockedGoBack = jest.fn();
 const mockedNavigate = jest.fn();
-const mockedRetry = jest.fn();
+jest.spyOn(Alert, 'alert').mockImplementation(() => {});
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
@@ -53,6 +52,7 @@ describe('test share wifi password', () => {
     socket.bind.mockClear();
     socket.send.mockClear();
     socket.close.mockClear();
+    Alert.alert.mockReset();
   });
 
   it('render connect wifi guide', async () => {
@@ -123,7 +123,6 @@ describe('test share wifi password', () => {
   });
 
   it('fail connect to wifi android show alert push cancel', async () => {
-    jest.spyOn(Alert, 'alert');
     Platform.OS = 'android';
     const route = { params: routeParams };
     WifiManager.reScanAndLoadWifiList.mockImplementationOnce(async () => [
@@ -138,9 +137,11 @@ describe('test share wifi password', () => {
       tree = await renderer.create(wrapComponent(route));
     });
     await ConnectWifiActionButton(tree.root);
-    expect(Alert.alert.mock.calls[0][0]).toEqual("Cannot find Device's Wifi");
+    expect(Alert.alert.mock.calls[0][0]).toEqual(
+      'The devices wifi "eoh.robot." could not be found'
+    );
     expect(Alert.alert.mock.calls[0][1]).toEqual(
-      'Try to turn on device or Try again'
+      'Try to turn on device or try again'
     );
     await act(async () => {
       Alert.alert.mock.calls[0][2][0].onPress();
@@ -149,16 +150,6 @@ describe('test share wifi password', () => {
   });
 
   it('fail connect to wifi android show error push retry', async () => {
-    jest.spyOn(Alert, 'alert');
-    Alert.alert(
-      "Cannot find Device's Wifi",
-      'Try to turn on device or Try again',
-      [
-        { text: 'Cancel', onPress: mockedGoBack },
-        { text: 'Retry', onPress: mockedRetry },
-      ]
-    );
-
     Platform.OS = 'android';
     const route = { params: routeParams };
     WifiManager.reScanAndLoadWifiList.mockImplementationOnce(async () => [
@@ -173,14 +164,23 @@ describe('test share wifi password', () => {
       tree = await renderer.create(wrapComponent(route));
     });
     await ConnectWifiActionButton(tree.root);
-    expect(Alert.alert.mock.calls[1][0]).toEqual("Cannot find Device's Wifi");
-    expect(Alert.alert.mock.calls[1][1]).toEqual(
-      'Try to turn on device or Try again'
+    expect(Alert.alert.mock.calls).toHaveLength(1);
+    expect(Alert.alert.mock.calls[0][0]).toEqual(
+      'The devices wifi "eoh.robot." could not be found'
+    );
+    expect(Alert.alert.mock.calls[0][1]).toEqual(
+      'Try to turn on device or try again'
     );
     await act(async () => {
-      Alert.alert.mock.calls[1][2][1].onPress();
+      Alert.alert.mock.calls[0][2][1].onPress();
     });
-    expect(mockedRetry).toBeCalledTimes(1);
+    expect(Alert.alert.mock.calls).toHaveLength(2);
+    expect(Alert.alert.mock.calls[1][0]).toEqual(
+      "Cannot connect to device's wifi eoh.robot.xxx"
+    );
+    expect(Alert.alert.mock.calls[1][1]).toEqual(
+      'Try to turn on device or try again'
+    );
   });
 
   it('fail load wifi list android', async () => {
@@ -244,17 +244,23 @@ describe('test share wifi password', () => {
     });
     // todo Bang should test wifi display
     expect(socket.close).toBeCalled();
-
-    expect(mockedNavigate).toBeCalledWith('ShareWifiPassword', {
-      unit: {
-        id: 1,
-      },
-      subUnit: {
-        id: 1,
-      },
-      wifiList: [{ ssid: 'wifi 1' }, { ssid: 'wifi.2' }],
-      qrData: { org_slug: 'eoh', prefix: 'robot' },
-    });
+    expect(mockedNavigate).toBeCalledWith(
+      'ShareWifiPassword',
+      expect.objectContaining({
+        qrData: {
+          org_slug: 'eoh',
+          prefix: 'robot',
+        },
+        wifiList: [
+          {
+            ssid: 'wifi 1',
+          },
+          {
+            ssid: 'wifi.2',
+          },
+        ],
+      })
+    );
 
     // expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.ShareWifiPassword);
   });
@@ -274,6 +280,9 @@ describe('test share wifi password', () => {
     await act(async () => {
       socket.on.mock.calls[1][1]();
     });
-    expect(Toast.show).toBeCalled();
+
+    expect(Alert.alert.mock.calls[0][0]).toEqual(
+      'Fail trigger scan wifi on device undefined'
+    );
   });
 });

package/src/screens/AddNewGateway/__test__/RenameNewDevices.test.js

@@ -11,6 +11,7 @@ import AccessibilityLabel from '../../../configs/AccessibilityLabel';
 import Text from '../../../commons/Text';
 import _TextInput from '../../../commons/Form/TextInput';
 import API from '../../../configs/API';
+import { CheckBoxCustom } from '../../Sharing/Components';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -336,7 +337,7 @@ describe('Test rename new devices', () => {
     );
   });
 
-  it('update end device name', async () => {
+  it('update end device name and select end device', async () => {
     mock.onGet().reply(200, {
       id: 1,
       can_rename: true,
@@ -345,6 +346,14 @@ describe('Test rename new devices', () => {
           id: 1,
           name: 'sensor',
           end_devices: [
+            {
+              id: 3,
+              name: 'end_device 3',
+            },
+            {
+              id: 2,
+              name: 'end_device 2',
+            },
             {
               id: 1,
               name: 'end_device',
@@ -365,22 +374,29 @@ describe('Test rename new devices', () => {
           `${AccessibilityLabel.CONNECTED_DEVICE_RENAME_DEVICE}-end_device-1` &&
         el.type === _TextInput
     );
+    const checkBoxCustom = instance.findAllByType(CheckBoxCustom);
+
     await act(async () => {
       chipNameField.props.onChange('new name');
     });
 
+    await act(async () => {
+      checkBoxCustom[1].props.onPress();
+    });
+
     const doneButton = instance.find(
       (el) =>
         el.props.accessibilityLabel === AccessibilityLabel.BUTTON_DONE &&
         el.type === TouchableOpacity
     );
     mock.onPost(API.CHIP.RENAME_DEVICES(1)).reply(200);
+    mock.onPost(API.DEVICE.DELETE_END_DEVICES()).reply(200);
 
     await act(async () => {
       doneButton.props.onPress();
     });
 
-    expect(mock.history.post).toHaveLength(1);
+    expect(mock.history.post).toHaveLength(2);
     expect(mock.history.post[0].data).toEqual(
       JSON.stringify({
         id: 1,
@@ -390,6 +406,10 @@ describe('Test rename new devices', () => {
             id: 1,
             name: 'sensor',
             end_devices: [
+              {
+                id: 2,
+                name: 'end_device 2',
+              },
               {
                 id: 1,
                 name: 'new name',
@@ -438,4 +458,88 @@ describe('Test rename new devices', () => {
     expect(mock.history.post).toHaveLength(0);
     mockedDispatchNavigate();
   });
+
+  it('should handle onPress event for CheckBoxCustom select all', async () => {
+    mock.onGet().reply(200, {
+      id: 1,
+      can_rename: true,
+      sensors: [
+        {
+          id: 1,
+          name: 'sensor',
+          end_devices: [
+            {
+              id: 1,
+              name: 'end_device',
+            },
+            {
+              id: 2,
+              name: 'end_device 2',
+            },
+          ],
+        },
+      ],
+    });
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const checkBoxCustom = instance.findAllByType(CheckBoxCustom);
+    expect(checkBoxCustom[0].props.isChecked).toEqual(true);
+
+    await act(async () => {
+      await checkBoxCustom[0].props.onPress();
+    });
+
+    expect(checkBoxCustom[0].props.isChecked).toEqual(false);
+
+    await act(async () => {
+      await checkBoxCustom[0].props.onPress();
+    });
+
+    expect(checkBoxCustom[0].props.isChecked).toEqual(true);
+  });
+
+  it('should handle onPress event for CheckBoxCustom detail', async () => {
+    mock.onGet().reply(200, {
+      id: 1,
+      can_rename: true,
+      sensors: [
+        {
+          id: 1,
+          name: 'sensor',
+          end_devices: [
+            {
+              id: 1,
+              name: 'end_device',
+            },
+            {
+              id: 2,
+              name: 'end_device 2',
+            },
+          ],
+        },
+      ],
+    });
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const checkBoxCustom = instance.findAllByType(CheckBoxCustom);
+    expect(checkBoxCustom[1].props.isChecked).toEqual(true);
+
+    await act(async () => {
+      await checkBoxCustom[1].props.onPress();
+    });
+
+    expect(checkBoxCustom[1].props.isChecked).toEqual(false);
+
+    await act(async () => {
+      await checkBoxCustom[1].props.onPress();
+    });
+
+    expect(checkBoxCustom[1].props.isChecked).toEqual(true);
+  });
 });

package/src/screens/AddNewGateway/__test__/ShareWifiPassword.test.js

@@ -1,9 +1,10 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
-import { Platform, TouchableOpacity } from 'react-native';
+import { Alert, Platform, TouchableOpacity } from 'react-native';
 import dgram from 'react-native-udp';
 import Toast from 'react-native-toast-message';
 import WifiManager from 'react-native-wifi-reborn';
+import NetInfo from '@react-native-community/netinfo';
 
 import ShareWifiPassword from '../ShareWifiPassword';
 import { SCProvider } from '../../../context';
@@ -16,6 +17,10 @@ import { flushPromises } from '../../AllGateway/test-utils';
 
 const mockedGoBack = jest.fn();
 const mockedNavigate = jest.fn();
+const mockedReconnectWifiSSID = jest.fn();
+jest.spyOn(Alert, 'alert').mockImplementation(() => {});
+jest.mock('@react-native-community/netinfo');
+
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
@@ -42,6 +47,8 @@ describe('test share wifi password', () => {
     socket.bind.mockClear();
     socket.send.mockClear();
     socket.close.mockClear();
+    Alert.alert.mockReset();
+    mockedNavigate.mockClear();
   });
 
   it('render share wifi', async () => {
@@ -115,7 +122,13 @@ describe('test share wifi password', () => {
   ) => {
     jest.useFakeTimers();
     Platform.OS = 'android';
-    const route = { params: { prefix: 'robot' } };
+    const route = {
+      params: {
+        prefix: 'robot',
+        wifiDevice: 'eoh.era.xxx',
+        reconnectWifiSSID: mockedReconnectWifiSSID,
+      },
+    };
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
@@ -141,6 +154,26 @@ describe('test share wifi password', () => {
     });
   };
 
+  it('enter wrong password to gateway and disconnect to wifi device', async () => {
+    await receiveGatewayInfo({
+      status: 'error',
+    });
+    expect(mockedReconnectWifiSSID).toBeCalled();
+    expect(Alert.alert.mock.calls).toHaveLength(1);
+    expect(Alert.alert.mock.calls[0][0]).toEqual('Cannot connect to wifi ""');
+
+    NetInfo.triggerEvent({ isConnected: true, isInternetReachable: true });
+    expect(Alert.alert.mock.calls).toHaveLength(2);
+    expect(Alert.alert.mock.calls[1][0]).toEqual(
+      'The connection to the wifi device has been lost.'
+    );
+    await act(async () => {
+      Alert.alert.mock.calls[1][2][0].onPress();
+    });
+    expect(mockedNavigate).toBeCalled();
+    expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.ConnectingWifiGuide);
+  });
+
   it('close socket after gateway success connect to wifi', async () => {
     await receiveGatewayInfo();
     const socket = dgram.createSocket({});

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/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);
+  });
 });

package/src/screens/Automate/ScriptDetail/Styles/indexStyles.js

@@ -63,7 +63,6 @@ export default StyleSheet.create({
   },
   moreButton: {
     marginLeft: -5,
-    transform: [{ rotate: '90deg' }],
   },
   wrapStyle: {
     borderRadius: 8,

package/src/screens/Automate/ScriptDetail/index.js

@@ -7,6 +7,7 @@ import React, {
 } from 'react';
 import { Image, Platform, TouchableOpacity, View } from 'react-native';
 import { PopoverMode } from 'react-native-popover-view';
+import { IconFill, IconOutline } from '@ant-design/icons-react-native';
 import { Icon } from '@ant-design/react-native';
 
 import { useTranslations } from '../../../hooks/Common/useTranslations';
@@ -30,8 +31,6 @@ import RenameScript from './Components/RenameScript';
 import DeleteScript from './Components/DeleteScript';
 import Images from '../../../configs/Images';
 import { useBackendPermission } from '../../../utils/Permission/backend';
-import StarFull from '../../../Images/Common/star-full.svg';
-import StarOutline from '../../../Images/Common/star-outline.svg';
 
 const PreventDoubleTouch = withPreventDoubleClick(TouchableOpacity);
 
@@ -161,7 +160,7 @@ const ScriptDetail = ({ route }) => {
           style={[styles.headerButton, styles.moreButton]}
           accessibilityLabel={AccessibilityLabel.ICON_MORE}
         >
-          <Icon name={'ellipsis'} size={27} color={Colors.Black} />
+          <Icon name={'more'} size={27} color={Colors.Black} />
         </TouchableOpacity>
       </View>
     ),
@@ -377,7 +376,11 @@ const ButtonStar = ({ automate }) => {
       onPress={onPressStar}
       accessibilityLabel={AccessibilityLabel.HEADER_SCRIPT_DETAIL_BUTTON_STAR}
     >
-      {isStarred ? <StarFull /> : <StarOutline />}
+      {isStarred ? (
+        <IconFill name="star" size={25} color={Colors.Yellow6} />
+      ) : (
+        <IconOutline name="star" size={25} />
+      )}
     </PreventDoubleTouch>
   );
 };