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

package/src/screens/AddNewAction/__test__/SelectAction.test.js

@@ -1,16 +1,18 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
+import axios from 'axios';
 
 import SelectAction from '../SelectAction';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import BottomButtonView from '../../../commons/BottomButtonView';
 import { TESTID } from '../../../configs/Constants';
-import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
+import ActionTemplate from '../../../commons/ActionTemplate';
+import NumberUpDownActionTemplate from '../../../commons/OneTapTemplate/NumberUpDownActionTemplate';
+import OptionsDropdownActionTemplate from '../../../commons/OneTapTemplate/OptionsDropdownActionTemplate';
+import StatesGridActionTemplate from '../../../commons/OneTapTemplate/StatesGridActionTemplate';
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 const mockedNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
@@ -47,21 +49,38 @@ describe('Test SelectAction', () => {
     },
   };
 
+  beforeEach(() => {
+    axios.get.mockClear();
+  });
+
   test('test onSave have automateId', async () => {
-    mock.onPost(API.AUTOMATE.ADD_SCRIPT_ACTION(1)).reply(200);
+    const response = {
+      status: 200,
+      success: true,
+    };
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
+
     const bottomButton = instance.findByType(BottomButtonView);
     await act(async () => {
       bottomButton.props.onPressMain();
     });
+    expect(axios.post).toHaveBeenCalled();
     expect(mockedNavigate).toHaveBeenCalled();
   });
 
   test('test onSave fail not permission', async () => {
-    mock.onPost(API.AUTOMATE.ADD_SCRIPT_ACTION(1)).reply(404);
+    const response = {
+      status: 404,
+    };
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
@@ -71,7 +90,7 @@ describe('Test SelectAction', () => {
     await act(async () => {
       bottomButton.props.onPressMain();
     });
-    expect(mockedNavigate).toHaveBeenCalled();
+    expect(axios.post).toHaveBeenCalled();
   });
 
   test('test fetchData', async () => {
@@ -84,11 +103,13 @@ describe('Test SelectAction', () => {
         { template: 'three_button_action_template' },
       ],
     };
-    mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
-    expect(mockedNavigate).toHaveBeenCalled();
+    expect(axios.get).toHaveBeenCalled();
   });
 
   test('test RenderActionItem', async () => {
@@ -165,7 +186,9 @@ describe('Test SelectAction', () => {
         },
       ],
     };
-    mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -173,6 +196,64 @@ describe('Test SelectAction', () => {
     const renderActionItem = instance.find(
       (el) => el.props.testID === TESTID.ACTION_ITEM
     );
+    const actionTemplate = instance.findByType(ActionTemplate);
+    const numberUpDownActionTemplate = instance.findByType(
+      NumberUpDownActionTemplate
+    );
+    const optionsDropdownActionTemplate = instance.findByType(
+      OptionsDropdownActionTemplate
+    );
+    const statesGridActionTemplate = instance.findByType(
+      StatesGridActionTemplate
+    );
+
     expect(renderActionItem.props.data.length).toBe(4);
+    expect(actionTemplate).toBeDefined();
+    expect(numberUpDownActionTemplate).toBeDefined();
+    expect(optionsDropdownActionTemplate).toBeDefined();
+    expect(statesGridActionTemplate).toBeDefined();
+  });
+
+  test('test onPress handleOnSelectAction', async () => {
+    const response = {
+      status: 200,
+      success: true,
+      data: [
+        {
+          title: '',
+          template: 'three_button_action_template',
+          configuration: {
+            action1: '94ae262d-46e3-42ff-9d10-516831ecc830',
+            action2: '94ae262d-46e3-42ff-9d10-516831ecc830',
+            action3: '94ae262d-46e3-42ff-9d10-516831ecc830',
+            icon1: 'up',
+            icon2: 'stop',
+            icon3: 'down',
+            text1: 'OPEN',
+            text2: 'STOP',
+            text3: 'CLOSE',
+            text_lock: 'Door lock',
+            is_display_lock: true,
+          },
+        },
+      ],
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
+    await act(async () => {
+      tree = await renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const actionTemplate = instance.findByType(ActionTemplate);
+    const bottomButton = instance.findByType(BottomButtonView);
+    act(() => {
+      actionTemplate.props.onSelectAction({
+        name: 'OPEN',
+        action: '94ae262d-46e3-42ff-9d10-516831ecc830',
+        template: 'three_button_action_template',
+      });
+    });
+    expect(bottomButton.props.typeMain).toEqual('primary');
   });
 });

package/src/screens/AddNewAction/__test__/SelectSensorDevices.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
+import axios from 'axios';
 
 import SelectSensorDevices from '../SelectSensorDevices';
 import { SCProvider } from '../../../context';
@@ -9,22 +9,18 @@ import Device from '../Device';
 import BottomButtonView from '../../../commons/BottomButtonView';
 import NavBar from '../../../commons/NavBar';
 import API from '../../../configs/API';
-import { AUTOMATE_SELECT, TESTID } from '../../../configs/Constants';
+import { TESTID } from '../../../configs/Constants';
 import { TouchableOpacity } from 'react-native';
 import Routes from '../../../utils/Route';
-import api from '../../../utils/Apis/axios';
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 const mockedNavigate = jest.fn();
-const mockedDispatch = jest.fn();
-
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
     useNavigation: () => ({
       navigate: mockedNavigate,
-      dispatch: mockedDispatch,
     }),
   };
 });
@@ -49,9 +45,6 @@ describe('Test SelectSensorDevices', () => {
       unit: { id: 1, name: 'Unit test' },
       automateId: 1,
       scriptName: 'scriptName test',
-      automate: {
-        sensor_id: 1,
-      },
     },
   };
   const response = {
@@ -70,21 +63,29 @@ describe('Test SelectSensorDevices', () => {
   };
 
   beforeEach(() => {
+    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 
   test('fetch Device success', async () => {
-    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
+
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const navBar = instance.findByType(NavBar);
+
+    expect(axios.get).toHaveBeenCalledWith(API.UNIT.DEVICE_CONTROL(1), {});
     expect(navBar.props.listStation).toHaveLength(1);
   });
 
   test('onPress continue', async () => {
-    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -98,7 +99,9 @@ describe('Test SelectSensorDevices', () => {
   });
 
   test('test onPressDevice', async () => {
-    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -110,6 +113,7 @@ describe('Test SelectSensorDevices', () => {
       device[0].props.onPress({ id: 1, name: 'sensor' });
     });
     expect(device[0].props.isSelectDevice).toEqual(true);
+
     act(() => {
       device[0].props.onPress({ id: 1, name: 'sensor' });
     });
@@ -117,12 +121,16 @@ describe('Test SelectSensorDevices', () => {
   });
 
   test('test onSnapItem', async () => {
-    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
+
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const navBar = instance.findByType(NavBar);
+
     act(() => {
       navBar.props.onSnapToItem({ id: 1, name: 'sensor' }, 0);
     });
@@ -130,7 +138,9 @@ describe('Test SelectSensorDevices', () => {
   });
 
   test('test onPressClose user already has an automateId', async () => {
-    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -144,6 +154,7 @@ describe('Test SelectSensorDevices', () => {
     await act(async () => {
       iconClose[0].props.onPress();
     });
+
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
       havePermission: true,
       id: 1,
@@ -155,29 +166,4 @@ describe('Test SelectSensorDevices', () => {
       unit: { id: 1, name: 'Unit test' },
     });
   });
-
-  test('test onPressClose user already has not an automateId', async () => {
-    mock.onGet(API.UNIT.DEVICE_SENSOR(1)).reply(200, response.data);
-    const new_route = {
-      ...route,
-      params: {
-        ...route.params,
-        automateId: null,
-        title: AUTOMATE_SELECT.SELECT_SENSOR,
-      },
-    };
-    await act(async () => {
-      tree = renderer.create(wrapComponent(new_route));
-    });
-    const instance = tree.root;
-    const iconClose = instance.findAll(
-      (el) =>
-        el.props.testID === TESTID.ICON_CLOSE && el.type === TouchableOpacity
-    );
-    expect(iconClose).toHaveLength(1);
-    await act(async () => {
-      iconClose[0].props.onPress();
-    });
-    expect(mockedDispatch).toBeCalled();
-  });
 });

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

@@ -69,13 +69,12 @@ describe('test AddNewAutoSmart', () => {
       automate: {},
       automateId: undefined,
       title: 'select_sensor',
-      oldType: 'value_change',
+      type: 'value_change',
       scriptName: undefined,
       unit: { id: 1 },
       isAutomateTab: undefined,
       isMultiUnits: undefined,
       routeName: 'SelectSensorDevices',
-      type: 'value_change',
     });
   });
 
@@ -103,7 +102,6 @@ describe('test AddNewAutoSmart', () => {
       automate: {},
       automateId: undefined,
       type: 'schedule',
-      oldType: 'value_change',
       routeName: 'SetSchedule',
       scriptName: undefined,
       unit: route.params.unit,

package/src/screens/AddNewAutoSmart/index.js

@@ -25,7 +25,6 @@ const AddNewAutoSmart = memo(({ route }) => {
     automate = {},
     scriptName,
   } = route.params;
-
   const typeAutoSmart = {
     [AUTOMATE_TYPE.AUTOMATE]: [
       {
@@ -97,7 +96,6 @@ const AddNewAutoSmart = memo(({ route }) => {
       routeName: dataAutomate?.route,
       automate,
       scriptName,
-      oldType: type,
     };
 
     if (
@@ -109,15 +107,14 @@ const AddNewAutoSmart = memo(({ route }) => {
       navigate(dataAutomate.route, params);
     }
   }, [
-    data,
+    navigate,
     selectedIndex,
+    data,
     unit,
     isAutomateTab,
     isMultiUnits,
     automate,
     scriptName,
-    type,
-    navigate,
   ]);
 
   const handleSelectIndex = (index) => {

package/src/screens/AddNewDevice/ConnectingDevices.js

@@ -12,12 +12,12 @@ import Routes from '../../utils/Route';
 const ConnectingDevices = memo(({ route }) => {
   const t = useTranslations();
   const { navigate } = useNavigation();
-  const { new_sensor } = route.params || {};
+  const { new_sensor } = route.params;
 
   useEffect(() => {
     const checkSensorConnected = setInterval(async () => {
       const { success } = await axiosGet(
-        API.DEVICE.CHECK_CONNECTION(new_sensor?.id),
+        API.SENSOR.CHECK_CONNECTION(new_sensor.id),
         {},
         true
       );
@@ -26,7 +26,7 @@ const ConnectingDevices = memo(({ route }) => {
       }
     }, 3000);
     return () => clearInterval(checkSensorConnected);
-  }, [navigate, new_sensor?.id, route.params]);
+  }, [navigate, new_sensor.id, route.params]);
 
   return (
     <View style={styles.wrap}>

package/src/screens/AddNewDevice/__test__/AddNewDevice.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 AddNewDevice from '../index';
 import GroupCheckBox from '../../../commons/GroupCheckBox';
@@ -11,8 +11,6 @@ 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({})}>
@@ -20,7 +18,7 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 jest.mock('react', () => {
   return { ...jest.requireActual('react'), memo: (x) => x };
@@ -44,6 +42,7 @@ describe('Test AddNewDevice', () => {
   let route;
 
   afterEach(() => {
+    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 
@@ -53,7 +52,6 @@ describe('Test AddNewDevice', () => {
         unit_id: 1,
       },
     };
-    mock.resetHistory();
   });
 
   const getText = (instance, id) => {
@@ -80,16 +78,23 @@ describe('Test AddNewDevice', () => {
   });
 
   test('fetchDetails success', async () => {
-    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(200, {
-      id: 1,
-      name: 'Unit name',
-      stations: [{ id: 2, name: 'Station name' }],
+    const response = {
+      status: 200,
+      data: {
+        id: 1,
+        name: 'Unit name',
+        stations: [{ id: 2, name: 'Station name' }],
+      },
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
     });
 
     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([
@@ -98,19 +103,21 @@ describe('Test AddNewDevice', () => {
   });
 
   test('fetchDetails fail', async () => {
-    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(400);
+    const response = {
+      data: {},
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
+
     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([
-      {
-        id: 2,
-        name: 'Station name',
-        title: 'Station name',
-      },
-    ]);
+    expect(groupCheckBox.props.data).toEqual([]);
   });
 
   test('ViewButtonBottom', async () => {
@@ -153,10 +160,16 @@ describe('Test AddNewDevice', () => {
   });
 
   test('ViewButtonBottom onRightClick with stationId', async () => {
-    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(200, {
-      id: 1,
-      name: 'Unit name',
-      stations: [{ id: 2, name: 'Station name' }],
+    const response = {
+      status: 200,
+      data: {
+        id: 1,
+        name: 'Unit name',
+        stations: [{ id: 2, name: 'Station name' }],
+      },
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
     });
 
     await act(async () => {
@@ -179,25 +192,4 @@ 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,5 +1,6 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
+import axios from 'axios';
 
 import ConnectDevices from '../ConnectDevices';
 import { TESTID } from '../../../configs/Constants';
@@ -10,6 +11,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 {
@@ -31,6 +34,7 @@ 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 MockAdapter from 'axios-mock-adapter';
+import axios from 'axios';
 
 import { API } from '../../../configs';
 import ConnectingDevices from '../ConnectingDevices';
@@ -9,9 +9,8 @@ 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';
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 const mockedNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
@@ -34,6 +33,7 @@ describe('Test ConnectingDevices', () => {
   let route;
 
   afterEach(() => {
+    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 
@@ -62,25 +62,16 @@ describe('Test ConnectingDevices', () => {
     );
   });
 
-  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.DEVICE.CHECK_CONNECTION(1)).reply(200);
+    const response = {
+      status: 200,
+      data: {},
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
+
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -88,6 +79,7 @@ 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 },
     });
@@ -95,7 +87,14 @@ describe('Test ConnectingDevices', () => {
 
   test('call setInterval api fail', async () => {
     jest.useFakeTimers();
-    mock.onGet(API.DEVICE.CHECK_CONNECTION(1)).reply(400);
+    const response = {
+      status: 400,
+      data: {},
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
+
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -103,7 +102,8 @@ describe('Test ConnectingDevices', () => {
       await jest.runOnlyPendingTimers();
     });
     expect(setInterval).toHaveBeenCalled();
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.ConnectDevices, {
+    expect(axios.get).toHaveBeenCalledWith(API.SENSOR.CHECK_CONNECTION(1), {});
+    expect(mockedNavigate).not.toHaveBeenCalledWith(Routes.ConnectDevices, {
       new_sensor: { id: 1 },
     });
   });

package/src/screens/AddNewDevice/hooks/ConnectDevices.js

@@ -23,7 +23,7 @@ const useConnectDevices = (new_sensor, station_id, unit_id) => {
   const updateSensorName = useCallback(
     async (name) => {
       const { success: updateSuccess } = await axiosPatch(
-        API.DEVICE.UPDATE_SENSOR(unit_id, station_id, new_sensor.id),
+        API.SENSOR.UPDATE_SENSOR(unit_id, station_id, new_sensor.id),
         {
           name,
         }

package/src/screens/AddNewDevice/index.js

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