@eohjsc/react-native-smart-city 0.3.8 → 0.3.9

package/src/screens/AddNewGateway/PlugAndPlay/ConnectWifiWarning.js

@@ -56,7 +56,7 @@ const ConnectWifiWarning = memo(({ route }) => {
   const { setAction } = useContext(SCContext);
 
   const getPermissionWifiAndroid = useCallback(async () => {
-    const granted = await PermissionsAndroid.request(
+    return await PermissionsAndroid.request(
       PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION,
       {
         title: t('location_permission_required_wifi_title'),
@@ -65,15 +65,21 @@ const ConnectWifiWarning = memo(({ route }) => {
         buttonPositive: t('allow'),
       }
     );
-    if (granted === PermissionsAndroid.RESULTS.GRANTED) {
-      ToastBottomHelper.success('GRANTED');
-    } else {
-      ToastBottomHelper.error('DENIED');
-    }
-  }, [t]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   useEffect(() => {
-    isAndroid && getPermissionWifiAndroid();
+    if (isAndroid) {
+      (async () => {
+        const granted = await getPermissionWifiAndroid();
+        if (!granted) {
+          ToastBottomHelper.error(
+            'Fail permission',
+            'You need to grant permission to continue'
+          );
+        }
+      })();
+    }
   }, [getPermissionWifiAndroid]);
 
   const handleSend = async () => {
@@ -83,7 +89,7 @@ const ConnectWifiWarning = memo(({ route }) => {
       await socket.on('message', (msg, rinfo) => {
         clearInterval(intervalSend);
         const data = JSON.parse(msg.toString());
-        if (data.hasOwnProperty('wifi')) {
+        if (Object.prototype.hasOwnProperty.call(data, 'wifi')) {
           navigate(Routes.GatewayWifiList, {
             list_wifi: data.wifi,
             unit_id: unit_id,
@@ -113,12 +119,12 @@ const ConnectWifiWarning = memo(({ route }) => {
         goBack();
       });
     } else {
-      const socket = dgram.createSocket({ type: 'udp4' });
+      const dgSocket = dgram.createSocket({ type: 'udp4' });
       await setIsPercentConnect(1);
-      await socket.bind(54321);
-      await socket.on('message', (msg, rinfo) => {
+      await dgSocket.bind(54321);
+      await dgSocket.on('message', (msg, rinfo) => {
         const data = JSON.parse(msg.toString());
-        if (data.hasOwnProperty('wifi')) {
+        if (Object.prototype.hasOwnProperty.call(data, 'wifi')) {
           navigate(Routes.GatewayWifiList, {
             list_wifi: data.wifi,
             unit_id: unit_id,
@@ -128,12 +134,12 @@ const ConnectWifiWarning = memo(({ route }) => {
             wifi_pass: wifi_pass,
             unit_name: unit_name,
             devicePrefixName: devicePrefixName,
-            socket: socket,
+            socket: dgSocket,
           });
         }
       });
-      await socket.once('listening', async () => {
-        await socket.send(
+      await dgSocket.once('listening', async () => {
+        await dgSocket.send(
           JSON.stringify({ type: 'scan', data: { wifi: '' } }),
           undefined,
           undefined,
@@ -142,7 +148,7 @@ const ConnectWifiWarning = memo(({ route }) => {
           undefined
         );
       });
-      socket.on('error', () => {
+      dgSocket.on('error', () => {
         ToastBottomHelper.error(t('server_error'));
         setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
         goBack();

package/src/screens/AddNewGateway/PlugAndPlay/GatewayWifiList.js

@@ -28,8 +28,6 @@ import WifiManager from 'react-native-wifi-reborn';
 import { useNavigation } from '@react-navigation/native';
 import { TESTID } from '../../../configs/Constants';
 
-const isIos = Platform.OS === 'ios';
-
 const GatewayWifiList = memo(({ route }) => {
   const {
     list_wifi,
@@ -60,8 +58,8 @@ const GatewayWifiList = memo(({ route }) => {
   };
 
   const onPasswordChange = useCallback(
-    (password) => {
-      setPassword(password?.toString());
+    (newPassword) => {
+      setPassword(newPassword?.toString());
     },
     [setPassword]
   );
@@ -69,44 +67,49 @@ const GatewayWifiList = memo(({ route }) => {
   const handleSocketOnMsg = useCallback(
     (msg) => {
       const data = JSON.parse(msg.toString());
-      if (data.hasOwnProperty('gateway')) {
+      if (Object.prototype.hasOwnProperty.call(data, 'gateway')) {
         const checkWifiInterval = setInterval(() => {
           // eslint-disable-next-line promise/prefer-await-to-then
-          WifiManager.getCurrentWifiSSID().then((ssid) => {
-            if (ssid !== wifi_ssid) {
-              const IsRobot = devicePrefixName === 'ROBOT';
-              if (IsRobot) {
-                setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
-                navigate(Routes.AddDeviceStack, {
-                  screen: Routes.AddCommonSelectSubUnit,
-                  params: {
-                    scan_sensor_data: scan_sensor_data,
-                    addType: 'AddDeviceNewFlow',
-                    gateway: data?.gateway,
-                    unit_id: unit_id,
-                    devicePrefixName: devicePrefixName,
-                    wifi_ssid: wifi_ssid,
-                    wifi_pass: wifi_pass,
-                  },
-                });
-                clearInterval(checkWifiInterval);
-              } else {
-                setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
-                navigate(Routes.AddDeviceStack, {
-                  screen: Routes.ConnectingProcess,
-                  params: {
-                    unit_id: unit_id,
-                    unit_name: unit_name,
-                    scan_sensor_data: scan_sensor_data,
-                    gateway: data?.gateway,
-                    devicePrefixName: devicePrefixName,
-                    chip_id: chip_id,
-                  },
-                });
-                clearInterval(checkWifiInterval);
+          WifiManager.getCurrentWifiSSID().then(
+            (ssid) => {
+              if (ssid !== wifi_ssid) {
+                const IsRobot = devicePrefixName === 'ROBOT';
+                if (IsRobot) {
+                  setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
+                  navigate(Routes.AddDeviceStack, {
+                    screen: Routes.AddCommonSelectSubUnit,
+                    params: {
+                      scan_sensor_data: scan_sensor_data,
+                      addType: 'AddDeviceNewFlow',
+                      gateway: data?.gateway,
+                      unit_id: unit_id,
+                      devicePrefixName: devicePrefixName,
+                      wifi_ssid: wifi_ssid,
+                      wifi_pass: wifi_pass,
+                    },
+                  });
+                  clearInterval(checkWifiInterval);
+                } else {
+                  setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
+                  navigate(Routes.AddDeviceStack, {
+                    screen: Routes.ConnectingProcess,
+                    params: {
+                      unit_id: unit_id,
+                      unit_name: unit_name,
+                      scan_sensor_data: scan_sensor_data,
+                      gateway: data?.gateway,
+                      devicePrefixName: devicePrefixName,
+                      chip_id: chip_id,
+                    },
+                  });
+                  clearInterval(checkWifiInterval);
+                }
               }
+            },
+            () => {
+              ToastBottomHelper.error('Cannot get current SSID!');
             }
-          });
+          );
         }, 3000);
       }
     },
@@ -151,7 +154,7 @@ const GatewayWifiList = memo(({ route }) => {
 
   const connectWifi = useCallback(async () => {
     if (!isConnectWifiGateway) {
-      if (isIos) {
+      if (Platform.OS === 'ios') {
         sendConnect(0);
         setAction(Action.IS_CONNECT_WIFI_GATEWAY, true);
         setIsSendWifi(true);
@@ -224,7 +227,10 @@ const GatewayWifiList = memo(({ route }) => {
           {t('select_wifi')}
         </Text>
 
-        <ScrollView style={styles.listContainer}>
+        <ScrollView
+          style={styles.listContainer}
+          scrollIndicatorInsets={{ right: 1 }}
+        >
           {!!list_wifi.length &&
             list_wifi.map((item, index) => (
               <TouchableOpacity

package/src/screens/AddNewGateway/PlugAndPlay/__test__/GatewayWifiList.test.js

@@ -1,25 +1,32 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
 import GatewayWifiList from '../GatewayWifiList';
-import { Text, ScrollView, TouchableOpacity } from 'react-native';
+import { Text, ScrollView, TouchableOpacity, Platform } from 'react-native';
 import { getTranslate } from '../../../../utils/I18n';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
 import TextInputPassword from '../../../../commons/Form/TextInputPassword';
 import { TESTID } from '../../../../configs/Constants';
+import WifiManager from 'react-native-wifi-reborn';
+import { useNavigation } from '@react-navigation/native';
+import Routes from '../../../../utils/Route';
 
-const wrapComponent = (route) => (
-  <SCProvider initState={mockSCStore({})}>
+const wrapComponent = (route, state = {}) => (
+  <SCProvider initState={{ ...mockSCStore({}), ...state }}>
     <GatewayWifiList route={route} />
   </SCProvider>
 );
 
 describe('Test GatewayWifiList', () => {
   let tree;
+  const socket = {
+    on: jest.fn(),
+    send: jest.fn(),
+  };
   let route = {
     params: {
       list_wifi: [{ ssid: 'eoh@io' }, { ssid: 'eoh@ras.io' }],
-      socket: { send: jest.fn() },
+      socket: socket,
     },
   };
 
@@ -33,6 +40,7 @@ describe('Test GatewayWifiList', () => {
     expect(texts[1].props.children).toEqual(getTranslate('en', 'set_network'));
     expect(texts[3].props.children).toEqual('eoh@io');
   });
+
   test('onPress wifi', async () => {
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -46,6 +54,7 @@ describe('Test GatewayWifiList', () => {
       await touchableOpacity[1].props.onPress();
     });
   });
+
   test('onChange TextInputPassword', async () => {
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -60,15 +69,60 @@ describe('Test GatewayWifiList', () => {
     const ButtonPopup = instance.find(
       (el) => el.props.testID === TESTID.GATEWAY_WIFI_LIST.BUTTON_POPUP
     );
-    await act(() => {
-      ButtonPopup.props.onPressMain();
+    await act(async () => {
+      await ButtonPopup.props.onPressMain();
     });
-    await act(() => {
-      ButtonPopup.props.onPressSecondary();
+    await act(async () => {
+      await ButtonPopup.props.onPressSecondary();
     });
-    await act(() => {
-      ButtonPopup.props.onClose();
+    await act(async () => {
+      await ButtonPopup.props.onClose();
     });
     expect(ButtonPopup).toBeDefined();
   });
+
+  test('on device is connected to wifi and mobile re-connect to internet', async () => {
+    jest.useFakeTimers();
+    Platform.OS = 'android';
+
+    await act(async () => {
+      tree = await create(wrapComponent(route, {}));
+    });
+
+    const instance = tree.root;
+    const ButtonPopup = instance.find(
+      (el) => el.props.testID === TESTID.GATEWAY_WIFI_LIST.BUTTON_POPUP
+    );
+    await act(async () => {
+      await ButtonPopup.props.onPressMain();
+    });
+    expect(socket.on).toBeCalled();
+    expect(socket.send).toBeCalled();
+
+    const mockWifiThen = jest.fn();
+    WifiManager.getCurrentWifiSSID.mockImplementation(() => ({
+      then: mockWifiThen,
+    }));
+
+    // receive message
+    await act(async () => {
+      await socket.on.mock.calls[0][1](
+        JSON.stringify({
+          gateway: true,
+        })
+      );
+    });
+    jest.runOnlyPendingTimers();
+
+    expect(WifiManager.getCurrentWifiSSID).toBeCalled();
+    expect(mockWifiThen).toBeCalled();
+
+    // get ssid success
+    act(() => {
+      mockWifiThen.mock.calls[0][0]('new-ssid');
+    });
+    const { navigate } = useNavigation();
+    expect(navigate).toBeCalled();
+    expect(navigate.mock.calls[0][0]).toEqual(Routes.AddDeviceStack);
+  });
 });

package/src/screens/AddNewGateway/SelectGateway.js

@@ -91,6 +91,7 @@ const AddNewGatewaySelectGateway = ({ route }) => {
         <ScrollView
           style={styles.scrollContainer}
           showsVerticalScrollIndicator={false}
+          scrollIndicatorInsets={{ right: 1 }}
         >
           <Section type={'border'}>
             {gateways.map((item, index) => (

package/src/screens/AddNewGateway/SetupGatewayWifi.js

@@ -52,6 +52,7 @@ const SetupGatewayWifi = memo(({ route }) => {
             setWifiName(ssid);
           });
         }
+        // eslint-disable-next-line no-empty
       } catch (err) {}
     };
     wifiPermission();
@@ -147,6 +148,7 @@ const SetupGatewayWifi = memo(({ route }) => {
       <ScrollView
         style={styles.scrollContainer}
         showsVerticalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Section type={'border'}>
           <Text style={styles.textWifi} bold color={Colors.Primary}>

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
-import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 
 import AddNewGateway from '../index';
 import GroupCheckBox from '../../../commons/GroupCheckBox';
@@ -10,6 +10,7 @@ import { TextInput } from 'react-native';
 import { getTranslate } from '../../../utils/I18n';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import api from '../../../utils/Apis/axios';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -17,7 +18,7 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 jest.mock('react', () => {
   return { ...jest.requireActual('react'), memo: (x) => x };
@@ -41,7 +42,6 @@ describe('Test AddNewGateway', () => {
   let route;
 
   afterEach(() => {
-    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 
@@ -149,9 +149,7 @@ describe('Test AddNewGateway', () => {
         stations: [{ id: 2, name: 'Station name' }],
       },
     };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet().reply(200, response.data);
 
     await act(async () => {
       tree = await create(wrapComponent(route));

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
-import axios from 'axios';
 
 import { TESTID } from '../../../configs/Constants';
 import ConnectedGateway from '../ConnectedGateway';
@@ -8,8 +7,6 @@ import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import { getTranslate } from '../../../utils/I18n';
 
-jest.mock('axios');
-
 const mockedNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
   return {
@@ -31,7 +28,6 @@ describe('Test ConnectedGateway', () => {
   let route;
 
   afterEach(() => {
-    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
-import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 
 import ConnectingGateway from '../ConnectingGateway';
 import Text from '../../../commons/Text';
@@ -9,8 +9,9 @@ import Routes from '../../../utils/Route';
 import { getTranslate } from '../../../utils/I18n';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import api from '../../../utils/Apis/axios';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 const mockedNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
@@ -33,7 +34,6 @@ describe('Test ConnectingGateway', () => {
   let route;
 
   afterEach(() => {
-    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 
@@ -64,14 +64,7 @@ describe('Test ConnectingGateway', () => {
 
   test('call setInterval api success', async () => {
     jest.useFakeTimers();
-    const response = {
-      status: 200,
-      data: {},
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onGet(API.CHIP.CHECK_FINALIZED()).reply(200, {});
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -79,11 +72,6 @@ describe('Test ConnectingGateway', () => {
       await jest.runOnlyPendingTimers();
     });
     expect(setInterval).toHaveBeenCalled();
-    expect(axios.get).toHaveBeenCalledWith(API.CHIP.CHECK_FINALIZED(), {
-      params: {
-        chip_id: 1,
-      },
-    });
     expect(mockedNavigate).not.toHaveBeenCalledWith(
       Routes.ConnectedGateway,
       route.params
@@ -92,14 +80,7 @@ describe('Test ConnectingGateway', () => {
 
   test('call setInterval api fail', async () => {
     jest.useFakeTimers();
-    const response = {
-      status: 400,
-      data: {},
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onGet(API.CHIP.CHECK_FINALIZED()).reply(400);
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -107,11 +88,6 @@ describe('Test ConnectingGateway', () => {
       await jest.runOnlyPendingTimers();
     });
     expect(setInterval).toHaveBeenCalled();
-    expect(axios.get).toHaveBeenCalledWith(API.CHIP.CHECK_FINALIZED(), {
-      params: {
-        chip_id: 1,
-      },
-    });
     expect(mockedNavigate).not.toHaveBeenCalledWith(
       Routes.ConnectedGateway,
       route.params

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
-import axios from 'axios';
 
 import AddNewGatewaySelectGateway from '../SelectGateway';
 import { SCProvider } from '../../../context';
@@ -13,8 +12,6 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-jest.mock('axios');
-
 jest.mock('react', () => {
   return { ...jest.requireActual('react'), memo: (x) => x };
 });
@@ -38,7 +35,6 @@ describe('Test AddNewGatewaySelectGateway', () => {
   let route;
 
   afterEach(() => {
-    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
-import axios from 'axios';
 
 import { TESTID } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
@@ -16,8 +15,6 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-jest.mock('axios');
-
 jest.mock('react', () => {
   return { ...jest.requireActual('react'), memo: (x) => x };
 });
@@ -59,7 +56,6 @@ describe('Test SetupGatewayWifi', () => {
   let route;
 
   afterEach(() => {
-    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 

package/src/screens/AddNewGateway/index.js

@@ -75,6 +75,7 @@ const AddNewGateway = memo(({ route }) => {
       <ScrollView
         style={styles.scrollContainer}
         showsVerticalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Section type={'border'}>
           {!wifiName && (

package/src/screens/AddNewOneTap/__test__/AddNewOneTap.test.js

@@ -1,5 +1,5 @@
-import axios from 'axios';
 import React from 'react';
+import MockAdapter from 'axios-mock-adapter';
 import { Platform, TextInput, TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 
@@ -9,13 +9,15 @@ import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import Routes from '../../../utils/Route';
 import { HeaderCustom } from '../../../commons/Header';
+import api from '../../../utils/Apis/axios';
+import { API } from '../../../configs';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <AddNewOneTap route={route} />
   </SCProvider>
 );
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 jest.mock('react-redux', () => {
   return {
@@ -41,14 +43,13 @@ jest.mock('react', () => {
   };
 });
 
-jest.mock('axios');
 let tree;
 
 describe('test AddNewOneTap', () => {
   beforeEach(() => {
-    axios.post.mockClear();
     mockedNavigate.mockClear();
   });
+
   test('create AddNewOneTap success', async () => {
     Platform.OS = 'ios';
     let route = {
@@ -71,9 +72,7 @@ describe('test AddNewOneTap', () => {
       },
     };
 
-    axios.post.mockImplementation(async () => {
-      return response;
-    });
+    mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(200, response.data);
 
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -100,19 +99,14 @@ describe('test AddNewOneTap', () => {
       await item[0].props.onPress();
     });
   });
+
   test('create AddNewOneTap fail', async () => {
     Platform.OS = 'android';
     let route = {
       params: { type: 'one_tap' },
     };
 
-    const response = {
-      status: 400,
-    };
-
-    axios.post.mockImplementation(async () => {
-      return response;
-    });
+    mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(400);
 
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -144,15 +138,7 @@ describe('test AddNewOneTap', () => {
         isAutomateTab: false,
       },
     };
-
-    const response = {
-      status: 400,
-    };
-
-    axios.post.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(400);
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -165,7 +151,7 @@ describe('test AddNewOneTap', () => {
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
       id: 1,
       name: 'script test',
-      type: 'one_tap',
+      type: undefined,
       havePermission: true,
       unit: { id: 1 },
       isMultiUnits: false,