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

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

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

@@ -1,49 +1,43 @@
-import React, { useState } from 'react';
+import React 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 mockNavigate = jest.fn();
-const mockGoBack = jest.fn();
+const mockedNavigate = jest.fn();
+
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
     useNavigation: () => ({
-      navigate: mockNavigate,
-      goBack: mockGoBack,
+      goBack: mockedNavigate,
     }),
   };
 });
 
-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: {
@@ -54,36 +48,14 @@ 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 () => {
-      touchableOpacity.props.onPress();
-    });
-    await act(async () => {
-      textInput.props.onChange();
+      textInput.props.onChange('new_name');
     });
-    mock.onDelete(API.UNIT.MANAGE_UNIT(1)).reply(204);
   });
 });

package/src/screens/ConfirmUnitDeletion/index.js

@@ -12,7 +12,6 @@ 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();
@@ -56,12 +55,7 @@ const ConfirmUnitDeletion = ({ route }) => {
         textInputStyle={styles.textInput}
       />
       <View style={styles.buttonWrap}>
-        <Button
-          type="auth"
-          title={t('done')}
-          onPress={onSendPress}
-          testID={TESTID.CONFIRM_UNIT_DELETION_BUTTON}
-        />
+        <Button type="auth" title={t('done')} onPress={onSendPress} />
       </View>
     </WrapHeaderScrollable>
   );

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

@@ -1,8 +1,7 @@
 import React from 'react';
 import { TouchableOpacity } from 'react-native';
 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 EditDevice from '..';
