@eohjsc/react-native-smart-city 0.3.4 → 0.3.7

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

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

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

@@ -60,8 +60,8 @@ const GatewayWifiList = memo(({ route }) => {
   };
 
   const onPasswordChange = useCallback(
-    (newPassword) => {
-      setPassword(newPassword?.toString());
+    (password) => {
+      setPassword(password?.toString());
     },
     [setPassword]
   );
@@ -69,7 +69,7 @@ const GatewayWifiList = memo(({ route }) => {
   const handleSocketOnMsg = useCallback(
     (msg) => {
       const data = JSON.parse(msg.toString());
-      if (Object.prototype.hasOwnProperty.call(data, 'gateway')) {
+      if (data.hasOwnProperty('gateway')) {
         const checkWifiInterval = setInterval(() => {
           // eslint-disable-next-line promise/prefer-await-to-then
           WifiManager.getCurrentWifiSSID().then((ssid) => {
@@ -224,10 +224,7 @@ const GatewayWifiList = memo(({ route }) => {
           {t('select_wifi')}
         </Text>
 
-        <ScrollView
-          style={styles.listContainer}
-          scrollIndicatorInsets={{ right: 1 }}
-        >
+        <ScrollView style={styles.listContainer}>
           {!!list_wifi.length &&
             list_wifi.map((item, index) => (
               <TouchableOpacity

package/src/screens/AddNewGateway/SelectGateway.js

@@ -91,7 +91,6 @@ 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,7 +52,6 @@ const SetupGatewayWifi = memo(({ route }) => {
             setWifiName(ssid);
           });
         }
-        // eslint-disable-next-line no-empty
       } catch (err) {}
     };
     wifiPermission();
@@ -148,7 +147,6 @@ 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 MockAdapter from 'axios-mock-adapter';
+import axios from 'axios';
 
 import AddNewGateway from '../index';
 import GroupCheckBox from '../../../commons/GroupCheckBox';
@@ -10,7 +10,6 @@ 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({})}>
@@ -18,7 +17,7 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 jest.mock('react', () => {
   return { ...jest.requireActual('react'), memo: (x) => x };
@@ -42,6 +41,7 @@ describe('Test AddNewGateway', () => {
   let route;
 
   afterEach(() => {
+    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 
@@ -149,7 +149,9 @@ describe('Test AddNewGateway', () => {
         stations: [{ id: 2, name: 'Station name' }],
       },
     };
-    mock.onGet().reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
 
     await act(async () => {
       tree = await create(wrapComponent(route));

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
+import axios from 'axios';
 
 import { TESTID } from '../../../configs/Constants';
 import ConnectedGateway from '../ConnectedGateway';
@@ -7,6 +8,8 @@ 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 {
@@ -28,6 +31,7 @@ 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 MockAdapter from 'axios-mock-adapter';
+import axios from 'axios';
 
 import ConnectingGateway from '../ConnectingGateway';
 import Text from '../../../commons/Text';
@@ -9,9 +9,8 @@ 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';
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 const mockedNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
@@ -34,6 +33,7 @@ describe('Test ConnectingGateway', () => {
   let route;
 
   afterEach(() => {
+    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 
@@ -64,7 +64,14 @@ describe('Test ConnectingGateway', () => {
 
   test('call setInterval api success', async () => {
     jest.useFakeTimers();
-    mock.onGet(API.CHIP.CHECK_FINALIZED()).reply(200, {});
+    const response = {
+      status: 200,
+      data: {},
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
+
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -72,6 +79,11 @@ 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
@@ -80,7 +92,14 @@ describe('Test ConnectingGateway', () => {
 
   test('call setInterval api fail', async () => {
     jest.useFakeTimers();
-    mock.onGet(API.CHIP.CHECK_FINALIZED()).reply(400);
+    const response = {
+      status: 400,
+      data: {},
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
+
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -88,6 +107,11 @@ 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,5 +1,6 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
+import axios from 'axios';
 
 import AddNewGatewaySelectGateway from '../SelectGateway';
 import { SCProvider } from '../../../context';
@@ -12,6 +13,8 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
+jest.mock('axios');
+
 jest.mock('react', () => {
   return { ...jest.requireActual('react'), memo: (x) => x };
 });
@@ -35,6 +38,7 @@ describe('Test AddNewGatewaySelectGateway', () => {
   let route;
 
   afterEach(() => {
+    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 

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

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

package/src/screens/AddNewGateway/index.js

@@ -75,7 +75,6 @@ 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,15 +9,13 @@ 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>
 );
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 jest.mock('react-redux', () => {
   return {
@@ -43,13 +41,14 @@ 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 = {
@@ -72,7 +71,9 @@ describe('test AddNewOneTap', () => {
       },
     };
 
-    mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(200, response.data);
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
 
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -99,14 +100,19 @@ describe('test AddNewOneTap', () => {
       await item[0].props.onPress();
     });
   });
-
   test('create AddNewOneTap fail', async () => {
     Platform.OS = 'android';
     let route = {
       params: { type: 'one_tap' },
     };
 
-    mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(400);
+    const response = {
+      status: 400,
+    };
+
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
 
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -138,7 +144,15 @@ describe('test AddNewOneTap', () => {
         isAutomateTab: false,
       },
     };
-    mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(400);
+
+    const response = {
+      status: 400,
+    };
+
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
+
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -151,7 +165,7 @@ describe('test AddNewOneTap', () => {
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
       id: 1,
       name: 'script test',
-      type: undefined,
+      type: 'one_tap',
       havePermission: true,
       unit: { id: 1 },
       isMultiUnits: false,

package/src/screens/AddNewOneTap/index.js

@@ -25,7 +25,6 @@ const AddNewOneTap = memo(({ route }) => {
     isMultiUnits,
     automateId,
     scriptName,
-    oldType,
   } = route.params;
   const t = useTranslations();
   const { navigate, dispatch, goBack } = useNavigation();
@@ -92,7 +91,7 @@ const AddNewOneTap = memo(({ route }) => {
       navigate(Routes.ScriptDetail, {
         id: automateId,
         name: scriptName,
-        type: oldType,
+        type: type,
         havePermission: true,
         unit,
         isMultiUnits,
@@ -121,7 +120,7 @@ const AddNewOneTap = memo(({ route }) => {
       }
     >
       <HeaderCustom isShowClose onClose={onClose} />
-      <ScrollView scrollIndicatorInsets={{ right: 1 }}>
+      <ScrollView>
         <Text
           testID={TESTID.ADD_NEW_DEVICE_ADD}
           semibold

package/src/screens/AllCamera/index.js

@@ -35,9 +35,9 @@ const AllCamera = () => {
   const [dataFullScreen, setDataFullScreen] = useState();
 
   const handleFullScreen = useCallback(
-    (dataFullscreen) => {
+    (data) => {
       setIsFullScreen(!isFullScreen);
-      setDataFullScreen(dataFullscreen);
+      setDataFullScreen(data);
     },
     [isFullScreen]
   );
@@ -74,8 +74,8 @@ const AllCamera = () => {
   };
 
   const goToPlayBack = useCallback(
-    (item, itemThumbnail) => () => {
-      navigate(Routes.PlaybackCamera, { item, thumbnail: itemThumbnail });
+    (item, thumbnail) => () => {
+      navigate(Routes.PlaybackCamera, { item, thumbnail });
     },
     [navigate]
   );

package/src/screens/Automate/MultiUnits.js

@@ -39,17 +39,17 @@ const MultiUnits = () => {
   );
 
   const getData = useCallback(
-    async (fetchParams) => {
+    async (params) => {
       if (isMultiUnits) {
-        const { success, data: automateData } = await axiosGet(
+        const { success, data } = await axiosGet(
           API.AUTOMATE.GET_MULTI_UNITS(),
-          fetchParams
+          params
         );
-        success && setData(automateData);
+        success && setData(data);
       } else {
         await fetchWithCache(API.UNIT.AUTOMATE(unit?.id), {}, (response) => {
-          const { success, data: automateData } = response;
-          success && setData(automateData);
+          const { success, data } = response;
+          success && setData(data);
         });
       }
     },
@@ -60,14 +60,14 @@ const MultiUnits = () => {
     setTabActive(tab);
   };
 
-  const onPressItem = (item, isItemOwner) => () => {
+  const onPressItem = (item, isOwner) => () => {
     navigate(Routes.UnitStack, {
       screen: Routes.ScriptDetail,
       params: {
         id: item?.id,
         name: item?.script?.name,
         type: item?.type,
-        havePermission: isItemOwner || idUser === item?.user,
+        havePermission: isOwner || idUser === item?.user,
         unit,
         isMultiUnits,
         automate: item,

package/src/screens/Automate/__test__/MultiUnits.test.js

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
+import axios from 'axios';
 import { useRoute } from '@react-navigation/native';
 
 import MultiUnits from '../MultiUnits';
@@ -13,10 +13,8 @@ import Routes from '../../../utils/Route';
 import WrapHeaderScrollable from '../../../commons/Sharing/WrapHeaderScrollable';
 import { getTranslate } from '../../../utils/I18n';
 import { AUTOMATE_TYPE } from '../../../configs/Constants';
-import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 const mockedNavigate = jest.fn();
 const mockSetState = jest.fn();
 
@@ -49,6 +47,7 @@ describe('Test MultiUnits', () => {
   let tree;
 
   beforeEach(() => {
+    axios.get.mockClear();
     mockedNavigate.mockClear();
     mockSetState.mockClear();
     useRoute.mockClear();
@@ -94,7 +93,9 @@ describe('Test MultiUnits', () => {
         },
       ],
     };
-    mock.onGet(API.AUTOMATE.GET_MULTI_UNITS()).reply(200, response.data);
+    await axios.get.mockImplementation(async () => {
+      return response;
+    });
     useRoute.mockReturnValue({
       params: {
         isMultiUnits: true,
@@ -188,7 +189,9 @@ describe('Test MultiUnits', () => {
         },
       ],
     };
-    mock.onGet(API.AUTOMATE.GET_MULTI_UNITS()).reply(200, response.data);
+    await axios.get.mockImplementation(async () => {
+      return response;
+    });
     useRoute.mockReturnValue({
       params: {
         isMultiUnits: true,

package/src/screens/Automate/__test__/index.test.js

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { FlatList, TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
+import axios from 'axios';
 
 import Automate from '../';
 import { SCProvider } from '../../../context';
@@ -10,10 +10,8 @@ import ItemOneTap from '../../../commons/SubUnit/OneTap/ItemOneTap';
 import ItemAddNew from '../../../commons/Device/ItemAddNew';
 import Routes from '../../../utils/Route';
 import { TESTID } from '../../../configs/Constants';
-import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 const mockedNavigate = jest.fn();
 const mockSetState = jest.fn();
 
@@ -48,6 +46,7 @@ describe('Test Automate', () => {
   let tree;
 
   beforeEach(() => {
+    axios.get.mockClear();
     mockedNavigate.mockClear();
     mockSetState.mockClear();
   });
@@ -87,7 +86,9 @@ describe('Test Automate', () => {
         },
       ],
     };
-    mock.onGet(API.AUTOMATE.GET_SMART()).reply(200, response.data);
+    await axios.get.mockImplementation(async () => {
+      return response;
+    });
 
     useState.mockImplementation(() => [false, mockSetState]);
     useState.mockImplementation(() => [response.data, mockSetState]);
@@ -140,7 +141,9 @@ describe('Test Automate', () => {
         { automates: [], unit_id: 3, unit_name: 'La Vida' },
       ],
     };
-    mock.onGet(API.AUTOMATE.GET_SMART()).reply(200, response.data);
+    await axios.get.mockImplementation(async () => {
+      return response;
+    });
 
     useState.mockImplementation(() => [false, mockSetState]);
     useState.mockImplementation(() => [response.data, mockSetState]);
@@ -196,7 +199,9 @@ describe('Test Automate', () => {
         { automates: [], unit_id: 3, unit_name: 'La Vida' },
       ],
     };
-    mock.onGet(API.AUTOMATE.GET_SMART()).reply(200, response.data);
+    await axios.get.mockImplementation(async () => {
+      return response;
+    });
 
     useState.mockImplementation(() => [false, mockSetState]);
     useState.mockImplementation(() => [response.data, mockSetState]);