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

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/AllCamera/index.js

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

package/src/screens/Automate/MultiUnits.js

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

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 axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 
 import Automate from '../';
 import { SCProvider } from '../../../context';
@@ -10,8 +10,10 @@ 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';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 const mockedNavigate = jest.fn();
 const mockSetState = jest.fn();
 
@@ -46,7 +48,6 @@ describe('Test Automate', () => {
   let tree;
 
   beforeEach(() => {
-    axios.get.mockClear();
     mockedNavigate.mockClear();
     mockSetState.mockClear();
   });
@@ -86,9 +87,7 @@ describe('Test Automate', () => {
         },
       ],
     };
-    await axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.AUTOMATE.GET_SMART()).reply(200, response.data);
 
     useState.mockImplementation(() => [false, mockSetState]);
     useState.mockImplementation(() => [response.data, mockSetState]);
@@ -141,9 +140,7 @@ describe('Test Automate', () => {
         { automates: [], unit_id: 3, unit_name: 'La Vida' },
       ],
     };
-    await axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.AUTOMATE.GET_SMART()).reply(200, response.data);
 
     useState.mockImplementation(() => [false, mockSetState]);
     useState.mockImplementation(() => [response.data, mockSetState]);
@@ -199,9 +196,7 @@ describe('Test Automate', () => {
         { automates: [], unit_id: 3, unit_name: 'La Vida' },
       ],
     };
-    await axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.AUTOMATE.GET_SMART()).reply(200, response.data);
 
     useState.mockImplementation(() => [false, mockSetState]);
     useState.mockImplementation(() => [response.data, mockSetState]);

package/src/screens/Automate/index.js

@@ -109,13 +109,13 @@ const Automate = () => {
       const isOwner = owner_unit_id
         ? owner_unit_id === idUser
         : type === UNIT_TYPES.MULTI;
-      const renderItemAutomate = ({ item }) => {
+      const renderItemAutomate = ({ item: automate }) => {
         return (
           <ItemOneTap
             isOwner={isOwner}
-            automate={item}
+            automate={automate}
             wrapSyles={styles.wrapAutomateItem}
-            onPressItem={onPressItem(item, unit_id, type, isOwner)}
+            onPressItem={onPressItem(automate, unit_id, type, isOwner)}
           />
         );
       };
@@ -147,6 +147,7 @@ const Automate = () => {
             showsHorizontalScrollIndicator={false}
             contentContainerStyle={styles.contentContainerStyle2}
             ListFooterComponent={renderListFooterComponent(type, unit_id)}
+            scrollIndicatorInsets={{ right: 1 }}
           />
         </View>
       );
@@ -189,6 +190,7 @@ const Automate = () => {
         contentContainerStyle={styles.contentContainerStyle}
         refreshing={false}
         onRefresh={getAutomates}
+        scrollIndicatorInsets={{ right: 1 }}
       />
     </View>
   );

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

@@ -1,43 +1,49 @@
-import React from 'react';
+import React, { useState } from 'react';
 import renderer, { act } from 'react-test-renderer';
-import axios from 'axios';
 
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import ConfirmUnitDeletion from '../index';
 import _TextInput from '../../../commons/Form/TextInput';
+import { TouchableOpacity } from 'react-native';
+import { TESTID } from '../../../configs/Constants';
+import API from '../../../configs/API';
+import api from '../../../utils/Apis/axios';
+import MockAdapter from 'axios-mock-adapter';
 
+const mock = new MockAdapter(api.axiosInstance);
 const wrapComponent = (route, navigation) => (
   <SCProvider initState={mockSCStore({})}>
     <ConfirmUnitDeletion route={route} />
   </SCProvider>
 );
 
-const mockedNavigate = jest.fn();
-
+const mockNavigate = jest.fn();
+const mockGoBack = jest.fn();
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
     useNavigation: () => ({
-      goBack: mockedNavigate,
+      navigate: mockNavigate,
+      goBack: mockGoBack,
     }),
   };
 });
 
+const mockSetState = jest.fn();
 jest.mock('react', () => {
   return {
     ...jest.requireActual('react'),
+    useState: jest.fn((init) => [init, mockSetState]),
     memo: (x) => x,
   };
 });
 
-jest.mock('axios');
 describe('Test ConfirmUnitDeletion', () => {
   let tree;
   let route;
 
   beforeAll(() => {
-    axios.get.mockClear();
     route = {
       params: {
         unit: {
@@ -48,14 +54,36 @@ describe('Test ConfirmUnitDeletion', () => {
   });
 
   test('test render ConfirmUnitDeletion', async () => {
+    useState.mockImplementationOnce((init) => ['new_name', mockSetState]);
+    await act(async () => {
+      tree = await renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+
+    const textInput = instance.findByType(_TextInput);
+    await act(async () => {
+      textInput.props.onChange();
+    });
+  });
+  test('Onpress button ConfirmUnitDeletion ', async () => {
+    useState.mockImplementationOnce((init) => ['YES', mockSetState]);
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
 
+    const touchableOpacity = instance.find(
+      (el) =>
+        el.props.testID === TESTID.CONFIRM_UNIT_DELETION_BUTTON &&
+        el.type === TouchableOpacity
+    );
     const textInput = instance.findByType(_TextInput);
     await act(async () => {
-      textInput.props.onChange('new_name');
+      touchableOpacity.props.onPress();
+    });
+    await act(async () => {
+      textInput.props.onChange();
     });
+    mock.onDelete(API.UNIT.MANAGE_UNIT(1)).reply(204);
   });
 });

package/src/screens/ConfirmUnitDeletion/index.js

@@ -12,6 +12,7 @@ import { Button } from '../../commons';
 import Routes from '../../utils/Route';
 import { axiosDelete } from '../../utils/Apis/axios';
 import { ToastBottomHelper } from '../../utils/Utils';
+import { TESTID } from '../../configs/Constants';
 
 const ConfirmUnitDeletion = ({ route }) => {
   const t = useTranslations();
@@ -55,7 +56,12 @@ const ConfirmUnitDeletion = ({ route }) => {
         textInputStyle={styles.textInput}
       />
       <View style={styles.buttonWrap}>
-        <Button type="auth" title={t('done')} onPress={onSendPress} />
+        <Button
+          type="auth"
+          title={t('done')}
+          onPress={onSendPress}
+          testID={TESTID.CONFIRM_UNIT_DELETION_BUTTON}
+        />
       </View>
     </WrapHeaderScrollable>
   );