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

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

@@ -1,7 +1,8 @@
 import React from 'react';
+import { Alert } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import MockAdapter from 'axios-mock-adapter';
-import RNCNetInfoMock from '@react-native-community/netinfo/jest/netinfo-mock';
+import NetInfo from '@react-native-community/netinfo';
 
 import ConnectingWifiDevice from '../ConnectingWifiDevice';
 import { SCProvider } from '../../../context';
@@ -9,6 +10,7 @@ import { mockSCStore } from '../../../context/mockStore';
 import api from '../../../utils/Apis/axios';
 import Processing from '../../../commons/Processing';
 import ConnectingDevice from '../ConnectingDevice';
+import { API } from '../../../configs';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -17,7 +19,7 @@ const wrapComponent = (route) => (
 );
 
 const mock = new MockAdapter(api.axiosInstance);
-
+jest.spyOn(Alert, 'alert').mockImplementation(() => {});
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 
@@ -37,13 +39,16 @@ describe('Test connecting wifi device', () => {
 
   afterEach(() => {
     mockedNavigate.mockClear();
+    mockedGoBack.mockClear();
+    Alert.alert.mockReset();
+    mock.reset();
   });
 
   beforeEach(() => {
     jest.useFakeTimers();
     route = {
       params: {
-        unitId: 1,
+        unit: { id: 1 },
         subUnit: {
           id: 2,
         },
@@ -54,19 +59,43 @@ describe('Test connecting wifi device', () => {
     };
   });
 
-  it('rendering', async () => {
+  const connectingWifiDevice = async () => {
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
     expect(instance.findAllByType(Processing)).toHaveLength(1);
-    jest.runOnlyPendingTimers();
 
-    expect(mock.history.post).toHaveLength(0);
     const connectingDevice = instance.findByType(ConnectingDevice);
     await act(async () => {
       connectingDevice.props.onReady('channelName');
     });
-    expect(RNCNetInfoMock.addEventListener).toBeCalled();
+    NetInfo.triggerEvent({ isConnected: true, isInternetReachable: true });
+    await act(async () => {
+      jest.runAllTimers();
+    });
+    expect(NetInfo.addEventListener).toBeCalled();
+  };
+
+  it('onReady call api scan chip', async () => {
+    mock.onPost(API.UNIT.CHIP_SCAN(1)).reply(200, { id: 1 });
+    await connectingWifiDevice();
+    expect(mock.history.post).toHaveLength(1);
+    expect(mock.history.post[0].data).toEqual(
+      JSON.stringify({
+        station: 2,
+        channel_name: 'channelName',
+      })
+    );
+  });
+
+  it('onReady call api scan chip but fail', async () => {
+    mock.onPost(API.UNIT.CHIP_SCAN(1)).reply(400);
+    await connectingWifiDevice();
+    expect(Alert.alert.mock.calls[1][0]).toEqual('Fail add wifi device');
+    await act(async () => {
+      Alert.alert.mock.calls[1][2][0].onPress();
+    });
+    expect(mockedGoBack).toBeCalled();
   });
 });

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/Device/__test__/detail.test.js

@@ -194,6 +194,7 @@ describe('test DeviceDetail', () => {
     useLayoutEffectSpy.mockImplementation(() => setState);
     mock.reset();
     mockedNavigate.mockClear();
+    watchMultiConfigs.mockReset();
   });
 
   it('render DeviceDetail render SensorDisplayItem', async () => {
@@ -697,18 +698,17 @@ describe('test DeviceDetail', () => {
       items: [
         {
           configuration: {
-            template: 'OnOffSimpleActionTemplate',
-            configuration: {
-              config: 5,
-              icon: 'up',
-              is_on_value: [],
+            config: 131357,
+            config_data: {
+              sensor_id: 36700,
+              chip_id: 8296,
             },
             title: 'Turn on / off',
           },
           id: 18,
           order: 2,
-          template: 'action',
-          type: 'action',
+          template: 'OnOffSimpleActionTemplate',
+          type: 'OnOffSimpleActionTemplate',
         },
       ],
     };
@@ -813,6 +813,65 @@ describe('test DeviceDetail', () => {
         el.props.accessibilityLabel === AccessibilityLabel.SENSOR_DISPLAY_ITEM
     );
     expect(sensorDisplayItem.length).toEqual(1);
-    expect(watchMultiConfigs).toHaveBeenCalled();
+    expect(watchMultiConfigs).toHaveBeenCalledWith([]);
+  });
+
+  it('watch action config', async () => {
+    mock.onGet(API.CHIP.JSON_CONFIGURATION).reply(200, []);
+    const responseDisplay = {
+      items: [
+        {
+          id: 1,
+          order: 0,
+          template: 'on_off_button_action_template',
+          type: 'on_off_button_action_template',
+          configuration: {
+            config: 2,
+          },
+        },
+      ],
+    };
+    const responseDisplayValueV2 = {
+      configs: [{ id: 2 }],
+      is_connected: true,
+      last_updated: '2021-01-24T12:00:00.000Z',
+    };
+    mockAxios(responseDisplay, responseDisplayValueV2);
+    await act(async () => {
+      tree = await create(wrapComponent(store, account, route));
+    });
+
+    expect(watchMultiConfigs).toHaveBeenCalledWith([]);
+  });
+
+  it('watch stages grid action config', async () => {
+    mock.onGet(API.CHIP.JSON_CONFIGURATION).reply(200, []);
+    const responseDisplay = {
+      items: [
+        {
+          id: 1,
+          order: 0,
+          template: 'StatesGridActionTemplate',
+          configuration: {
+            options: [
+              {
+                config: 3,
+              },
+            ],
+          },
+        },
+      ],
+    };
+    const responseDisplayValueV2 = {
+      configs: [{ id: 2 }],
+      is_connected: true,
+      last_updated: '2021-01-24T12:00:00.000Z',
+    };
+    mockAxios(responseDisplay, responseDisplayValueV2);
+    await act(async () => {
+      tree = await create(wrapComponent(store, account, route));
+    });
+
+    expect(watchMultiConfigs).toHaveBeenCalledWith([]);
   });
 });

package/src/screens/Device/detail.js

@@ -59,7 +59,7 @@ import { useReceiveNotifications } from '../../hooks';
 import useChipJsonConfiguration, {
   useConnectChipMqtt,
 } from '../../hooks/useMqtt';
-import { realWatchMultiConfigs } from '../../iot/Monitor';
+import { watchMultiConfigs } from '../../iot/Monitor';
 
 const DeviceDetail = ({ route }) => {
   const configIdsTemp = useRef([]);
@@ -136,8 +136,7 @@ const DeviceDetail = ({ route }) => {
     }
 
     return action.some((item) => {
-      const { configuration } = item?.configuration;
-      return JSON.stringify(configuration).includes(
+      return JSON.stringify(item?.configuration)?.includes(
         '"command_prefer_over_bluetooth":true'
       );
     });
@@ -329,9 +328,7 @@ const DeviceDetail = ({ route }) => {
 
   const listMenuItem = useMemo(() => {
     const menuItems = [];
-    if (
-      display.items.some((i) => getActionComponent(i.configuration.template))
-    ) {
+    if (display.items.some((i) => getActionComponent(i.template))) {
       menuItems.push({
         route: Routes.ActivityLog,
         data: {
@@ -500,31 +497,24 @@ const DeviceDetail = ({ route }) => {
       let params = new URLSearchParams();
       const configIds = [];
 
+      // todo Bang refactor widgets like dashboard
       display.items.map((item) => {
-        const type = item?.template || item?.type;
         if (!item.configuration) {
           return;
         }
-        if (!['action', 'value'].includes(type)) {
-          return;
-        }
-        if (type === 'action') {
-          if (
-            [
-              'on_off_button_action_template',
-              'one_button_action_template',
-            ].includes(item.configuration.template)
-          ) {
-            !configIds.includes(item.configuration.configuration.config) &&
-              configIds.push(item.configuration.configuration.config);
+        item.configuration.configs?.map((config) => {
+          if (!configIds.includes(config.id)) {
+            configIds.push(config.id);
           }
-        }
-        if (type === 'value') {
-          item.configuration.configs.map((config) => {
-            if (!configIds.includes(config.id)) {
-              configIds.push(config.id);
-            }
-          });
+        });
+        item.configuration.options?.map((option) => {
+          if (!configIds.includes(option.config)) {
+            configIds.push(option.config);
+          }
+        });
+        if (item.configuration.config) {
+          !configIds.includes(item.configuration.config) &&
+            configIds.push(item.configuration.config);
         }
       });
       configIdsTemp.current = configIds.filter(Boolean);
@@ -720,7 +710,7 @@ const DeviceDetail = ({ route }) => {
   }, [sensor]);
 
   useEffect(() => {
-    appState === 'active' && realWatchMultiConfigs(configIdsTemp.current);
+    appState === 'active' && watchMultiConfigs(configIdsTemp.current);
   }, [appState]);
 
   const shouldRender =

package/src/screens/Sharing/Components/CheckBoxCustom.js

@@ -4,14 +4,26 @@ import AccessibilityLabel from '../../../configs/AccessibilityLabel';
 import Images from '../../../configs/Images';
 import styles from './Styles/CheckBoxCustomStyles';
 
-const CheckBoxCustom = ({ isChecked, onPress, wrapStyle, id }) => {
+const CheckBoxCustom = ({
+  isChecked,
+  onPress,
+  wrapStyle,
+  wrapViewCustom,
+  id,
+}) => {
   return (
     <TouchableOpacity
       style={[styles.wrapBtn, wrapStyle]}
       onPress={onPress}
       accessibilityLabel={`${AccessibilityLabel.CHECK_BOX_CUSTOM}-${id}`}
     >
-      <View style={[styles.wrapView, isChecked && styles.viewChecked]}>
+      <View
+        style={[
+          styles.wrapView,
+          wrapViewCustom,
+          isChecked && styles.viewChecked,
+        ]}
+      >
         {isChecked && <Image source={Images.check} />}
       </View>
     </TouchableOpacity>

package/src/screens/Sharing/InfoMemberUnit.js

@@ -58,7 +58,9 @@ const InfoMemberUnit = memo(({ route }) => {
       if (stateAlertAction?.is_change) {
         hideAlertAction();
         if (itemSelected?.role?.is_owner) {
-          setIsShowWarning(true);
+          setTimeout(() => {
+            setIsShowWarning(true);
+          }, 500);
         }
       } else {
         removeMember(