@@ -11,9 +10,6 @@ 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({})}>
@@ -21,8 +17,6 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-const mock = new MockAdapter(api.axiosInstance);
-
 jest.mock('react', () => {
   return {
     ...jest.requireActual('react'),
@@ -42,10 +36,14 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
+jest.mock('axios');
+
 describe('Test EditDevice', () => {
   let tree;
 
   beforeEach(() => {
+    axios.patch.mockClear();
+    axios.delete.mockClear();
     useRoute.mockReturnValue({
       params: {
         sensor: {
@@ -80,47 +78,23 @@ describe('Test EditDevice', () => {
     await act(async () => {
       textInput.props.onChange('new_name');
     });
-    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');
+    const response = {
+      status: 200,
+      data: {
+        name: 'new_name',
+      },
+    };
+    axios.patch.mockImplementation(async () => {
+      return response;
     });
-    mock.onPatch(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', 'rename_failed'),
-      visibilityTime: 1000,
+    expect(axios.patch).toHaveBeenCalledWith(API.SENSOR.SENSOR_DETAIL(1), {
+      name: 'new_name',
     });
+    expect(alertAction.props.visible).toBeFalsy();
   });
-
   test('test delete EditDevice', async () => {
     await act(async () => {
       tree = await create(wrapComponent());
@@ -137,39 +111,16 @@ describe('Test EditDevice', () => {
       await buttonDelete[0].props.onPress();
     });
     expect(alertAction.props.visible).toBeTruthy();
-    mock.onDelete(API.DEVICE.SENSOR_DETAIL(1)).reply(204);
-    await act(async () => {
-      await alertAction.props.rightButtonClick();
+    const response = { status: 204 };
+    axios.delete.mockImplementation(async () => {
+      return response;
     });
-    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,
-    });
+    expect(axios.delete).toHaveBeenCalledWith(API.SENSOR.SENSOR_DETAIL(1));
+    expect(alertAction.props.visible).toBeFalsy();
+    expect(mockPop).toHaveBeenCalled();
   });
 });

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.DEVICE.SENSOR_DETAIL(sensor?.id),
+      API.SENSOR.SENSOR_DETAIL(sensor?.id),
       {
         name: inputName,
       }
@@ -55,7 +55,7 @@ const EditDevice = memo(() => {
 
   const deleteSensor = useCallback(async () => {
     hideAlertAction();
-    const { success } = await axiosDelete(API.DEVICE.SENSOR_DETAIL(sensor?.id));
+    const { success } = await axiosDelete(API.SENSOR.SENSOR_DETAIL(sensor?.id));
 
     if (success) {
       navigation.pop(2);
@@ -104,22 +104,20 @@ const EditDevice = memo(() => {
             />
           </View>
         </TouchableOpacity>
-        {!stateAlertAction.visible && (
-          <TouchableOpacity
-            style={styles.removeButton}
-            onPress={onShowDelete(sensor?.name)}
-            testID={TESTID.DEVICE_SHOW_REMOVE}
+        <TouchableOpacity
+          style={styles.removeButton}
+          onPress={onShowDelete(sensor?.name)}
+          testID={TESTID.DEVICE_SHOW_REMOVE}
+        >
+          <Text
+            type={'H4'}
+            semibold
+            color={Colors.Red}
+            style={styles.removeBorderBottom}
           >
-            <Text
-              type={'H4'}
-              semibold
-              color={Colors.Red}
-              style={styles.removeBorderBottom}
-            >
-              {t('remove_device')}
-            </Text>
-          </TouchableOpacity>
-        )}
+            {t('remove_device')}
+          </Text>
+        </TouchableOpacity>
       </View>
       <AlertAction
         visible={stateAlertAction.visible}

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

@@ -1,9 +1,8 @@
 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';
@@ -11,18 +10,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();
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 jest.mock('@react-navigation/native', () => {
   return {
@@ -50,31 +49,30 @@ jest.mock('react', () => ({
   memo: (x) => x,
 }));
 
-jest.mock('../../../hooks/Common', () => {
-  return {
-    ...jest.requireActual('../../../hooks/Common'),
-    useGGHomeDeviceConnected: () => ({ isConnected: true }),
-  };
-});
-
 const mockAxios = (
   responseDisplay,
   responseDisplayValueV2,
   responseRemoteControl = {}
 ) => {
-  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);
+  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: {},
+    };
+  });
 };
 
 let store = mockSCStore({});
 
-const wrapComponent = (state, account, route) => (
-  <SCProvider initState={state}>
+const wrapComponent = (store, account, route) => (
+  <SCProvider initState={store}>
     <DeviceDetail account={account} route={route} />
   </SCProvider>
 );
@@ -107,7 +105,6 @@ describe('test DeviceDetail', () => {
           is_managed_by_backend: true,
           station: { id: 2, name: 'Station name' },
           name: 'Sensor name',
-          chip_id: 1,
         },
         title: 'Button',
       },
@@ -119,6 +116,8 @@ describe('test DeviceDetail', () => {
     const setState = jest.fn();
     const useLayoutEffectSpy = jest.spyOn(React, 'useLayoutEffect');
     useLayoutEffectSpy.mockImplementation(() => setState);
+    axios.get.mockClear();
+    axios.post.mockClear();
   });
 
   afterEach(() => {
@@ -193,7 +192,6 @@ describe('test DeviceDetail', () => {
         type: 'action',
       },
     ],
-    side_menu_items: [{ id: 1, order: 1, name: 'Setup generate passcode' }],
   };
   test('render DeviceDetail render SensorDisplayItem', async () => {
     const responseDisplay = {
@@ -227,6 +225,12 @@ 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.REMOTE_CONTROL_OPTIONS(1),
+      {}
+    );
     const sensorDisplayItem = instance.findAll(
       (el) => el.props.testID === TESTID.SENSOR_DISPLAY_ITEM
     );
@@ -243,18 +247,38 @@ 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 () => {
@@ -272,6 +296,10 @@ describe('test DeviceDetail', () => {
       minutes: 0,
       seconds: 5,
     });
+
+    axios.post.mockImplementation(async () => {
+      return { status: 200 };
+    });
     await act(async () => {
       await alertSendConfirm.props.onSendNowAlert();
     });
@@ -279,7 +307,7 @@ describe('test DeviceDetail', () => {
       await alertSendConfirm.props.onHide();
     });
     expect(alertSendConfirm.props.showAlertConfirm).toEqual(false);
-    expect(alertSent.props.showAlertSent).toEqual(false);
+    expect(alertSent.props.showAlertSent).toEqual(true);
   });
 
   test('ButtonPopup onClick', async () => {
@@ -294,12 +322,16 @@ 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(false);
+    expect(buttonPopup.props.visible).toEqual(true);
     expect(buttonPopup.props.mainTitle).toEqual(getTranslate('en', 'ok'));
     await act(async () => {
       await buttonPopup.props.onPressMain();
@@ -338,10 +370,11 @@ 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(scrollView).toBeDefined();
+    expect(axios.get).toHaveBeenCalledTimes(7);
   });
 
   test('Should render SensorDisplayItem', async () => {
@@ -599,14 +632,12 @@ 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));
     });
-    const instance = tree.root;
-    const sensorDisplayItem = instance.findAll(
-      (el) => el.props.testID === TESTID.SENSOR_DISPLAY_ITEM
-    );
-    expect(sensorDisplayItem).toHaveLength(0);
+
+    expect(axios.get).not.toBeCalledWith(API.SENSOR.DISPLAY_VALUES_V2(1));
   });
 
   test('render CurrentRainSensor but is other device', async () => {
@@ -680,6 +711,8 @@ 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;
 
@@ -687,16 +720,27 @@ describe('test DeviceDetail', () => {
       tree = await create(wrapComponent(store, account, route));
     });
     const instance = tree.root;
-    mock.onPost(API.DEVICE.ADD_TO_FAVOURITES(sensor.id)).reply(200);
+
+    const response = {
+      status: 200,
+    };
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
     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];
 
@@ -704,7 +748,13 @@ describe('test DeviceDetail', () => {
       tree = await create(wrapComponent(store, account, route));
     });
     const instance = tree.root;
-    mock.onPost(API.DEVICE.REMOVE_FROM_FAVOURITES(sensor.id)).reply(200);
+
+    const response = {
+      status: 200,
+    };
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
 
     const buttonStar = instance.find(
       (el) => el.props.testID === TESTID.HEADER_DEVICE_BUTTON_STAR
@@ -712,6 +762,9 @@ 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 () => {
@@ -794,6 +847,6 @@ describe('test DeviceDetail', () => {
     await act(async () => {
       await create(wrapComponent(store, account, route));
     });
-    expect(mockAlertShow).not.toBeCalled();
+    expect(mockAlertShow).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.DEVICE.DISPLAY_HISTORY(sensor.id),
+        API.SENSOR.DISPLAY_HISTORY(sensor.id),
         { params }
       );
       if (success) {

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

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