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

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

@@ -1,14 +1,12 @@
 import React from 'react';
 import { create, act } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
+import axios from 'axios';
 
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import ScanChipQR from '..';
 import QRScan from '../components/QRScan';
 import Routes from '../../../utils/Route';
-import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -19,7 +17,7 @@ const wrapComponent = (route) => (
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 jest.mock('react', () => {
   return { ...jest.requireActual('react'), memo: (x) => x };
@@ -50,6 +48,10 @@ describe('test ScanChipQR', () => {
     };
   });
 
+  afterEach(() => {
+    axios.get.mockClear();
+  });
+
   test('create ScanChipQR', async () => {
     let tree;
     await act(async () => {
@@ -66,8 +68,13 @@ describe('test ScanChipQR', () => {
       id: 1,
       name: 'ABC',
     };
-
-    mock.onPost(API.UNIT.CHIP_SCAN_GET_WIFI_INFO()).reply(200, new_chip);
+    const response = {
+      status: 200,
+      data: new_chip,
+    };
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
 
     let tree;
     const body = { id: 1, imei: 'SENSOR-X341241', name: 'New Chip' };
@@ -97,7 +104,13 @@ describe('test ScanChipQR', () => {
       id: 1,
       name: 'ABC',
     };
-    mock.onPost(API.UNIT.CHIP_SCAN_GET_WIFI_INFO()).reply(200, new_chip);
+    const response = {
+      data: new_chip,
+    };
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
+
     let tree;
     const body = { id: 1, imei: 'IMEI_X', name: 'New Chip' };
     await act(async () => {

package/src/screens/ScanChipQR/components/QRScan/index.js

@@ -160,7 +160,6 @@ const styles = StyleSheet.create({
     position: 'absolute',
     top: getStatusBarHeight(true) + 16,
     left: 16,
-    zIndex: 10,
   },
   viewVerifing: {
     marginLeft: 16,

package/src/screens/ScanChipQR/hooks/index.js

@@ -3,7 +3,6 @@ import API from '../../../configs/API';
 import { useCallback, useState } from 'react';
 import { axiosPost } from '../../../utils/Apis/axios';
 import Routes from '../../../utils/Route';
-import { ToastBottomHelper } from '../../../utils/Utils';
 
 const useChipScan = (route) => {
   const {
@@ -49,26 +48,28 @@ const useChipScan = (route) => {
                 }
               );
               if (success) {
-                navigation.navigate(Routes.ConnectWifiWarning, {
-                  wifi_ssid: new_chip.wifi_ssid,
-                  wifi_pass: new_chip.wifi_pass,
-                  chip_id: new_chip.id,
-                  unit_id: unit_id,
-                  unit_name: unit_name,
-                  devicePrefixName,
-                  body,
-                });
+                if (new_chip.is_wifi) {
+                  navigation.navigate(Routes.ConnectWifiWarning, {
+                    wifi_ssid: new_chip.wifi_ssid,
+                    wifi_pass: new_chip.wifi_pass,
+                    chip_id: new_chip.id,
+                    unit_id: unit_id,
+                    unit_name: unit_name,
+                    devicePrefixName,
+                    body,
+                  });
+                } else {
+                  navigation.navigate(Routes.ConnectingGateway, {
+                    new_chip,
+                    ...route.params,
+                  });
+                }
               } else {
-                ToastBottomHelper.error(
-                  'Fail to fetch wifi info',
-                  devicePrefixName
-                );
                 navigation.goBack();
               }
             }
             break;
           default:
-            ToastBottomHelper.error('Invalid QR prefix', devicePrefixName);
             navigation.goBack();
             break;
         }

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { create, act } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
+import axios from 'axios';
 
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
@@ -8,7 +8,6 @@ import ScanSensorQR from '..';
 import QRScan from '../../ScanChipQR/components/QRScan';
 import API from '../../../configs/API';
 import Routes from '../../../utils/Route';
-import api from '../../../utils/Apis/axios';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -16,11 +15,11 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-const mock = new MockAdapter(api.axiosInstance);
-
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 
+jest.mock('axios');
+
 jest.mock('react', () => {
   return { ...jest.requireActual('react'), memo: (x) => x };
 });
@@ -49,6 +48,10 @@ describe('test ScanSensorQR', () => {
     };
   });
 
+  afterEach(() => {
+    axios.get.mockClear();
+  });
+
   test('create ScanSensorQR', async () => {
     let tree;
     await act(async () => {
@@ -65,8 +68,13 @@ describe('test ScanSensorQR', () => {
       id: 1,
       name: 'ABC',
     };
-
-    mock.onPost(API.SUB_UNIT.SENSOR_SCAN(1)).reply(200, new_sensor);
+    const response = {
+      status: 200,
+      data: new_sensor,
+    };
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
 
     let tree;
     const body = { id: 1, imei: 'IMEI_X', name: 'New Chip' };
@@ -80,6 +88,7 @@ describe('test ScanSensorQR', () => {
       qrScan.props.onScan(JSON.stringify(body));
     });
     expect(qrScan.props.loading).toEqual(true);
+    expect(axios.post).toHaveBeenCalledWith(API.SUB_UNIT.SENSOR_SCAN(1), body);
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.ConnectingDevices, {
       new_sensor,
       station_id: 1,
@@ -93,7 +102,13 @@ describe('test ScanSensorQR', () => {
       id: 1,
       name: 'ABC',
     };
-    mock.onPost(API.SUB_UNIT.SENSOR_SCAN(1)).reply(200, new_chip);
+    const response = {
+      data: new_chip,
+    };
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
+
     let tree;
     const body = { id: 1, imei: 'IMEI_X', name: 'New Chip' };
     await act(async () => {
@@ -106,6 +121,7 @@ describe('test ScanSensorQR', () => {
       qrScan.props.onScan(JSON.stringify(body));
     });
     expect(qrScan.props.loading).toEqual(true);
-    expect(mockedGoBack).not.toHaveBeenCalled();
+    expect(axios.post).toHaveBeenCalledWith(API.SUB_UNIT.SENSOR_SCAN(1), body);
+    expect(mockedGoBack).toHaveBeenCalled();
   });
 });

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { create, act } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
+import axios from 'axios';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import ScriptDetail from '..';
@@ -17,7 +17,6 @@ import { TouchableOpacity } from 'react-native';
 import Routes from '../../../utils/Route';
 import WrapHeaderScrollable from '../../../commons/Sharing/WrapHeaderScrollable';
 import ItemAutomate from '../../../commons/Automate/ItemAutomate';
-import api from '../../../utils/Apis/axios';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -44,7 +43,7 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 describe('Test ScriptDetail', () => {
   let route;
@@ -52,6 +51,10 @@ describe('Test ScriptDetail', () => {
   let tree;
 
   beforeEach(() => {
+    axios.get.mockClear();
+    axios.patch.mockClear();
+    axios.delete.mockClear();
+    axios.post.mockClear();
     mockGoBack.mockClear();
     route = {
       params: {
@@ -110,10 +113,22 @@ describe('Test ScriptDetail', () => {
     await act(async () => {
       textInput.props.onChange('new_name');
     });
-    mock.onPatch(API.AUTOMATE.SCRIPT(1)).reply(200, { name: 'new_name' });
+
+    const response = {
+      status: 200,
+      data: {
+        name: 'new_name',
+      },
+    };
+    axios.patch.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
+    expect(axios.patch).toHaveBeenCalledWith(API.AUTOMATE.SCRIPT(1), {
+      name: 'new_name',
+    });
     expect(alertAction.props.visible).toBeFalsy();
   });
 
@@ -131,10 +146,15 @@ describe('Test ScriptDetail', () => {
       await menu.props.hideComplete();
     });
     expect(alertAction.props.visible).toBeTruthy();
-    mock.onDelete(API.AUTOMATE.SCRIPT(1)).reply(204);
+
+    const response = { status: 204 };
+    axios.delete.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
+    expect(axios.delete).toHaveBeenCalledWith(API.AUTOMATE.SCRIPT(1));
     expect(alertAction.props.visible).toBeFalsy();
     expect(mockGoBack).toHaveBeenCalled();
   });
@@ -147,30 +167,62 @@ describe('Test ScriptDetail', () => {
     const buttonStar = instance.find(
       (el) => el.props.testID === TESTID.HEADER_DEVICE_BUTTON_STAR
     );
-    mock.onPost(API.AUTOMATE.STAR_SCRIPT(1)).reply(200);
+
+    axios.post.mockImplementation(async () => {
+      return { status: 200 };
+    });
     await act(async () => {
       await buttonStar.props.onPress();
     });
-    mock.onPost(API.AUTOMATE.UNSTAR_SCRIPT(1)).reply(204);
+    expect(axios.post).toHaveBeenCalledWith(
+      API.AUTOMATE.STAR_SCRIPT(route.params.automate.id)
+    );
+
+    axios.post.mockClear();
+    axios.post.mockImplementation(async () => {
+      return { status: 204 };
+    });
     await act(async () => {
       await buttonStar.props.onPress();
     });
+    expect(axios.post).toHaveBeenCalledWith(
+      API.AUTOMATE.UNSTAR_SCRIPT(route.params.automate.id)
+    );
+
     const menu = instance.findByType(MenuActionMore);
     const addFavorite = menu.props.listMenuItem[1];
-    mock.onPost(API.AUTOMATE.STAR_SCRIPT(1)).reply(200);
+    axios.post.mockClear();
+    axios.post.mockImplementation(async () => {
+      return { status: 200 };
+    });
     await act(async () => {
       await menu.props.onItemClick(addFavorite);
     });
+    expect(axios.post).toHaveBeenCalledWith(
+      API.AUTOMATE.STAR_SCRIPT(route.params.automate.id)
+    );
+
     const removeFavorite = menu.props.listMenuItem[1];
-    mock.onPost(API.AUTOMATE.UNSTAR_SCRIPT(1)).reply(204);
+    axios.post.mockClear();
+    axios.post.mockImplementation(async () => {
+      return { status: 204 };
+    });
     await act(async () => {
       await menu.props.onItemClick(removeFavorite);
     });
-    expect(mockGoBack).not.toHaveBeenCalled();
+    expect(axios.post).toHaveBeenCalledWith(
+      API.AUTOMATE.UNSTAR_SCRIPT(route.params.automate.id)
+    );
   });
 
   test('test activate one tap', async () => {
-    mock.onGet(API.AUTOMATE.SCRIPT(1)).reply(200, data);
+    const response = {
+      status: 200,
+      data: data,
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(() => {
       tree = create(wrapComponent(route));
     });
@@ -180,15 +232,24 @@ describe('Test ScriptDetail', () => {
         el.props.testID === TESTID.BUTTON_ACTIVATE_ONE_TAP &&
         el.type === TouchableOpacity
     );
-    mock.onPost(API.AUTOMATE.ACTION_ONE_TAP(1)).reply(200);
+
+    axios.post.mockImplementation(async () => {
+      return { status: 200 };
+    });
     await act(async () => {
       await buttonActivate.props.onPress();
     });
-    expect(mockNavigate).not.toBeCalled();
+    expect(axios.post).toHaveBeenCalledWith(API.AUTOMATE.ACTION_ONE_TAP(1));
   });
 
   test('test press add action', async () => {
-    mock.onGet(API.AUTOMATE.SCRIPT(1)).reply(200, data);
+    const response = {
+      status: 200,
+      data: data,
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(() => {
       tree = create(wrapComponent(route));
     });
@@ -206,9 +267,8 @@ describe('Test ScriptDetail', () => {
       automateId: route.params.id,
       isCreateNewAction: true,
       scriptName: route.params.name,
-      title: AUTOMATE_SELECT.SELECT_DEVICE,
+      title: AUTOMATE_SELECT.SELECT_DEVICES,
       type: AUTOMATE_TYPE.ONE_TAP,
-      oldType: AUTOMATE_TYPE.ONE_TAP,
       automate: route.params.automate,
     });
   });
@@ -224,7 +284,16 @@ describe('Test ScriptDetail', () => {
     await act(async () => {
       await WrapHeaderScrollables[0].props.onGoBack();
     });
-    expect(mockNavigate).toBeCalled();
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.SelectSensorDevices, {
+      unit: route.params.unit,
+      automateId: route.params.id,
+      isCreateNewAction: true,
+      scriptName: route.params.name,
+      title: AUTOMATE_SELECT.SELECT_DEVICES,
+      type: AUTOMATE_TYPE.ONE_TAP,
+      automate: route.params.automate,
+    });
   });
 
   const _testGoToActivityLog = (automateType, activityLogType, isMultiUnit) => {

package/src/screens/ScriptDetail/index.js

@@ -179,10 +179,8 @@ const ScriptDetail = ({ route }) => {
   }, []);
 
   const getScriptDetail = useCallback(async () => {
-    const { success, data: automateData } = await axiosGet(
-      API.AUTOMATE.SCRIPT(id)
-    );
-    success && setData(automateData?.script_actions || []);
+    const { success, data } = await axiosGet(API.AUTOMATE.SCRIPT(id));
+    success && setData(data?.script_actions || []);
   }, [id]);
 
   const onPressEdit = useCallback(() => {
@@ -191,19 +189,18 @@ const ScriptDetail = ({ route }) => {
   }, [data]);
 
   const onPressAddAction = useCallback(() => {
-    const navParams = {
+    const params = {
       unit,
       scriptName,
       automateId: id,
       type,
-      oldType: type,
       isCreateNewAction: true,
-      title: AUTOMATE_SELECT.SELECT_DEVICE,
+      title: AUTOMATE_SELECT.SELECT_DEVICES,
       automate,
     };
     navigate(
       isMultiUnits ? Routes.SelectUnit : Routes.SelectSensorDevices,
-      navParams
+      params
     );
   }, [unit, scriptName, id, type, navigate, isMultiUnits, automate]);
 
@@ -361,21 +358,21 @@ const ScriptDetail = ({ route }) => {
       weekday_repeat,
     } = automate;
     if (type === AUTOMATE_TYPE.VALUE_CHANGE) {
-      let text;
+      let textCondition;
       if (condition === '>') {
-        text = 'higher_than';
+        textCondition = 'higher_than';
       } else if (condition === '<') {
-        text = 'lower_than';
+        textCondition = 'lower_than';
       } else if (condition === '=') {
-        text = 'equal';
+        textCondition = 'equal';
       }
-      return `${config_name} ${t(text)} ${value}`;
+      return `${config_name} ${t(textCondition)} ${value}`;
     } else if (type === AUTOMATE_TYPE.SCHEDULE) {
       const time =
-        time_repeat?.length >= 8
-          ? time_repeat.substring(0, time_repeat?.length - 3)
+        time_repeat.length >= 8
+          ? time_repeat.substring(0, time_repeat.length - 3)
           : time_repeat;
-      const date = date_repeat?.split('-').reverse().join('/');
+      const date = date_repeat.split('-').reverse().join('/');
       const weekday = {
         1: t('mon'),
         2: t('tue'),
@@ -392,9 +389,7 @@ const ScriptDetail = ({ route }) => {
         return `${t('every_day_at', { time })}`;
       } else if (repeat === REPEAT_OPTIONS.EVERYWEEK) {
         //sort 0 is last number, exp: [1,3,5,0]
-        const newWeekdayRepeat = weekday_repeat.map((item) =>
-          parseInt(item, 10)
-        );
+        const newWeekdayRepeat = weekday_repeat.map((item) => parseInt(item));
         const sortWeekday = newWeekdayRepeat.sort((a, b) => {
           if (a !== 0 && b === 0) {
             return -1;

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

@@ -2,18 +2,14 @@ import React, { useState } from 'react';
 import { TouchableOpacity } from 'react-native';
 import { useRoute } from '@react-navigation/native';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
-
+import axios from 'axios';
 import SelectUnit from '../';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import { TESTID } from '../../../configs/Constants';
 import Routes from '../../../utils/Route';
-import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
-
-const mock = new MockAdapter(api.axiosInstance);
 
+jest.mock('axios');
 const mockSetState = jest.fn();
 const mockDispatch = jest.fn();
 const mockGoBack = jest.fn();
@@ -51,6 +47,7 @@ describe('Test Select unit screen', () => {
   beforeEach(() => {
     mockSetState.mockClear();
     mockNavigate.mockClear();
+    axios.get.mockClear();
   });
 
   it('Test render', async () => {
@@ -75,7 +72,9 @@ describe('Test Select unit screen', () => {
         },
       ],
     };
-    mock.onGet(API.AUTOMATE.GET_ALL_UNITS()).reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     useState.mockImplementation((init) => [response.data, mockSetState]);
     await act(async () => {
       tree = await create(wrapComponent());
@@ -100,8 +99,12 @@ describe('Test Select unit screen', () => {
         isCreateNewAction: false,
       },
     });
-
-    mock.onGet(API.AUTOMATE.GET_ALL_UNITS()).reply(400);
+    const response = {
+      status: 400,
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
 
     await act(async () => {
       tree = await create(wrapComponent());
@@ -114,8 +117,8 @@ describe('Test Select unit screen', () => {
       await TouchableOpacities[1].props.onPress();
       await TouchableOpacities[2].props.onPress();
     });
+    expect(mockSetState).toBeCalledTimes(1);
   });
-
   it('Test form ScriptDetail onPressAddAction to Select-unit', async () => {
     useRoute.mockReturnValue({
       params: {
@@ -139,7 +142,9 @@ describe('Test Select unit screen', () => {
         },
       ],
     };
-    mock.onGet(API.AUTOMATE.GET_ALL_UNITS()).reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
 
     await act(async () => {
       tree = await create(wrapComponent());
@@ -147,6 +152,16 @@ describe('Test Select unit screen', () => {
 
     const instance = tree.root;
 
+    const TouchableOpacities = instance.findAll(
+      (el) =>
+        el.props.testID === TESTID.ITEM_UNIT && el.type === TouchableOpacity
+    );
+
+    expect(TouchableOpacities).toHaveLength(1);
+    await act(async () => {
+      await TouchableOpacities[0].props.onPress();
+    });
+
     const buttonContinue = instance.findAll(
       (el) =>
         el.props.testID === TESTID.BOTTOM_VIEW_MAIN &&
@@ -157,6 +172,34 @@ describe('Test Select unit screen', () => {
     await act(async () => {
       await buttonContinue[0].props.onPress();
     });
+    expect(mockNavigate).toBeCalledWith(Routes.SelectSensorDevices, {
+      automateId: 1,
+      isAutomateTab: undefined,
+      isCreateNewAction: true,
+      isMultiUnits: undefined,
+      routeName: undefined,
+      scriptName: '1',
+      selectedItem: [
+        {
+          icon: 'Simulator_Screen_Shot_-_iPhone_8_-_2021-09-21_at_09.16.58.png',
+          id: 178,
+          is_owner: true,
+          name: 'Unit 2',
+          number_sensor: 0,
+        },
+      ],
+      title: 'select_device',
+      type: 'value_change',
+      unit: [
+        {
+          icon: 'Simulator_Screen_Shot_-_iPhone_8_-_2021-09-21_at_09.16.58.png',
+          id: 178,
+          is_owner: true,
+          name: 'Unit 2',
+          number_sensor: 0,
+        },
+      ],
+    });
   });
 
   it('Test handleOnGoBackAndClose', async () => {
@@ -192,7 +235,7 @@ describe('Test Select unit screen', () => {
       isCreateNewAction: true,
       isMultiUnits: undefined,
       name: '1',
-      type: undefined,
+      type: 'value_change',
       unit: {
         id: 1,
       },

package/src/screens/SelectUnit/index.js

@@ -26,10 +26,9 @@ const SelectUnit = () => {
     scriptName,
     routeName,
     isCreateNewAction,
+    unit,
     title,
     automate,
-    oldType,
-    unit,
   } = params;
   const [data, setData] = useState([]);
   const [selectedItem, setSelectedItem] = useState(data[0]);
@@ -39,11 +38,9 @@ const SelectUnit = () => {
   };
 
   const getAllUnits = useCallback(async () => {
-    const { success, data: automateData } = await axiosGet(
-      API.AUTOMATE.GET_ALL_UNITS()
-    );
+    const { success, data } = await axiosGet(API.AUTOMATE.GET_ALL_UNITS());
     if (success) {
-      setData(automateData);
+      setData(data);
     }
   }, []);
 
@@ -52,7 +49,7 @@ const SelectUnit = () => {
       navigate(Routes.ScriptDetail, {
         id: automateId,
         name: scriptName,
-        type: oldType,
+        type: type,
         havePermission: true,
         unit,
         isMultiUnits,
@@ -80,7 +77,6 @@ const SelectUnit = () => {
         unit: selectedItem,
         automateId,
         scriptName,
-        oldType,
       }
     );
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -159,7 +155,6 @@ const SelectUnit = () => {
             keyExtractor={(item) => item.id}
             data={data}
             renderItem={renderItem}
-            scrollIndicatorInsets={{ right: 1 }}
           />
         </View>
       </WrapHeaderScrollable>