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

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

@@ -1,11 +1,10 @@
 import { act } from '@testing-library/react-hooks';
-import MockAdapter from 'axios-mock-adapter';
+import axios from 'axios';
 import { API } from '../../../configs';
-import api from '../../../utils/Apis/axios';
 import { getConfigGlobalState, setConfigGlobalState } from '../../states';
 import { lgThinqConnect, sendCommandOverLGThinq } from '../LG';
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 describe('Remote Control LG Thinq', () => {
   let options;
@@ -14,6 +13,8 @@ describe('Remote Control LG Thinq', () => {
 
   beforeEach(() => {
     setConfigGlobalState('configValues', {});
+    axios.get.mockClear();
+    axios.post.mockClear();
 
     options = [
       {
@@ -52,52 +53,116 @@ describe('Remote Control LG Thinq', () => {
   });
 
   it('Connect to LGThinq basic will fetch device status', async () => {
-    mock.onGet(API.IOT.LG.DEVICE_STATUS()).reply(200, {
-      airFlow: {
-        windStrength: 'LOW',
+    const response = {
+      status: 200,
+      data: {
+        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({});
+    expect(configValues).toEqual({ 1: 'LOW' });
   });
 
   it('Send command over lg thinq will call sendCommandOverInternet then fetch device status', async () => {
-    mock.onGet(API.IOT.LG.DEVICE_STATUS()).reply(200, {
-      airFlow: {
-        windStrength: 'LOW',
+    const responseGet = {
+      status: 200,
+      data: {
+        airFlow: {
+          windStrength: 'AUTO',
+        },
       },
+    };
+    axios.get.mockImplementation(async () => {
+      return responseGet;
     });
-    mock.onGet(API.IOT.LG.DEVICE_STATUS()).reply(200, {});
-    setConfigGlobalState('configValues', { 1: 'LOW' });
-    let configValues = getConfigGlobalState('configValues');
-    mock.onPost(API.IOT.LG.DEVICE_STATUS(2)).reply(200, {
-      airFlow: {
-        windStrength: 'AUTO',
-      },
+
+    const responsePost = {
+      status: 200,
+      data: {},
+    };
+    axios.post.mockImplementation(async () => {
+      return responsePost;
     });
+
+    jest.useFakeTimers();
+    setConfigGlobalState('configValues', { 1: 'LOW' });
     await sendCommandOverLGThinq(sensor, action, 'AUTO');
-    setConfigGlobalState('configValues', { 10: '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');
     expect(configValues).toEqual({ 1: 'LOW' });
   });
 
   it('Send command over lg thinq but fetch device status failed', async () => {
-    mock.onGet(API.IOT.LG.DEVICE_STATUS()).reply(200, {});
-    mock.onPost(API.DEVICE.TRIGGER_ACTION()).reply(200, {});
+    const responseGet = {
+      data: {},
+    };
+    axios.get.mockImplementation(async () => {
+      return responseGet;
+    });
+
+    const responsePost = {
+      status: 200,
+      data: {},
+    };
+    axios.post.mockImplementation(async () => {
+      return responsePost;
+    });
+
+    jest.useFakeTimers();
+
     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(configValues).toEqual({});
+    expect(axios.post).not.toHaveBeenCalled();
+    expect(axios.get).not.toHaveBeenCalled();
   });
 
   it('Send command over lg thinq for timer', async () => {
@@ -144,41 +209,115 @@ describe('Remote Control LG Thinq', () => {
         },
       },
     };
-    mock.onGet(API.IOT.LG.DEVICE_STATUS(1)).reply(200, responseGet.data);
+    axios.get.mockImplementation(async () => {
+      return responseGet;
+    });
+
+    const responsePost = {
+      status: 200,
+      data: {},
+    };
+    axios.post.mockImplementation(async () => {
+      return responsePost;
+    });
     jest.useFakeTimers();
-    mock.onPost(API.DEVICE.TRIGGER_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: 0, 2: 0 });
+    expect(configValues).toEqual({ 1: 18, 2: 30 });
   });
 
   it('Send command over lg thinq will call sendCommandOverInternet with boolean', async () => {
-    let configValues = getConfigGlobalState('configValues');
-    mock.onPost(API.DEVICE.TRIGGER_ACTION(1)).reply(200, {});
+    const responsePost = {
+      status: 200,
+      data: {},
+    };
+    axios.post.mockImplementation(async () => {
+      return responsePost;
+    });
+
     await sendCommandOverLGThinq(sensor, action, true);
-    expect(configValues).toEqual({});
+    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',
+      }
+    );
   });
 
   it('Send command over lg thinq will call sendCommandOverInternet with number', async () => {
-    let configValues = getConfigGlobalState('configValues');
-    mock.onPost(API.DEVICE.TRIGGER_ACTION(1)).reply(200, {});
+    const responsePost = {
+      status: 200,
+      data: {},
+    };
+    axios.post.mockImplementation(async () => {
+      return responsePost;
+    });
+
     await sendCommandOverLGThinq(sensor, action, 7);
-    expect(configValues).toEqual({});
+    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',
+      }
+    );
   });
 
   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' },
     };
-    mock.onPost(API.DEVICE.TRIGGER_ACTION(1)).reply(200);
+
+    const responsePost = {
+      status: 200,
+      data: {},
+    };
+    axios.post.mockImplementation(async () => {
+      return responsePost;
+    });
+
     await sendCommandOverLGThinq(sensor, action, 7);
-    expect(configValues).toEqual({});
+    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',
+      }
+    );
   });
 
   it('fetch temperature case', async () => {
@@ -240,7 +379,9 @@ describe('Remote Control LG Thinq', () => {
         ],
       },
     };
-    mock.onGet(API.IOT.LG.DEVICE_STATUS()).reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
 
     let configValues = getConfigGlobalState('configValues');
     expect(configValues).toEqual({});
@@ -252,6 +393,6 @@ describe('Remote Control LG Thinq', () => {
     });
 
     configValues = getConfigGlobalState('configValues');
-    expect(configValues).toEqual({});
+    expect(configValues).toEqual({ 1: -10, 2: 7 });
   });
 });

package/src/iot/RemoteControl/index.js

@@ -1,55 +1,55 @@
-// import {
-//   SEND_COMMAND_OVER_BLUETOOTH_FAIL,
-//   sendCommandOverBluetooth,
-// } from './Bluetooth';
-// import { sendCommandOverInternet } from './Internet';
-// import { sendCommandOverGoogleHome } from './GoogleHome';
-// import { ToastBottomHelper } from '../../utils/Utils';
-// import t from '../../hooks/Common/useTranslations';
-// import { sendCommandOverLGThinq } from './LG';
+import {
+  SEND_COMMAND_OVER_BLUETOOTH_FAIL,
+  sendCommandOverBluetooth,
+} from './Bluetooth';
+import { sendCommandOverInternet } from './Internet';
+import { sendCommandOverGoogleHome } from './GoogleHome';
+import { ToastBottomHelper } from '../../utils/Utils';
+import t from '../../hooks/Common/useTranslations';
+import { sendCommandOverLGThinq } from './LG';
 
-// export const sendRemoteCommand = async (
-//   sensor,
-//   action,
-//   data,
-//   userId = null,
-//   actionName
-// ) => {
-//   // No action, raise not authorized
-//   let result = false;
-//   if (!action) {
-//     ToastBottomHelper.error(
-//       t('your_account_has_not_been_authorized_to_control')
-//     );
-//     return result;
-//   }
-//   if (action.command_prefer_over_bluetooth) {
-//     try {
-//       result = await sendCommandOverBluetooth(sensor, action, data, userId);
-//     } catch (err) {
-//       if (err === SEND_COMMAND_OVER_BLUETOOTH_FAIL) {
-//         result = await sendCommandOverInternet(
-//           sensor,
-//           action,
-//           data,
-//           'bluetooth',
-//           actionName
-//         );
-//       } else {
-//         throw err;
-//       }
-//     }
-//   }
-//   if (action.command_prefer_over_internet) {
-//     result = await sendCommandOverInternet(sensor, action, data, 'internet');
-//   }
+export const sendRemoteCommand = async (
+  sensor,
+  action,
+  data,
+  userId = null,
+  actionName
+) => {
+  // No action, raise not authorized
+  let result = false;
+  if (!action) {
+    ToastBottomHelper.error(
+      t('your_account_has_not_been_authorized_to_control')
+    );
+    return result;
+  }
+  if (action.command_prefer_over_bluetooth) {
+    try {
+      result = await sendCommandOverBluetooth(sensor, action, data, userId);
+    } catch (err) {
+      if (err === SEND_COMMAND_OVER_BLUETOOTH_FAIL) {
+        result = await sendCommandOverInternet(
+          sensor,
+          action,
+          data,
+          'bluetooth',
+          actionName
+        );
+      } else {
+        throw err;
+      }
+    }
+  }
+  if (action.command_prefer_over_internet) {
+    result = await sendCommandOverInternet(sensor, action, data, 'internet');
+  }
 
-//   if (action.command_prefer_over_googlehome) {
-//     result = await sendCommandOverGoogleHome(sensor, action, data);
-//   }
+  if (action.command_prefer_over_googlehome) {
+    result = await sendCommandOverGoogleHome(sensor, action, data);
+  }
 
-//   if (action.command_prefer_over_lg) {
-//     result = await sendCommandOverLGThinq(sensor, action, data);
-//   }
-//   return result;
-// };
+  if (action.command_prefer_over_lg) {
+    result = await sendCommandOverLGThinq(sensor, action, data);
+  }
+  return result;
+};

package/src/navigations/UnitStack.js

@@ -1,5 +1,5 @@
 import React, { memo, useContext, useEffect } from 'react';
-import { View } from 'react-native';
+import { View, StyleSheet } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { createStackNavigator } from '@react-navigation/stack';
 import { BleManager } from 'react-native-ble-plx';
@@ -52,10 +52,9 @@ import ConfirmUnitDeletion from '../screens/ConfirmUnitDeletion';
 import InfoMemberUnit from '../screens/Sharing/InfoMemberUnit';
 import EnterPassword from '../screens/EnterPassword';
 import { HanetCameraStack } from './HanetCameraStack';
+
 import { axiosGet } from '../utils/Apis/axios';
 import { API } from '../configs';
-import SideMenuDetail from '../screens/SideMenuDetail';
-import { styles } from './UnitStackStyles';
 
 const Stack = createStackNavigator();
 
@@ -173,9 +172,12 @@ export const UnitStack = memo((props) => {
         component={ChooseLocation}
         options={{
           headerShown: true,
+          headerTitleStyle: {
+            ...styles.headerLocation,
+          },
           headerTitle: () => (
             <View style={styles.headerLocation}>
-              <Text color={Colors.Gray9} style={styles.headerTitle} bold>
+              <Text type="H3" color={Colors.Gray9} bold>
                 {t('choose_on_map')}
               </Text>
 
@@ -261,13 +263,6 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
-      <Stack.Screen
-        name={Route.SideMenuDetail}
-        component={SideMenuDetail}
-        options={{
-          headerShown: false,
-        }}
-      />
       <Stack.Screen
         name={Route.UnitMemberList}
         component={SharingMemberList}
@@ -403,3 +398,17 @@ export const UnitStack = memo((props) => {
     </Stack.Navigator>
   );
 });
+
+const styles = StyleSheet.create({
+  icLeft: {
+    marginLeft: Device.isIOS ? 8 : 0,
+  },
+  headerLocation: {
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  headerContent: {
+    textAlign: 'center',
+    paddingBottom: 8,
+  },
+});

package/src/screens/AQIGuide/index.js

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

package/src/screens/ActivityLog/FilterPopup.js

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

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

@@ -2,10 +2,8 @@ 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 { API, Constants } from '../../../configs';
+import { Constants } from '../../../configs';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import ItemLog from '../ItemLog';
@@ -13,7 +11,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 api from '../../../utils/Apis/axios';
+import axios from 'axios';
 
 const mockUseSelector = jest.fn();
 
@@ -32,7 +30,7 @@ jest.mock('react', () => {
   };
 });
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -54,7 +52,9 @@ describe('Test Activity log', () => {
   Date.now = jest.fn(() => new Date('2021-07-02T15:48:24.917932Z'));
 
   it('render empty list', async () => {
-    mock.onGet(API.AUTOMATE.ACTIVITY_LOG(1)).reply(400);
+    axios.get.mockImplementation(async () => {
+      return { status: 400 };
+    });
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -69,39 +69,21 @@ describe('Test Activity log', () => {
     });
   });
 
-  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,
-    });
+    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,
+      },
+    }));
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -111,6 +93,9 @@ 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));
     });