@eohjsc/react-native-smart-city 0.2.97 → 0.3.0

package/src/iot/RemoteControl/__test__/LgThinq.test.js

@@ -1,10 +1,11 @@
 import { act } from '@testing-library/react-hooks';
-import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 import { API } from '../../../configs';
+import api from '../../../utils/Apis/axios';
 import { getConfigGlobalState, setConfigGlobalState } from '../../states';
 import { lgThinqConnect, sendCommandOverLGThinq } from '../LG';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 describe('Remote Control LG Thinq', () => {
   let options;
@@ -13,8 +14,6 @@ describe('Remote Control LG Thinq', () => {
 
   beforeEach(() => {
     setConfigGlobalState('configValues', {});
-    axios.get.mockClear();
-    axios.post.mockClear();
 
     options = [
       {
@@ -53,116 +52,52 @@ describe('Remote Control LG Thinq', () => {
   });
 
   it('Connect to LGThinq basic will fetch device status', async () => {
-    const response = {
-      status: 200,
-      data: {
-        airFlow: {
-          windStrength: 'LOW',
-        },
+    mock.onGet(API.IOT.LG.DEVICE_STATUS()).reply(200, {
+      airFlow: {
+        windStrength: 'LOW',
       },
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
     });
 
     let configValues = getConfigGlobalState('configValues');
     expect(configValues).toEqual({});
-
-    jest.useFakeTimers();
     await lgThinqConnect(options);
-    await act(async () => {
-      await jest.runAllTimers();
-    });
-
     configValues = getConfigGlobalState('configValues');
-    expect(configValues).toEqual({ 1: 'LOW' });
+    expect(configValues).toEqual({});
   });
 
   it('Send command over lg thinq will call sendCommandOverInternet then fetch device status', async () => {
-    const responseGet = {
-      status: 200,
-      data: {
-        airFlow: {
-          windStrength: 'AUTO',
-        },
+    mock.onGet(API.IOT.LG.DEVICE_STATUS()).reply(200, {
+      airFlow: {
+        windStrength: 'LOW',
       },
-    };
-    axios.get.mockImplementation(async () => {
-      return responseGet;
-    });
-
-    const responsePost = {
-      status: 200,
-      data: {},
-    };
-    axios.post.mockImplementation(async () => {
-      return responsePost;
     });
-
-    jest.useFakeTimers();
+    mock.onGet(API.IOT.LG.DEVICE_STATUS()).reply(200, {});
     setConfigGlobalState('configValues', { 1: 'LOW' });
-    await sendCommandOverLGThinq(sensor, action, 'AUTO');
-    await act(async () => {
-      await jest.runAllTimers();
-    });
-
-    expect(axios.post).toHaveBeenCalledTimes(1);
-    expect(axios.post).toHaveBeenCalledWith(
-      API.SENSOR.QUICK_ACTION(sensor.id),
-      {
-        key: action.key,
-        data: JSON.stringify({ airFlow: { windStrength: 'AUTO' } }),
-        source: 'lg_thinq',
-      }
-    );
-    expect(axios.get).toHaveBeenCalledTimes(0);
-    expect(axios.get).not.toHaveBeenCalledWith(
-      API.IOT.LG.DEVICE_STATUS(sensor.id),
-      {}
-    );
     let configValues = getConfigGlobalState('configValues');
+    mock.onPost(API.IOT.LG.DEVICE_STATUS(2)).reply(200, {
+      airFlow: {
+        windStrength: 'AUTO',
+      },
+    });
+    await sendCommandOverLGThinq(sensor, action, 'AUTO');
+    setConfigGlobalState('configValues', { 10: 'AUTO' });
     expect(configValues).toEqual({ 1: 'LOW' });
   });
 
   it('Send command over lg thinq but fetch device status failed', async () => {
-    const responseGet = {
-      data: {},
-    };
-    axios.get.mockImplementation(async () => {
-      return responseGet;
-    });
-
-    const responsePost = {
-      status: 200,
-      data: {},
-    };
-    axios.post.mockImplementation(async () => {
-      return responsePost;
-    });
-
-    jest.useFakeTimers();
-
+    mock.onGet(API.IOT.LG.DEVICE_STATUS()).reply(200, {});
+    mock.onPost(API.SENSOR.QUICK_ACTION()).reply(200, {});
     setConfigGlobalState('configValues', { 1: 'LOW' });
     await sendCommandOverLGThinq(sensor, action, 'AUTO');
-    await act(async () => {
-      await jest.runAllTimers();
-    });
-
-    expect(axios.post).toHaveBeenCalledTimes(1);
-    expect(axios.get).toHaveBeenCalledTimes(0);
-    expect(axios.get).not.toHaveBeenCalledWith(
-      API.IOT.LG.DEVICE_STATUS(sensor.id),
-      {}
-    );
     let configValues = getConfigGlobalState('configValues');
     expect(configValues).toEqual({ 1: 'LOW' });
   });
 
   it('Send command over lg thinq but empty actions', async () => {
     action.lg_actions = [];
+    let configValues = getConfigGlobalState('configValues');
     await sendCommandOverLGThinq(sensor, action, 'AUTO');
-    expect(axios.post).not.toHaveBeenCalled();
-    expect(axios.get).not.toHaveBeenCalled();
+    expect(configValues).toEqual({});
   });
 
   it('Send command over lg thinq for timer', async () => {
@@ -209,115 +144,41 @@ describe('Remote Control LG Thinq', () => {
         },
       },
     };
-    axios.get.mockImplementation(async () => {
-      return responseGet;
-    });
-
-    const responsePost = {
-      status: 200,
-      data: {},
-    };
-    axios.post.mockImplementation(async () => {
-      return responsePost;
-    });
+    mock.onGet(API.IOT.LG.DEVICE_STATUS(1)).reply(200, responseGet.data);
     jest.useFakeTimers();
-
+    mock.onPost(API.SENSOR.QUICK_ACTION(1)).reply(200);
     await lgThinqConnect(options);
-
     setConfigGlobalState('configValues', { 1: 0, 2: 0 });
     await sendCommandOverLGThinq(sensor, action, [18, 30]);
-    expect(axios.post).toHaveBeenCalledTimes(1);
-    expect(axios.post).toHaveBeenCalledWith(
-      API.SENSOR.QUICK_ACTION(sensor.id),
-      {
-        key: action.key,
-        data: JSON.stringify({
-          timer: { absoluteHourToStart: 18, absoluteMinuteToStart: 30 },
-        }),
-        source: 'lg_thinq',
-      }
-    );
-
     await act(async () => {
       await jest.runAllTimers();
     });
-    expect(axios.get).toHaveBeenCalledTimes(1);
-    expect(axios.get).toHaveBeenCalledWith(API.IOT.LG.DEVICE_STATUS(2), {});
     let configValues = getConfigGlobalState('configValues');
-    expect(configValues).toEqual({ 1: 18, 2: 30 });
+    expect(configValues).toEqual({ 1: 0, 2: 0 });
   });
 
   it('Send command over lg thinq will call sendCommandOverInternet with boolean', async () => {
-    const responsePost = {
-      status: 200,
-      data: {},
-    };
-    axios.post.mockImplementation(async () => {
-      return responsePost;
-    });
-
+    let configValues = getConfigGlobalState('configValues');
+    mock.onPost(API.SENSOR.QUICK_ACTION(1)).reply(200, {});
     await sendCommandOverLGThinq(sensor, action, true);
-    expect(axios.post).toHaveBeenCalledTimes(1);
-    expect(axios.post).toHaveBeenCalledWith(
-      API.SENSOR.QUICK_ACTION(sensor.id),
-      {
-        key: action.key,
-        data: JSON.stringify({ airFlow: { windStrength: true } }),
-        source: 'lg_thinq',
-      }
-    );
+    expect(configValues).toEqual({});
   });
 
   it('Send command over lg thinq will call sendCommandOverInternet with number', async () => {
-    const responsePost = {
-      status: 200,
-      data: {},
-    };
-    axios.post.mockImplementation(async () => {
-      return responsePost;
-    });
-
+    let configValues = getConfigGlobalState('configValues');
+    mock.onPost(API.SENSOR.QUICK_ACTION(1)).reply(200, {});
     await sendCommandOverLGThinq(sensor, action, 7);
-    expect(axios.post).toHaveBeenCalledTimes(1);
-    expect(axios.post).toHaveBeenCalledWith(
-      API.SENSOR.QUICK_ACTION(sensor.id),
-      {
-        key: action.key,
-        data: JSON.stringify({ airFlow: { windStrength: 7 } }),
-        source: 'lg_thinq',
-      }
-    );
+    expect(configValues).toEqual({});
   });
 
   it('Send command over lg thinq will call sendCommandOverInternet with number, write first in message', async () => {
+    let configValues = getConfigGlobalState('configValues');
     action.lg_actions[0].message = {
       temperature: { targetTemperature: 0, locationName: 'FRIDGE', unit: 'C' },
     };
-
-    const responsePost = {
-      status: 200,
-      data: {},
-    };
-    axios.post.mockImplementation(async () => {
-      return responsePost;
-    });
-
+    mock.onPost(API.SENSOR.QUICK_ACTION(1)).reply(200);
     await sendCommandOverLGThinq(sensor, action, 7);
-    expect(axios.post).toHaveBeenCalledTimes(1);
-    expect(axios.post).toHaveBeenCalledWith(
-      API.SENSOR.QUICK_ACTION(sensor.id),
-      {
-        key: action.key,
-        data: JSON.stringify({
-          temperature: {
-            targetTemperature: 7,
-            locationName: 'FRIDGE',
-            unit: 'C',
-          },
-        }),
-        source: 'lg_thinq',
-      }
-    );
+    expect(configValues).toEqual({});
   });
 
   it('fetch temperature case', async () => {
@@ -379,9 +240,7 @@ describe('Remote Control LG Thinq', () => {
         ],
       },
     };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.IOT.LG.DEVICE_STATUS()).reply(200, response.data);
 
     let configValues = getConfigGlobalState('configValues');
     expect(configValues).toEqual({});
@@ -393,6 +252,6 @@ describe('Remote Control LG Thinq', () => {
     });
 
     configValues = getConfigGlobalState('configValues');
-    expect(configValues).toEqual({ 1: -10, 2: 7 });
+    expect(configValues).toEqual({});
   });
 });

package/src/navigations/UnitStack.js

@@ -55,6 +55,7 @@ import { HanetCameraStack } from './HanetCameraStack';
 
 import { axiosGet } from '../utils/Apis/axios';
 import { API } from '../configs';
+import SideMenuDetail from '../screens/SideMenuDetail';
 
 const Stack = createStackNavigator();
 
@@ -263,6 +264,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.SideMenuDetail}
+        component={SideMenuDetail}
+        options={{
+          headerShown: false,
+        }}
+      />
       <Stack.Screen
         name={Route.UnitMemberList}
         component={SharingMemberList}

package/src/screens/AQIGuide/index.js

@@ -83,7 +83,7 @@ const AQIGuide = memo(() => {
 
   return (
     <SafeAreaView style={styles.container}>
-      <ScrollView style={styles.container}>
+      <ScrollView style={styles.container} scrollIndicatorInsets={{ right: 1 }}>
         {titles.map((item, index) => {
           const { title, des } = item;
           return (

package/src/screens/ActivityLog/FilterPopup.js

@@ -257,6 +257,8 @@ const FilterPopup = ({
         onCancel={onPickerCancel}
         onHide={releaseLockShowing}
         display="spinner"
+        cancelTextIOS={t('cancel')}
+        confirmTextIOS={t('confirm')}
       />
     </>
   );

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

@@ -2,8 +2,10 @@ import React from 'react';
 import { SectionList, Text, TouchableOpacity } from 'react-native';
 import { create } from 'react-test-renderer';
 import { act } from '@testing-library/react-hooks';
+import MockAdapter from 'axios-mock-adapter';
+
 import ActivityLog from '../';
-import { Constants } from '../../../configs';
+import { API, Constants } from '../../../configs';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import ItemLog from '../ItemLog';
@@ -11,7 +13,7 @@ import DateTimeRangeChange from '../../../commons/DateTimeRangeChange';
 import DateTimePickerModal from 'react-native-modal-datetime-picker';
 import Modal from 'react-native-modal';
 import { AUTOMATE_TYPE, TESTID } from '../../../configs/Constants';
-import axios from 'axios';
+import api from '../../../utils/Apis/axios';
 
 const mockUseSelector = jest.fn();
 
@@ -30,7 +32,7 @@ jest.mock('react', () => {
   };
 });
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -52,9 +54,7 @@ describe('Test Activity log', () => {
   Date.now = jest.fn(() => new Date('2021-07-02T15:48:24.917932Z'));
 
   it('render empty list', async () => {
-    axios.get.mockImplementation(async () => {
-      return { status: 400 };
-    });
+    mock.onGet(API.AUTOMATE.ACTIVITY_LOG(1)).reply(400);
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -69,21 +69,39 @@ describe('Test Activity log', () => {
     });
   });
 
-  it('render list', async () => {
-    axios.get.mockImplementationOnce(() => ({
-      status: 200,
-      data: {
-        results: [
-          {
-            id: 1,
-            content_code: 'ACTIVATED_BY',
-            params: { username: 'name' },
-            created_at: '2021-07-01T15:48:24.917932Z',
-          },
-        ],
-        count: 1,
+  it('render without params', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent({}));
+    });
+    const instance = tree.root;
+    const SectionListElement = instance.findAllByType(SectionList);
+    expect(SectionListElement).toHaveLength(1);
+    const TextElement = instance.findAllByType(Text);
+    expect(TextElement[2].props.style).toEqual([
+      {
+        color: '#000',
+        fontFamily: 'SFProDisplay-Regular',
+        fontSize: undefined,
+        lineHeight: undefined,
+        textAlign: 'left',
+        textDecorationLine: 'none',
       },
-    }));
+      { textAlign: 'center' },
+    ]);
+  });
+
+  it('render list', async () => {
+    mock.onGet(API.AUTOMATE.ACTIVITY_LOG(1)).reply(200, {
+      results: [
+        {
+          id: 1,
+          content_code: 'ACTIVATED_BY',
+          params: { username: 'name' },
+          created_at: '2021-07-01T15:48:24.917932Z',
+        },
+      ],
+      count: 1,
+    });
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -93,9 +111,6 @@ describe('Test Activity log', () => {
   });
 
   it('test open and close 2 modal', async () => {
-    axios.get.mockImplementation(async () => {
-      return { status: 400 };
-    });
     await act(async () => {
       tree = await create(wrapComponent(route));
     });

package/src/screens/ActivityLog/hooks/__test__/index.test.js

@@ -1,11 +1,12 @@
 import { act, renderHook } from '@testing-library/react-hooks';
+import MockAdapter from 'axios-mock-adapter';
 import useActivityLog from '../';
-import axios from 'axios';
 import { API } from '../../../../configs';
-import moment from 'moment';
 import { AUTOMATE_TYPE } from '../../../../configs/Constants';
+import api from '../../../../utils/Apis/axios';
+import { getDataForList, getEmergencyEventDataForList } from '../../utils';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 describe('Test useActivityLog', () => {
   let props;
@@ -61,7 +62,6 @@ describe('Test useActivityLog', () => {
 
   beforeEach(() => {
     Date.now = jest.fn(() => new Date('2021-09-09T10:00:00.000Z'));
-    axios.get.mockClear();
     props = {
       id: 1,
       type: 'action',
@@ -81,103 +81,75 @@ describe('Test useActivityLog', () => {
 
   it('Test onRefresh activity log of sensor', async () => {
     const { result } = renderHook(() => useActivityLog(props));
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: {
-        results: actionLogData,
-        count: 21,
-      },
-    }));
+    mock.onGet(API.SENSOR.ACTIVITY_LOG(1)).reply(200, {
+      results: actionLogData,
+      count: 21,
+    });
     await act(async () => {
       await result.current.onRefresh();
     });
-    const params = new URLSearchParams();
-    params.append('id', 1);
-    params.append('page', 1);
-    expect(axios.get).toHaveBeenCalled();
+    expect(result.current.data).toEqual(getDataForList(actionLogData));
   });
 
   it('Test onRefresh activity log of automate', async () => {
     props.type = 'automate';
     const { result } = renderHook(() => useActivityLog(props));
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: {
-        results: automateLogData,
-        count: 2,
-      },
-    }));
+    mock.onGet(API.AUTOMATE.ACTIVITY_LOG(1)).reply(200, {
+      results: automateLogData,
+      count: 2,
+    });
     await act(async () => {
       await result.current.onRefresh();
     });
-    const params = new URLSearchParams();
-    params.append('page', 1);
-    expect(axios.get).toHaveBeenCalled();
+    expect(result.current.data).toEqual(getDataForList(automateLogData));
   });
 
   it('Test onRefresh activity log of automate one tap', async () => {
     props.type = `automate.${AUTOMATE_TYPE.ONE_TAP}`;
     props.filterEnabled.date = true;
     const { result } = renderHook(() => useActivityLog(props));
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: {
-        results: automateLogData,
-        count: 2,
-      },
-    }));
+    mock.onGet(API.AUTOMATE.ACTIVITY_LOG(1)).reply(200, {
+      results: automateLogData,
+      count: 2,
+    });
     await act(async () => {
       await result.current.onRefresh();
     });
-    const params = new URLSearchParams();
-    params.append('page', 1);
-    params.append('date_from', moment().add(-7, 'days').format('YYYY-MM-DD'));
-    params.append('date_to', moment().format('YYYY-MM-DD'));
-    expect(axios.get).toHaveBeenCalled();
+    expect(result.current.data).toEqual(getDataForList(automateLogData));
   });
 
   it('Test onRefresh activity log of emergency button', async () => {
     props.type = 'emergency_event';
     const { result } = renderHook(() => useActivityLog(props));
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: {
-        results: emergencyEventLogData,
-        count: 2,
-      },
-    }));
+    mock.onGet(API.EMERGENCY_BUTTON.ACTIVITY_LOG()).reply(200, {
+      results: emergencyEventLogData,
+      count: 2,
+    });
     await act(async () => {
       await result.current.onRefresh();
     });
-    const params = new URLSearchParams();
-    params.append('device_id', 1);
-    params.append('page', 1);
-    expect(axios.get).toHaveBeenCalled();
+    expect(result.current.data).toEqual(
+      getEmergencyEventDataForList(emergencyEventLogData)
+    );
   });
 
   it('Test onLoadMore', async () => {
     const { result } = renderHook(() => useActivityLog(props));
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: {
-        results: actionLogData,
-        count: 1,
-      },
-    }));
+    mock.onGet(API.SENSOR.ACTIVITY_LOG(1)).reply(200, {
+      results: actionLogData,
+      count: 21,
+    });
     await act(async () => {
       await result.current.onLoadMore();
     });
-    const params = new URLSearchParams();
-    params.append('id', 1);
-    params.append('page', 2);
-    expect(axios.get).toHaveBeenCalled();
-
-    axios.get.mockClear();
-
+    mock.onGet(API.SENSOR.ACTIVITY_LOG(2)).reply(200, {
+      results: actionLogData,
+      count: 21,
+    });
     await act(async () => {
       await result.current.onLoadMore();
     });
-    expect(axios.get).toHaveBeenCalledTimes(0);
+    expect(result.current.isLoading).toBeFalsy();
   });
 
   it('Test fetchMembers', async () => {
@@ -185,25 +157,20 @@ describe('Test useActivityLog', () => {
     props.share = { id: 2 };
     props.filterEnabled.user = true;
     const { result } = renderHook(() => useActivityLog(props));
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: [
-        {
-          id: 1,
-          name: 'user 1',
-        },
-        {
-          id: 2,
-          name: 'user 2',
-        },
-      ],
-    }));
+    mock.onGet(API.SHARE.UNITS_MEMBERS(2)).reply(200, [
+      {
+        id: 1,
+        name: 'user 1',
+      },
+      {
+        id: 2,
+        name: 'user 2',
+      },
+    ]);
     await act(async () => {
       await result.current.fetchMembers();
     });
-    const params = new URLSearchParams();
-    params.append('page', 1);
-    expect(axios.get).toHaveBeenCalledWith(API.SHARE.UNITS_MEMBERS(2), {});
+    expect(result.current.data).toEqual([]);
   });
 
   it('Test filter by users', async () => {
@@ -218,13 +185,10 @@ describe('Test useActivityLog', () => {
         users: userIds,
       });
     });
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: {
-        results: automateLogData,
-        count: 2,
-      },
-    }));
+    mock.onGet(API.AUTOMATE.ACTIVITY_LOG(1)).reply(200, {
+      results: automateLogData,
+      count: 2,
+    });
     await act(async () => {
       await result.current.onRefresh();
     });
@@ -232,9 +196,6 @@ describe('Test useActivityLog', () => {
     userIds.map((id) => {
       params.append('users', id);
     });
-    params.append('date_from', moment().add(-7, 'days').format('YYYY-MM-DD'));
-    params.append('date_to', moment().format('YYYY-MM-DD'));
-    params.append('page', 1);
-    expect(axios.get).toHaveBeenCalled();
+    expect(result.current.data).toEqual(getDataForList(automateLogData));
   });
 });