@eohjsc/react-native-smart-city 0.2.97 → 0.3.0

package/src/screens/AddNewDevice/__test__/AddNewDevice.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 AddNewDevice from '../index';
 import GroupCheckBox from '../../../commons/GroupCheckBox';
@@ -11,6 +11,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';
+import { Platform } from 'react-native';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -18,7 +20,7 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 jest.mock('react', () => {
   return { ...jest.requireActual('react'), memo: (x) => x };
@@ -42,7 +44,6 @@ describe('Test AddNewDevice', () => {
   let route;
 
   afterEach(() => {
-    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 
@@ -78,23 +79,16 @@ describe('Test AddNewDevice', () => {
   });
 
   test('fetchDetails success', async () => {
-    const response = {
-      status: 200,
-      data: {
-        id: 1,
-        name: 'Unit name',
-        stations: [{ id: 2, name: 'Station name' }],
-      },
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
+    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(200, {
+      id: 1,
+      name: 'Unit name',
+      stations: [{ id: 2, name: 'Station name' }],
     });
 
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    expect(axios.get).toHaveBeenCalledWith(API.UNIT.UNIT_DETAIL(1), {});
 
     const groupCheckBox = instance.findByType(GroupCheckBox);
     expect(groupCheckBox.props.data).toEqual([
@@ -103,19 +97,11 @@ describe('Test AddNewDevice', () => {
   });
 
   test('fetchDetails fail', async () => {
-    const response = {
-      data: {},
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(400);
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    expect(axios.get).toHaveBeenCalledWith(API.UNIT.UNIT_DETAIL(1), {});
-
     const groupCheckBox = instance.findByType(GroupCheckBox);
     expect(groupCheckBox.props.data).toEqual([]);
   });
@@ -160,16 +146,10 @@ describe('Test AddNewDevice', () => {
   });
 
   test('ViewButtonBottom onRightClick with stationId', async () => {
-    const response = {
-      status: 200,
-      data: {
-        id: 1,
-        name: 'Unit name',
-        stations: [{ id: 2, name: 'Station name' }],
-      },
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
+    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(200, {
+      id: 1,
+      name: 'Unit name',
+      stations: [{ id: 2, name: 'Station name' }],
     });
 
     await act(async () => {
@@ -192,4 +172,25 @@ describe('Test AddNewDevice', () => {
       unit_name: 'Unit name',
     });
   });
+
+  test('handleOnSelect with id = -1', async () => {
+    Platform.OS = 'android';
+    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(200, {
+      id: 1,
+      name: 'Unit name',
+      stations: [{ id: 2, name: 'Station name' }],
+    });
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+
+    const groupCheckBox = instance.findByType(GroupCheckBox);
+    await act(async () => {
+      groupCheckBox.props.onSelect({ id: -1 }); // select stationId
+    });
+    const viewButtonBottom = instance.findByType(ViewButtonBottom);
+    expect(viewButtonBottom.props.rightDisabled).toBeTruthy();
+  });
 });

package/src/screens/AddNewDevice/__test__/ConnectDevices.test.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
-import axios from 'axios';
 
 import ConnectDevices from '../ConnectDevices';
 import { TESTID } from '../../../configs/Constants';
@@ -11,8 +10,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 {
@@ -34,7 +31,6 @@ describe('Test ConnectDevices', () => {
   let route;
 
   afterEach(() => {
-    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 

package/src/screens/AddNewDevice/__test__/ConnectingDevices.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 { API } from '../../../configs';
 import ConnectingDevices from '../ConnectingDevices';
@@ -9,8 +9,9 @@ import Routes from '../../../utils/Route';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import { getTranslate } from '../../../utils/I18n';
+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 ConnectingDevices', () => {
   let route;
 
   afterEach(() => {
-    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 
@@ -62,16 +62,25 @@ describe('Test ConnectingDevices', () => {
     );
   });
 
-  test('call setInterval api success', async () => {
-    jest.useFakeTimers();
-    const response = {
-      status: 200,
-      data: {},
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
+  test('create with out new sensor', () => {
+    act(() => {
+      tree = create(wrapComponent({}));
     });
+    const instance = tree.root;
+    const texts = instance.findAllByType(Text);
+    expect(texts).toHaveLength(4);
+    expect(texts[0].props.children).toEqual(
+      getTranslate('en', 'connecting_your_device')
+    );
+    expect(texts[1].props.children).toEqual(
+      getTranslate('en', 'dont_turn_off_the_device_or_close_this_app')
+    );
+    tree.unmount();
+  });
 
+  test('call setInterval api success', async () => {
+    jest.useFakeTimers();
+    mock.onGet(API.SENSOR.CHECK_CONNECTION(1)).reply(200);
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -79,7 +88,6 @@ describe('Test ConnectingDevices', () => {
       await jest.runOnlyPendingTimers();
     });
     expect(setInterval).toHaveBeenCalled();
-    expect(axios.get).toHaveBeenCalledWith(API.SENSOR.CHECK_CONNECTION(1), {});
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.ConnectDevices, {
       new_sensor: { id: 1 },
     });
@@ -87,14 +95,7 @@ describe('Test ConnectingDevices', () => {
 
   test('call setInterval api fail', async () => {
     jest.useFakeTimers();
-    const response = {
-      status: 400,
-      data: {},
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onGet(API.SENSOR.CHECK_CONNECTION(1)).reply(400);
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -102,7 +103,6 @@ describe('Test ConnectingDevices', () => {
       await jest.runOnlyPendingTimers();
     });
     expect(setInterval).toHaveBeenCalled();
-    expect(axios.get).toHaveBeenCalledWith(API.SENSOR.CHECK_CONNECTION(1), {});
     expect(mockedNavigate).not.toHaveBeenCalledWith(Routes.ConnectDevices, {
       new_sensor: { id: 1 },
     });

package/src/screens/AddNewDevice/index.js

@@ -90,6 +90,7 @@ const AddNewDevice = memo(({ route }) => {
       <ScrollView
         style={styles.scrollContainer}
         showsVerticalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Section type={'border'}>
           <GroupCheckBox data={stations} onSelect={handleOnSelect} />

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

@@ -224,7 +224,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/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

@@ -147,6 +147,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,

package/src/screens/AddNewOneTap/index.js

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

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 axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 import { useRoute } from '@react-navigation/native';
 
 import MultiUnits from '../MultiUnits';
@@ -13,8 +13,10 @@ 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';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 const mockedNavigate = jest.fn();
 const mockSetState = jest.fn();
 
@@ -47,7 +49,6 @@ describe('Test MultiUnits', () => {
   let tree;
 
   beforeEach(() => {
-    axios.get.mockClear();
     mockedNavigate.mockClear();
     mockSetState.mockClear();
     useRoute.mockClear();
@@ -93,9 +94,7 @@ describe('Test MultiUnits', () => {
         },
       ],
     };
-    await axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.AUTOMATE.GET_MULTI_UNITS()).reply(200, response.data);
     useRoute.mockReturnValue({
       params: {
         isMultiUnits: true,
@@ -189,9 +188,7 @@ describe('Test MultiUnits', () => {
         },
       ],
     };
-    await axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.AUTOMATE.GET_MULTI_UNITS()).reply(200, response.data);
     useRoute.mockReturnValue({
       params: {
         isMultiUnits: true,