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

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

@@ -1,11 +1,10 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
-import { RefreshControl } from 'react-native';
-
 import Routes from '../../../utils/Route';
 import UnitSummary from '..';
+import axios from 'axios';
 import { API } from '../../../configs';
+import { RefreshControl } from 'react-native';
 import { TESTID } from '../../../configs/Constants';
 import { TouchableOpacity } from 'react-native';
 import AirQuality from '../../../commons/UnitSummary/AirQuality';
@@ -15,12 +14,10 @@ import RunningDevices from '../components/RunningDevices';
 import Temperature from '../components/Temperature';
 import UvIndex from '../components/UvIndex';
 import WaterQuality from '../components/WaterQuality';
-import { useReceiveNotifications } from '../../../hooks';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import api from '../../../utils/Apis/axios';
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 const mockedNavigate = jest.fn();
 
@@ -33,19 +30,6 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('react-native-onesignal', () => {
-  return {
-    setNotificationWillShowInForegroundHandler: jest.fn(),
-  };
-});
-
-jest.mock('../../../hooks', () => {
-  return {
-    ...jest.requireActual('../../../hooks'),
-    useReceiveNotifications: jest.fn(() => ({ dataNotification: null })),
-  };
-});
-
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <UnitSummary route={route} />
@@ -56,15 +40,12 @@ describe('Test UnitSummary', () => {
   let route;
 
   beforeEach(() => {
-    mock.resetHistory();
     Date.now = jest.fn(() => new Date('2021-01-24T12:00:00.000Z'));
     route = {
       params: {
-        unitId: 1,
         unitData: {
           id: 1,
         },
-        summaryId: 1,
         summaryData: {
           id: 1,
           name: '',
@@ -76,7 +57,6 @@ describe('Test UnitSummary', () => {
   let tree;
 
   test('onRefresh', async () => {
-    mock.onGet(API.UNIT.UNIT_SUMMARY_DETAIL(1, 1)).reply(200);
     act(() => {
       tree = create(wrapComponent(route));
     });
@@ -85,94 +65,53 @@ describe('Test UnitSummary', () => {
     act(() => {
       refreshControl.props.onRefresh();
     });
-    expect(refreshControl).toBeDefined();
+    expect(axios.get).toHaveBeenCalled();
+    expect(axios.get).toHaveBeenCalledWith(
+      API.UNIT.UNIT_SUMMARY_DETAIL(1, 1),
+      {}
+    );
   });
 
   test('render fetchSummaryDetail failed', async () => {
-    mock.onGet(API.UNIT.UNIT_SUMMARY_DETAIL(1, 1)).reply(200, {});
-    act(() => {
-      tree = create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const refreshControl = instance.findByType(RefreshControl);
-    expect(refreshControl).toBeDefined();
-  });
-
-  test('render fetchSummaryDetail success', async () => {
-    jest.useFakeTimers();
-    mock.onGet(API.UNIT.UNIT_SUMMARY_DETAIL(1, 1)).reply(200);
-    act(() => {
-      tree = create(wrapComponent(route));
-    });
-    act(() => {
-      jest.runOnlyPendingTimers();
-    });
-    const instance = tree.root;
-    const refreshControl = instance.findByType(RefreshControl);
-    expect(refreshControl).toBeDefined();
-  });
-
-  test('render fetchUnitDetail success', async () => {
-    route = {
-      params: {
-        unitId: 1,
-        unitData: null,
-        summaryData: {
-          id: 1,
-          name: '',
-          screen: Routes.AirQuality,
-        },
+    const response = {
+      status: 400,
+      data: {
+        data: {},
       },
     };
-    jest.useFakeTimers();
-    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(200, {});
-    act(() => {
-      tree = create(wrapComponent(route));
-    });
-    act(() => {
-      jest.runOnlyPendingTimers();
-    });
-    const instance = tree.root;
-    const refreshControl = instance.findByType(RefreshControl);
-    expect(refreshControl).toBeDefined();
-  });
+    axios.get.mockImplementation(() => Promise.resolve(response));
 
-  test('test receive notification with summary_id then reload data', async () => {
-    jest.useFakeTimers();
-    mock.onGet(API.UNIT.UNIT_SUMMARY_DETAIL(1, 1)).reply(200);
-    const dataNotification = {
-      params: {
-        summary_id: 1,
-      },
-    };
-    useReceiveNotifications.mockImplementationOnce(() => ({
-      dataNotification,
-    }));
     act(() => {
       tree = create(wrapComponent(route));
     });
-    act(() => {
-      jest.runOnlyPendingTimers();
-    });
+    expect(axios.get).toHaveBeenCalled();
+    expect(axios.get).toHaveBeenCalledWith(
+      API.UNIT.UNIT_SUMMARY_DETAIL(1, 1),
+      {}
+    );
   });
 
-  test('test receive notification with other summary_id then not reload data', async () => {
+  test('render fetchSummaryDetail success', async () => {
     jest.useFakeTimers();
-    mock.onGet(API.UNIT.UNIT_SUMMARY_DETAIL(1, 1)).reply(200);
-    const dataNotification = {
-      params: {
-        summary_id: 2,
+    const response = {
+      status: 200,
+      data: {
+        data: {},
       },
     };
-    useReceiveNotifications.mockImplementationOnce(() => ({
-      dataNotification,
-    }));
+    axios.get.mockImplementation(() => Promise.resolve(response));
+
     act(() => {
       tree = create(wrapComponent(route));
     });
     act(() => {
       jest.runOnlyPendingTimers();
     });
+    expect(axios.get).toHaveBeenCalled();
+    expect(axios.get).toHaveBeenCalledWith(
+      API.UNIT.UNIT_SUMMARY_DETAIL(1, 1),
+      {}
+    );
   });
 
   let list_value = [

package/src/screens/UnitSummary/components/3PPowerConsumption/__test__/3PPowerConsumption.test.js

@@ -1,23 +1,10 @@
-import React, { useState } from 'react';
+import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 import { TESTID } from '../../../../../configs/Constants';
-import { API, Colors } from '../../../../../configs';
+import { Colors } from '../../../../../configs';
 import PowerConsumption from '../index';
 import { SCProvider } from '../../../../../context';
 import { mockSCStore } from '../../../../../context/mockStore';
-import MockAdapter from 'axios-mock-adapter';
-import api from '../../../../../utils/Apis/axios';
-
-const mock = new MockAdapter(api.axiosInstance);
-const mockSetState = jest.fn();
-
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    useState: jest.fn(),
-  };
-});
-useState.mockImplementation((init) => [init, mockSetState]);
 
 const wrapComponent = (summaryDetail) => (
   <SCProvider initState={mockSCStore({})}>
@@ -77,20 +64,4 @@ describe('Test 3PPowerConsumption', () => {
     ];
     expect(listIndicator.props.data).toEqual(resultList);
   });
-
-  test('render 3PPowerConsumption with total_power', async () => {
-    mock.onGet(API.VALUE_CONSUME.DISPLAY_HISTORY()).reply(200, [{}]);
-    const summaryDetail = {
-      volt1Value: 200,
-      current1Value: 20,
-      activePowerValue: 10,
-      powerFactor1Value: 30,
-      totalPowerValue: 20,
-      listConfigs: { total_power: 1 },
-    };
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(summaryDetail));
-    });
-    expect(mockSetState).toHaveBeenCalledWith([{}]);
-  });
 });

package/src/screens/UnitSummary/components/PowerConsumeHistoryChart/__test__/index.test.js

@@ -1,14 +1,11 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
-import moment from 'moment';
-
 import ConfigHistoryChart from '../';
 import { SCProvider } from '../../../../../context';
 import { mockSCStore } from '../../../../../context/mockStore';
 import HistoryChart from '../../../../../commons/Device/HistoryChart';
-import api from '../../../../../utils/Apis/axios';
-import { API } from '../../../../../configs';
+import axios from 'axios';
+import moment from 'moment';
 
 jest.mock('react', () => {
   return {
@@ -17,7 +14,7 @@ jest.mock('react', () => {
   };
 });
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 const wrapComponent = (configs = []) => (
   <SCProvider initState={mockSCStore({})}>
@@ -51,7 +48,7 @@ describe('Test HistoryChart', () => {
         },
       ],
     };
-    mock.onGet(API.CONFIG.DISPLAY_HISTORY).reply(200, response.data);
+    axios.get.mockImplementation(async () => response);
     const configs = [{ id: 1 }];
     await act(async () => {
       tree = await create(wrapComponent(configs));

package/src/screens/UnitSummary/components/PowerConsumeHistoryChart/index.js

@@ -4,7 +4,6 @@ import moment from 'moment';
 import { API } from '../../../../configs';
 import HistoryChart from '../../../../commons/Device/HistoryChart';
 import { axiosGet } from '../../../../utils/Apis/axios';
-import { updateConfigChart } from '../../../../commons/UnitSummary/ConfigHistoryChart';
 
 export const dateTimeType = {
   date: 'date',
@@ -31,7 +30,19 @@ const ConfigHistoryChart = memo(({ configs }) => {
       const { success, data } = await axiosGet(API.CONFIG.DISPLAY_HISTORY, {
         params,
       });
-      updateConfigChart(success, data, configuration, setChartData);
+      if (success) {
+        for (let i = 0; i < data.length; i++) {
+          for (let j = 0; j < data[i].data.length; j++) {
+            data[i].data[j].x = moment(data[i].data[j].x).toDate();
+          }
+        }
+        setChartData(
+          configuration.map((config) => {
+            config.data = data.find((k) => k.config === config.id).data;
+            return config;
+          })
+        );
+      }
     };
     fetchData();
   }, [startDate, endDate, configs]);

package/src/screens/UnitSummary/components/PowerConsumption/__test__/ItemPower.test.js

@@ -1,3 +1,4 @@
+/* eslint-disable promise/prefer-await-to-callbacks */
 import React from 'react';
 import { act, create } from 'react-test-renderer';
 import Text from '../../../../../commons/Text';

package/src/screens/UnitSummary/components/PowerConsumption/__test__/PowerConsumption.test.js

@@ -1,17 +1,14 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
-
 import { TESTID } from '../../../../../configs/Constants';
-import { API, Colors } from '../../../../../configs';
+import { Colors } from '../../../../../configs';
 import ListQualityIndicator from '../../../../../commons/Device/WaterQualitySensor/ListQualityIndicator';
+import axios from 'axios';
 import PowerConsumption from '../index';
 import { SCProvider } from '../../../../../context';
 import { mockSCStore } from '../../../../../context/mockStore';
-import api from '../../../../../utils/Apis/axios';
-import { Today } from '../../../../../commons';
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 const wrapComponent = (summaryDetail) => (
   <SCProvider initState={mockSCStore({})}>
@@ -89,13 +86,15 @@ describe('Test PowerConsumption', () => {
       },
     };
 
-    mock.onGet(API.VALUE_CONSUME.DISPLAY_HISTORY()).reply(200);
+    const response = {
+      status: 200,
+    };
+    axios.get.mockImplementation(async (url) => response);
+
     await act(async () => {
       tree = await renderer.create(wrapComponent(summaryDetail));
     });
-    const instance = tree.root;
-    const Todays = instance.findByType(Today);
-    expect(Todays).toBeDefined();
+    expect(axios.get).toHaveBeenCalled();
   });
 
   test('render with unsuccess fetch', async () => {
@@ -114,13 +113,16 @@ describe('Test PowerConsumption', () => {
         volt: 209,
       },
     };
-    mock.onGet(API.VALUE_CONSUME.DISPLAY_HISTORY()).reply(200, {});
+
+    const response = {
+      data: {},
+    };
+    axios.get.mockImplementation(async (url) => response);
+
     await act(async () => {
       tree = await renderer.create(wrapComponent(summaryDetail));
     });
-    const instance = tree.root;
-    const Todays = instance.findByType(Today);
-    expect(Todays).toBeDefined();
+    expect(axios.get).toHaveBeenCalled();
   });
 
   test('render without value', async () => {

package/src/screens/UnitSummary/components/RunningDevices/__test__/index.test.js

@@ -13,6 +13,7 @@ const wrapComponent = (unit, summaryDetail) => (
 );
 
 const mockedNavigate = jest.fn();
+
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
@@ -22,16 +23,6 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-const mockConnectGoogleHome = jest.fn();
-jest.mock('../../../../../hooks/IoT', () => {
-  return {
-    ...jest.requireActual('../../../../../hooks/IoT'),
-    useGGHomeConnection: () => ({
-      connectGoogleHome: mockConnectGoogleHome,
-    }),
-  };
-});
-
 describe('test RunningDevices', () => {
   afterEach(() => {
     mockedNavigate.mockClear();
@@ -82,7 +73,6 @@ describe('test RunningDevices', () => {
       act(() => {
         button[0].props.onPress();
       });
-      expect(mockConnectGoogleHome).toBeCalled();
     });
   });
 
@@ -122,6 +112,7 @@ describe('test RunningDevices', () => {
       button[0].props.onPress();
     });
     expect(mockedNavigate).toBeCalledWith('DeviceDetail', {
+      isGGHomeConnected: false,
       sensorData: summaryDetail.devices[0],
       station: 'station',
       title: undefined,

package/src/screens/UnitSummary/components/RunningDevices/index.js

@@ -1,13 +1,16 @@
-import React, { memo, useEffect } from 'react';
+import React, { memo, useCallback, useEffect, useState } from 'react';
 import { StyleSheet, View } from 'react-native';
 import ItemDevice from '../../../../commons/Device/ItemDevice';
 import { scanBluetoothDevices } from '../../../../iot/RemoteControl/Bluetooth';
-import { useGGHomeConnection } from '../../../../hooks/IoT';
+import { googleHomeConnect } from '../../../../iot/RemoteControl/GoogleHome';
 
 const RunningDevices = memo(({ unit, summaryDetail }) => {
+  const [isGGHomeConnected, setIsGGHomeConnected] = useState(false);
   const { devices } = summaryDetail;
-
-  const { connectGoogleHome } = useGGHomeConnection();
+  const handleGoogleHomeConnect = useCallback(async (options) => {
+    let isConnected = await googleHomeConnect(options);
+    setIsGGHomeConnected(isConnected);
+  }, []);
 
   useEffect(() => {
     if (unit.remote_control_options) {
@@ -15,11 +18,10 @@ const RunningDevices = memo(({ unit, summaryDetail }) => {
         scanBluetoothDevices(unit.remote_control_options.bluetooth);
       }
       if (unit.remote_control_options.googlehome) {
-        (async () =>
-          await connectGoogleHome(unit.remote_control_options.googlehome))();
+        handleGoogleHomeConnect(unit.remote_control_options.googlehome);
       }
     }
-  }, [connectGoogleHome, unit]);
+  }, [handleGoogleHomeConnect, unit]);
   return (
     <View style={styles.container}>
       {!!devices &&
@@ -37,6 +39,7 @@ const RunningDevices = memo(({ unit, summaryDetail }) => {
               sensor={item}
               unit={unit}
               station={item.station}
+              isGGHomeConnected={isGGHomeConnected}
             />
           );
         })}

package/src/screens/UnitSummary/components/Temperature/index.js

@@ -1,6 +1,6 @@
 import React, { memo, useMemo } from 'react';
 import { StyleSheet, View } from 'react-native';
-import { useTranslations } from '../../../../hooks/Common/useTranslations';
+import t, { useTranslations } from '../../../../hooks/Common/useTranslations';
 
 import { Colors } from '../../../../configs';
 import { Section, Today } from '../../../../commons';
@@ -11,7 +11,7 @@ import SvgRain from '../../../../../assets/images/Device/rain-outline.svg';
 import SvgTemperature from '../../../../../assets/images/Device/temperature.svg';
 import SvgWind from '../../../../../assets/images/Device/wind.svg';
 
-const getDataTemperature = (summaryDetail, t) => {
+const getDataTemperature = (summaryDetail) => {
   return [
     {
       id: '0',
@@ -52,8 +52,8 @@ const Temperature = memo(({ summaryDetail }) => {
   }, [listConfigs]);
 
   const dataTemperature = useMemo(
-    () => getDataTemperature(summaryDetail, t),
-    [summaryDetail, t]
+    () => getDataTemperature(summaryDetail),
+    [summaryDetail]
   );
 
   const configs = useMemo(() => {

package/src/screens/UnitSummary/components/WaterQuality/Item/index.js

@@ -22,11 +22,11 @@ const Item = memo((props) => {
       <View size={14} color={Colors.Gray8} style={styles.textTitleX}>
         <Text>{title}</Text>
         {waterType && (
-          <TouchableOpacity onPress={goToDetail} style={styles.buttonInfo}>
+          <TouchableOpacity onPress={goToDetail}>
             <IconOutline
               style={styles.row}
               name="info-circle"
-              size={20}
+              size={14}
               color={Colors.Black}
             />
           </TouchableOpacity>
@@ -79,12 +79,4 @@ const styles = StyleSheet.create({
   row: {
     flexDirection: 'row',
   },
-  buttonInfo: {
-    width: 40,
-    height: 40,
-    justifyContent: 'center',
-    alignItems: 'center',
-    marginTop: -10,
-    marginRight: -10,
-  },
 });

package/src/screens/UnitSummary/index.js

@@ -3,10 +3,9 @@ import { View, StyleSheet } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { TouchableOpacity } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 import moment from 'moment';
 
-import { useTranslations } from '../../hooks/Common/useTranslations';
-import { useReceiveNotifications } from '../../hooks';
 import { API, Colors } from '../../configs';
 import Routes from '../../utils/Route';
 import { axiosGet } from '../../utils/Apis/axios';
@@ -140,19 +139,6 @@ const UnitSummary = memo(({ route }) => {
     fetchSummaryDetail();
   }, [fetchSummaryDetail]);
 
-  const { dataNotification } = useReceiveNotifications();
-
-  useEffect(() => {
-    if (dataNotification) {
-      const { params = {} } = dataNotification;
-      const { summary_id } = params;
-      if (summary_id && summary_id === summaryId) {
-        fetchSummaryDetail();
-      }
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [dataNotification]);
-
   const UnitSummaryDetail = getComponentAndGuide();
   const ComponentName = UnitSummaryDetail?.componentName;
   const GuideName = UnitSummaryDetail?.guideName;

package/src/screens/WaterQualityGuide/index.js

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