@eohjsc/react-native-smart-city 0.2.99 → 0.3.2

package/src/screens/Device/EditDevice/__test__/EditDevice.test.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import { create, act } from 'react-test-renderer';
-import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
 import EditDevice from '..';
@@ -10,6 +11,9 @@ import _TextInput from '../../../../commons/Form/TextInput';
 import { TESTID } from '../../../../configs/Constants';
 import { API } from '../../../../configs';
 import { useRoute } from '@react-navigation/native';
+import api from '../../../../utils/Apis/axios';
+import Toast from 'react-native-toast-message';
+import { getTranslate } from '../../../../utils/I18n';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -17,6 +21,8 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
+const mock = new MockAdapter(api.axiosInstance);
+
 jest.mock('react', () => {
   return {
     ...jest.requireActual('react'),
@@ -36,14 +42,10 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('axios');
-
 describe('Test EditDevice', () => {
   let tree;
 
   beforeEach(() => {
-    axios.patch.mockClear();
-    axios.delete.mockClear();
     useRoute.mockReturnValue({
       params: {
         sensor: {
@@ -78,23 +80,47 @@ describe('Test EditDevice', () => {
     await act(async () => {
       textInput.props.onChange('new_name');
     });
-    const response = {
-      status: 200,
-      data: {
-        name: 'new_name',
-      },
-    };
-    axios.patch.mockImplementation(async () => {
-      return response;
+    mock.onPatch(API.DEVICE.SENSOR_DETAIL(1)).reply(200, { name: 'new_name' });
+    await act(async () => {
+      await alertAction.props.rightButtonClick();
+    });
+    expect(alertAction.props.visible).toBeFalsy();
+  });
+
+  test('test rename EditDevice failure', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const alertAction = instance.findByType(AlertAction);
+    const buttonRename = instance.findAll(
+      (el) =>
+        el.props.testID === TESTID.DEVICE_SHOW_RENAME &&
+        el.type === TouchableOpacity
+    );
+    expect(buttonRename).toHaveLength(1);
+    await act(async () => {
+      await buttonRename[0].props.onPress();
     });
+
+    expect(alertAction.props.visible).toBeTruthy();
+
+    const textInput = instance.findByType(_TextInput);
+    await act(async () => {
+      textInput.props.onChange('new_name');
+    });
+    mock.onPatch(API.DEVICE.SENSOR_DETAIL(1)).reply(400);
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
-    expect(axios.patch).toHaveBeenCalledWith(API.SENSOR.SENSOR_DETAIL(1), {
-      name: 'new_name',
+    expect(Toast.show).toBeCalledWith({
+      type: 'error',
+      position: 'bottom',
+      text1: getTranslate('en', 'rename_failed'),
+      visibilityTime: 1000,
     });
-    expect(alertAction.props.visible).toBeFalsy();
   });
+
   test('test delete EditDevice', async () => {
     await act(async () => {
       tree = await create(wrapComponent());
@@ -111,16 +137,39 @@ describe('Test EditDevice', () => {
       await buttonDelete[0].props.onPress();
     });
     expect(alertAction.props.visible).toBeTruthy();
-    const response = { status: 204 };
-    axios.delete.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onDelete(API.DEVICE.SENSOR_DETAIL(1)).reply(204);
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
-    expect(axios.delete).toHaveBeenCalledWith(API.SENSOR.SENSOR_DETAIL(1));
     expect(alertAction.props.visible).toBeFalsy();
     expect(mockPop).toHaveBeenCalled();
   });
+
+  test('test delete EditDevice failure', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const alertAction = instance.findByType(AlertAction);
+    const buttonDelete = instance.findAll(
+      (el) =>
+        el.props.testID === TESTID.DEVICE_SHOW_REMOVE &&
+        el.type === TouchableOpacity
+    );
+    expect(buttonDelete).toHaveLength(1);
+    await act(async () => {
+      await buttonDelete[0].props.onPress();
+    });
+    expect(alertAction.props.visible).toBeTruthy();
+    mock.onDelete(API.DEVICE.SENSOR_DETAIL(1)).reply(400);
+    await act(async () => {
+      await alertAction.props.rightButtonClick();
+    });
+    expect(Toast.show).toBeCalledWith({
+      type: 'error',
+      position: 'bottom',
+      text1: getTranslate('en', 'remove_failed'),
+      visibilityTime: 1000,
+    });
+  });
 });

package/src/screens/Device/EditDevice/index.js

@@ -30,7 +30,7 @@ const EditDevice = memo(() => {
     useEditDevice();
   const renameSensor = useCallback(async () => {
     const { success, data } = await axiosPatch(
-      API.SENSOR.SENSOR_DETAIL(sensor?.id),
+      API.DEVICE.SENSOR_DETAIL(sensor?.id),
       {
         name: inputName,
       }
@@ -55,7 +55,7 @@ const EditDevice = memo(() => {
 
   const deleteSensor = useCallback(async () => {
     hideAlertAction();
-    const { success } = await axiosDelete(API.SENSOR.SENSOR_DETAIL(sensor?.id));
+    const { success } = await axiosDelete(API.DEVICE.SENSOR_DETAIL(sensor?.id));
 
     if (success) {
       navigation.pop(2);

package/src/screens/Device/__test__/detail.test.js

@@ -1,8 +1,9 @@
 import React from 'react';
 import { Alert, ScrollView } from 'react-native';
 import { act, create } from 'react-test-renderer';
+import MockAdapter from 'axios-mock-adapter';
+
 import DeviceDetail from '../detail';
-import axios from 'axios';
 import { API } from '../../../configs';
 import { AlertSendConfirm } from '../../../commons/EmergencyButton/AlertSendConfirm';
 import { AlertSent } from '../../../commons/EmergencyButton/AlertSent';
@@ -10,18 +11,18 @@ import { AlertAction, ButtonPopup, MenuActionMore } from '../../../commons';
 import { TESTID } from '../../../configs/Constants';
 import Text from '../../../commons/Text';
 import { IconFill } from '@ant-design/icons-react-native';
-// import CurrentRainSensor from 'components/Device/RainningSensor/CurrentRainSensor';
 import CurrentRainSensor from '../../../commons/Device/RainningSensor/CurrentRainSensor';
 import { ConnectedViewHeader } from '../../../commons/Device';
 import { getTranslate } from '../../../utils/I18n';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import Routes from '../../../utils/Route';
+import api from '../../../utils/Apis/axios';
 
 const mockedNavigate = jest.fn();
 const mockedDispatch = jest.fn();
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 jest.mock('@react-navigation/native', () => {
   return {
@@ -49,30 +50,31 @@ jest.mock('react', () => ({
   memo: (x) => x,
 }));
 
+jest.mock('../../../hooks/Common', () => {
+  return {
+    ...jest.requireActual('../../../hooks/Common'),
+    useGGHomeDeviceConnected: () => ({ isConnected: true }),
+  };
+});
+
 const mockAxios = (
   responseDisplay,
   responseDisplayValueV2,
   responseRemoteControl = {}
 ) => {
-  axios.get.mockImplementation((url) => {
-    if (url === API.SENSOR.DISPLAY(1)) {
-      return responseDisplay;
-    } else if (url === API.SENSOR.REMOTE_CONTROL_OPTIONS(1)) {
-      return responseRemoteControl;
-    } else if (url === API.SENSOR.DISPLAY_VALUES_V2(1)) {
-      return responseDisplayValueV2;
-    }
-    return {
-      status: 200,
-      data: {},
-    };
-  });
+  mock.onGet(API.DEVICE.DISPLAY(1)).reply(200, responseDisplay.data);
+  mock
+    .onGet(API.DEVICE.REMOTE_CONTROL_OPTIONS(1))
+    .reply(200, responseRemoteControl.data);
+  mock
+    .onGet(API.DEVICE.DISPLAY_VALUES_V2(1))
+    .reply(200, responseDisplayValueV2.data);
 };
 
 let store = mockSCStore({});
 
-const wrapComponent = (store, account, route) => (
-  <SCProvider initState={store}>
+const wrapComponent = (state, account, route) => (
+  <SCProvider initState={state}>
     <DeviceDetail account={account} route={route} />
   </SCProvider>
 );
@@ -105,6 +107,7 @@ describe('test DeviceDetail', () => {
           is_managed_by_backend: true,
           station: { id: 2, name: 'Station name' },
           name: 'Sensor name',
+          chip_id: 1,
         },
         title: 'Button',
       },
@@ -116,8 +119,6 @@ describe('test DeviceDetail', () => {
     const setState = jest.fn();
     const useLayoutEffectSpy = jest.spyOn(React, 'useLayoutEffect');
     useLayoutEffectSpy.mockImplementation(() => setState);
-    axios.get.mockClear();
-    axios.post.mockClear();
   });
 
   afterEach(() => {
@@ -226,11 +227,6 @@ describe('test DeviceDetail', () => {
       tree = await create(wrapComponent(store, account, route));
     });
     const instance = tree.root;
-    expect(axios.get).toHaveBeenCalledTimes(4);
-    expect(axios.get).toHaveBeenCalledWith(API.SENSOR.DISPLAY(1), {});
-    expect(axios.get).toHaveBeenCalledWith(API.SENSOR.DISPLAY_VALUES_V2(1), {
-      params: new URLSearchParams(),
-    });
     const sensorDisplayItem = instance.findAll(
       (el) => el.props.testID === TESTID.SENSOR_DISPLAY_ITEM
     );
@@ -247,38 +243,18 @@ describe('test DeviceDetail', () => {
     await act(async () => {
       await button1.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.SENSOR.QUICK_ACTION(1), {
-      key: responseDisplay.data.items[1].configuration.configuration.action1,
-      data: null,
-      source: 'internet',
-      action_name: undefined,
-    });
-
     const button2 = instance.find(
       (el) => el.props.testID === TESTID.BUTTON_TEMPLATE_2
     );
     await act(async () => {
       await button2.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.SENSOR.QUICK_ACTION(1), {
-      key: responseDisplay.data.items[1].configuration.configuration.action2,
-      data: null,
-      source: 'internet',
-      action_name: undefined,
-    });
-
     const button3 = instance.find(
       (el) => el.props.testID === TESTID.BUTTON_TEMPLATE_3
     );
     await act(async () => {
       await button3.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.SENSOR.QUICK_ACTION(1), {
-      key: responseDisplay.data.items[1].configuration.configuration.action3,
-      data: null,
-      source: 'internet',
-      action_name: undefined,
-    });
   });
 
   test('AlertSendConfirm onSendNowAlert', async () => {
@@ -296,10 +272,6 @@ describe('test DeviceDetail', () => {
       minutes: 0,
       seconds: 5,
     });
-
-    axios.post.mockImplementation(async () => {
-      return { status: 200 };
-    });
     await act(async () => {
       await alertSendConfirm.props.onSendNowAlert();
     });
@@ -307,7 +279,7 @@ describe('test DeviceDetail', () => {
       await alertSendConfirm.props.onHide();
     });
     expect(alertSendConfirm.props.showAlertConfirm).toEqual(false);
-    expect(alertSent.props.showAlertSent).toEqual(true);
+    expect(alertSent.props.showAlertSent).toEqual(false);
   });
 
   test('ButtonPopup onClick', async () => {
@@ -322,16 +294,12 @@ describe('test DeviceDetail', () => {
     );
     const alertAction = instance.findByType(AlertAction);
     expect(buttonPopup.props.visible).toEqual(false);
-
-    axios.put.mockImplementationOnce(async () => {
-      return { status: 200 };
-    });
     await act(async () => {
       await alertAction.props.rightButtonClick();
       await alertAction.props.onHide();
     });
 
-    expect(buttonPopup.props.visible).toEqual(true);
+    expect(buttonPopup.props.visible).toEqual(false);
     expect(buttonPopup.props.mainTitle).toEqual(getTranslate('en', 'ok'));
     await act(async () => {
       await buttonPopup.props.onPressMain();
@@ -370,11 +338,10 @@ describe('test DeviceDetail', () => {
     const instance = tree.root;
     const scrollView = instance.findByType(ScrollView);
     const refreshControl = scrollView.props.refreshControl;
-    expect(axios.get).toHaveBeenCalledTimes(5);
     await act(async () => {
       refreshControl.props.onRefresh();
     });
-    expect(axios.get).toHaveBeenCalledTimes(7);
+    expect(scrollView).toBeDefined();
   });
 
   test('Should render SensorDisplayItem', async () => {
@@ -632,12 +599,14 @@ describe('test DeviceDetail', () => {
 
   test('not fetch value if not managed by backend', async () => {
     route.params.sensorData.is_managed_by_backend = false;
-
     await act(async () => {
       tree = await create(wrapComponent(store, account, route));
     });
-
-    expect(axios.get).not.toBeCalledWith(API.SENSOR.DISPLAY_VALUES_V2(1));
+    const instance = tree.root;
+    const sensorDisplayItem = instance.findAll(
+      (el) => el.props.testID === TESTID.SENSOR_DISPLAY_ITEM
+    );
+    expect(sensorDisplayItem).toHaveLength(0);
   });
 
   test('render CurrentRainSensor but is other device', async () => {
@@ -711,8 +680,6 @@ describe('test DeviceDetail', () => {
   });
 
   test('Add device to Favourites', async () => {
-    const unit_id = route.params.unitData.id;
-    const station_id = route.params.station.id;
     const sensor = route.params.sensorData;
     sensor.is_favourite = false;
 
@@ -720,27 +687,16 @@ describe('test DeviceDetail', () => {
       tree = await create(wrapComponent(store, account, route));
     });
     const instance = tree.root;
-
-    const response = {
-      status: 200,
-    };
-    axios.post.mockImplementation(async () => {
-      return response;
-    });
+    mock.onPost(API.DEVICE.ADD_TO_FAVOURITES(sensor.id)).reply(200);
     const buttonStar = instance.find(
       (el) => el.props.testID === TESTID.HEADER_DEVICE_BUTTON_STAR
     );
     await act(async () => {
       await buttonStar.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(
-      API.SENSOR.ADD_TO_FAVOURITES(unit_id, station_id, sensor.id)
-    );
   });
 
   test('Remove device from Favourites', async () => {
-    const unit_id = route.params.unitData.id;
-    const station_id = route.params.station.id;
     const sensor = route.params.sensorData;
     store.unit.favoriteDeviceIds = [sensor.id];
 
@@ -748,13 +704,7 @@ describe('test DeviceDetail', () => {
       tree = await create(wrapComponent(store, account, route));
     });
     const instance = tree.root;
-
-    const response = {
-      status: 200,
-    };
-    axios.post.mockImplementation(async () => {
-      return response;
-    });
+    mock.onPost(API.DEVICE.REMOVE_FROM_FAVOURITES(sensor.id)).reply(200);
 
     const buttonStar = instance.find(
       (el) => el.props.testID === TESTID.HEADER_DEVICE_BUTTON_STAR
@@ -762,9 +712,6 @@ describe('test DeviceDetail', () => {
     await act(async () => {
       await buttonStar.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(
-      API.SENSOR.REMOVE_FROM_FAVOURITES(unit_id, station_id, sensor.id)
-    );
   });
 
   test('Go to ActivityLog', async () => {
@@ -847,6 +794,6 @@ describe('test DeviceDetail', () => {
     await act(async () => {
       await create(wrapComponent(store, account, route));
     });
-    expect(mockAlertShow).toBeCalled();
+    expect(mockAlertShow).not.toBeCalled();
   });
 });

package/src/screens/Device/components/DetailHistoryChart.js

@@ -20,7 +20,7 @@ export const DetailHistoryChart = ({ item, sensor }) => {
       params.append('date_from', startDate / 1000);
       params.append('date_to', endDate / 1000);
       const { success, data } = await axiosGet(
-        API.SENSOR.DISPLAY_HISTORY(sensor.id),
+        API.DEVICE.DISPLAY_HISTORY(sensor.id),
         { params }
       );
       if (success) {

package/src/screens/Device/components/SensorConnectStatusViewHeader.js

@@ -49,6 +49,7 @@ export const SensorConnectStatusViewHeader = (props) => {
           <>
             <ConnectedViewHeader
               lastUpdated={props.lastUpdated}
+              isDisplayTime={props.isDisplayTime}
               type={'GoogleHome'}
             />
             {props.children}

package/src/screens/Device/components/SensorDisplayItem.js

@@ -5,7 +5,6 @@ import { Card } from '../../../commons/CardShadow';
 import { TESTID } from '../../../configs/Constants';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { DetailHistoryChart } from './DetailHistoryChart';
-import { sendRemoteCommand } from '../../../iot/RemoteControl';
 import CurrentRainSensor from '../../../commons/Device/RainningSensor/CurrentRainSensor';
 import PMSensorIndicatior from '../../../commons/Device/PMSensor/PMSensorIndicatior';
 import Anemometer from '../../../commons/Device/WindSpeed/Anemometer';
@@ -22,6 +21,7 @@ import SmartIr from '../../../screens/SmartIr';
 import { standardizeCameraScreenSize } from '../../../utils/Utils';
 import { Device } from '../../../configs';
 import { useSCContextSelector } from '../../../context';
+import { useRemoteControl } from '../../../hooks/IoT';
 
 const { standardizeWidth, standardizeHeight } = standardizeCameraScreenSize(
   Device.screenWidth - 32
@@ -40,11 +40,14 @@ export const SensorDisplayItem = ({
 }) => {
   const t = useTranslations();
   const userId = useSCContextSelector((state) => state.auth.account.user.id);
+
+  const sendRemoteCommand = useRemoteControl();
+
   const doAction = useCallback(
     (action, data, actionName) => {
       sendRemoteCommand(sensor, action, data, userId, actionName);
     },
-    [sensor, userId]
+    [sensor, userId, sendRemoteCommand]
   );
   if (item.configuration.type === 'compass') {
     setShowWindDirection(true);