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

package/src/commons/SubUnit/ShortDetail.js

@@ -15,12 +15,18 @@ import { standardizeCameraScreenSize } from '../../utils/Utils';
 import Routes from '../../utils/Route';
 import FastImage from 'react-native-fast-image';
 import MediaPlayerDetail from '../MediaPlayerDetail';
+import {
+  keyPermission,
+  OpenSetting,
+  permitPermissionFunction,
+} from '../../utils/Permission/common';
+import { RESULTS } from 'react-native-permissions';
 
 const { standardizeWidth, standardizeHeight } = standardizeCameraScreenSize(
   Device.screenWidth - 32
 );
 
-const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
+const ShortDetailSubUnit = ({ unit, station }) => {
   const t = useTranslations();
   const { navigate } = useNavigation();
 
@@ -71,13 +77,24 @@ const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
   };
 
   const handleOnAddNew = () => {
-    navigate(Routes.AddDeviceStack, {
-      screen: Routes.ScanSensorQR,
-      params: {
-        station_id: station?.id,
-        unit_id: unit.id,
-        unit_name: unit.name,
-      },
+    permitPermissionFunction(keyPermission.CAMERA, (res) => {
+      if (res === RESULTS.GRANTED) {
+        navigate(Routes.AddDeviceStack, {
+          screen: Routes.ScanSensorQR,
+          params: {
+            station_id: station?.id,
+            unit_id: unit.id,
+            unit_name: unit.name,
+          },
+        });
+        return;
+      }
+      if (res === RESULTS.BLOCKED) {
+        OpenSetting(
+          t('camera_request_permission'),
+          t('camera_request_permission_des')
+        );
+      }
     });
   };
 
@@ -122,7 +139,6 @@ const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
                     sensor={sensor}
                     unit={unit}
                     station={station}
-                    isGGHomeConnected={isGGHomeConnected}
                     serverDown={serverDown}
                     status={getStatus(sensor)}
                   />

package/src/commons/SubUnit/__test__/Item.test.js

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

package/src/commons/SubUnit/__test__/ShortDetail.test.js

@@ -1,12 +1,14 @@
 import React from 'react';
 import { Image, View } from 'react-native';
 import { act, create } from 'react-test-renderer';
+import mock from 'react-native-permissions/mock';
 import { TESTID } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import ShortDetailSubUnit from '../ShortDetail';
 import ItemAddNew from '../../Device/ItemAddNew';
 import Routes from '../../../utils/Route';
+import { keyPermission } from '../../../utils/Permission/common';
 
 const wrapComponent = (props) => (
   <SCProvider initState={mockSCStore({})}>
@@ -21,6 +23,10 @@ jest.mock('react', () => {
   };
 });
 
+jest.mock('react-native-permissions', () => {
+  return mock;
+});
+
 const mockedNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
   return {
@@ -148,7 +154,7 @@ describe('test ShortDetail Subunit', () => {
     expect(itemDevice.length).toBe(1);
   });
 
-  test('render ShortDetail add new device', () => {
+  test('render ShortDetail add new device', async () => {
     act(() => {
       tree = create(wrapComponent(props));
     });
@@ -157,6 +163,7 @@ describe('test ShortDetail Subunit', () => {
     act(() => {
       buttonAddNew.props.onAddNew();
     });
+    await mock.request(keyPermission.CAMERA);
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.AddDeviceStack, {
       screen: Routes.ScanSensorQR,
       params: {

package/src/commons/Unit/SharedUnit.js

@@ -39,6 +39,7 @@ const SharedUnit = ({
   }, [renewItem, index, unit, item]);
   const addPinSharedUnit = useCallback(async () => {
     const { success } = await axiosPost(API.UNIT.PIN_UNIT(unit.id));
+
     if (success) {
       item.is_pin = true;
       renewItem(index);

package/src/commons/Unit/__test__/SharedUnit.test.js

@@ -1,8 +1,8 @@
-import axios from 'axios';
 import React from 'react';
 import { create, act } from 'react-test-renderer';
 import moment from 'moment';
 import { useNavigation } from '@react-navigation/native';
+import MockAdapter from 'axios-mock-adapter';
 
 import SharedUnit from '../SharedUnit';
 import { TESTID } from '../../../configs/Constants';
@@ -10,8 +10,9 @@ import { API } from '../../../configs';
 import Routes from '../../../utils/Route';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import api from '../../../utils/Apis/axios';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 const mockNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
@@ -38,8 +39,6 @@ describe('Test SharedUnit', () => {
   let tree, item, unit;
 
   beforeEach(() => {
-    axios.post.mockClear();
-
     unit = {
       background: '',
       icon: '',
@@ -61,6 +60,12 @@ describe('Test SharedUnit', () => {
 
   test('test create SharedUnit unit is not pin, not star', async () => {
     const navigation = useNavigation();
+    const mockedRenewItem = jest.fn();
+    await act(async () => {
+      tree = await create(
+        wrapComponent(item, navigation, true, mockedRenewItem)
+      );
+    });
 
     await act(async () => {
       tree = await create(wrapComponent(item, navigation));
@@ -72,34 +77,39 @@ describe('Test SharedUnit', () => {
     act(() => {
       touchSharedUnit.props.onPress();
     });
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
-      screen: Routes.UnitDetail,
-      params: {
-        unitId: 3,
-        unitData: unit,
-      },
-    });
-
     const iconRemovePinSharedUnit = instance.findAll(
       (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT + '-69'
     );
-    expect(iconRemovePinSharedUnit).toHaveLength(0);
-
     const iconAddPinSharedUnit = instance.find(
       (el) => el.props.testID === TESTID.ICON_ADD_PIN_SHARED_UNIT + '-69'
     );
+    mock.onPost(API.UNIT.PIN_UNIT(3)).reply(200);
+    act(() => {
+      iconAddPinSharedUnit.props.onPress();
+    });
+    mock.onPost(API.UNIT.PIN_UNIT(3)).reply(400);
     act(() => {
       iconAddPinSharedUnit.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.UNIT.PIN_UNIT(3));
-
     const iconAddStarSharedUnit = instance.find(
       (el) => el.props.testID === TESTID.ICON_ADD_STAR_SHARED_UNIT + '-69'
     );
+    mock.onPost(API.UNIT.STAR_UNIT(3)).reply(200);
     act(() => {
       iconAddStarSharedUnit.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.UNIT.STAR_UNIT(3));
+    mock.onPost(API.UNIT.STAR_UNIT(3)).reply(400);
+    act(() => {
+      iconAddStarSharedUnit.props.onPress();
+    });
+    expect(iconRemovePinSharedUnit).toHaveLength(0);
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+      screen: Routes.UnitDetail,
+      params: {
+        unitId: 3,
+        unitData: unit,
+      },
+    });
   });
 
   test('test create SharedUnit unit without unit owner', async () => {
@@ -148,183 +158,28 @@ describe('Test SharedUnit', () => {
     const iconRemovePinSharedUnit = instance.find(
       (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT + '-69'
     );
+    mock.onPost(API.UNIT.UNPIN_UNIT(3)).reply(200);
+    act(() => {
+      iconRemovePinSharedUnit.props.onPress();
+    });
+    mock.onPost(API.UNIT.UNPIN_UNIT(3)).reply(400);
     act(() => {
       iconRemovePinSharedUnit.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.UNIT.UNPIN_UNIT(3));
-
     const iconRemoveStarSharedUnit = instance.find(
       (el) => el.props.testID === TESTID.ICON_REMOVE_STAR_SHARED_UNIT + '-69'
     );
+    mock.onPost(API.UNIT.UNSTAR_UNIT(3)).reply(200);
     act(() => {
       iconRemoveStarSharedUnit.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.UNIT.UNSTAR_UNIT(3));
-  });
-
-  test('test pin SharedUnit success', async () => {
-    const navigation = useNavigation();
-    const mockedRenewItem = jest.fn();
-    await act(async () => {
-      tree = await create(
-        wrapComponent(item, navigation, true, mockedRenewItem)
-      );
-    });
-    const instance = tree.root;
-
-    const response = {
-      success: true,
-      status: 200,
-    };
-
-    jest.spyOn(axios, 'post').mockImplementation(() => {
-      return response;
-    });
-
-    const iconAddPinSharedUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_ADD_PIN_SHARED_UNIT + '-69'
-    );
-
-    const iconStarUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_ADD_STAR_SHARED_UNIT + '-69'
-    );
-
-    await act(async () => {
-      await iconAddPinSharedUnit.props.onPress();
-      await iconStarUnit.props.onPress();
-    });
-
-    expect(mockedRenewItem).toHaveBeenCalledTimes(2);
-  });
-
-  test('test pin SharedUnit unsuccess', async () => {
-    const navigation = useNavigation();
-    const mockedRenewItem = jest.fn();
-    await act(async () => {
-      tree = await create(
-        wrapComponent(item, navigation, true, mockedRenewItem)
-      );
-    });
-    const instance = tree.root;
-
-    const response = {
-      success: false,
-      status: 500,
-    };
-
-    jest.spyOn(axios, 'post').mockImplementation(() => {
-      return response;
-    });
-
-    const iconAddPinSharedUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_ADD_PIN_SHARED_UNIT + '-69'
-    );
-
-    const iconStarUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_ADD_STAR_SHARED_UNIT + '-69'
-    );
-
-    await act(async () => {
-      await iconAddPinSharedUnit.props.onPress();
-      await iconStarUnit.props.onPress();
-    });
-
-    const iconRemovePinSharedUnit = instance.findAll(
-      (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT + '-69'
-    );
-
-    const iconRemoveStartUnit = instance.findAll(
-      (el) => el.props.testID === TESTID.ICON_REMOVE_STAR_SHARED_UNIT + '-69'
-    );
-
-    expect(mockedRenewItem).toHaveBeenCalledTimes(0);
-    expect(iconRemovePinSharedUnit).toHaveLength(0);
-    expect(iconRemoveStartUnit).toHaveLength(0);
-  });
-
-  test('test unpin SharedUnit success', async () => {
-    const navigation = useNavigation();
-    item.is_pin = true;
-    item.is_star = true;
-    const mockedRenewItem = jest.fn();
-
-    await act(async () => {
-      tree = await create(
-        wrapComponent(item, navigation, true, mockedRenewItem)
-      );
-    });
-    const instance = tree.root;
-
-    const response = {
-      success: true,
-      status: 200,
-    };
-
-    jest.spyOn(axios, 'post').mockImplementation(() => {
-      return response;
-    });
-
-    const iconRemovePinSharedUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT + '-69'
-    );
-
-    const iconRemoveStartUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_REMOVE_STAR_SHARED_UNIT + '-69'
-    );
-
-    await act(async () => {
-      await iconRemovePinSharedUnit.props.onPress();
-      await iconRemoveStartUnit.props.onPress();
-    });
-
-    expect(mockedRenewItem).toHaveBeenCalledTimes(2);
-  });
-
-  test('test unpin SharedUnit unsuccess', async () => {
-    const navigation = useNavigation();
-    item.is_pin = true;
-    item.is_star = true;
-    const mockedRenewItem = jest.fn();
-
-    await act(async () => {
-      tree = await create(
-        wrapComponent(item, navigation, true, mockedRenewItem)
-      );
-    });
-    const instance = tree.root;
-
-    const response = {
-      success: false,
-      status: 500,
-    };
-
-    jest.spyOn(axios, 'post').mockImplementation(() => {
-      return response;
+    mock.onPost(API.UNIT.UNSTAR_UNIT(3)).reply(400);
+    act(() => {
+      iconRemoveStarSharedUnit.props.onPress();
     });
-
-    const iconRemovePinSharedUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT + '-69'
-    );
-
-    const iconRemoveStartUnit = instance.find(
+    const iconRemoveStar = instance.findAll(
       (el) => el.props.testID === TESTID.ICON_REMOVE_STAR_SHARED_UNIT + '-69'
     );
-
-    await act(async () => {
-      await iconRemovePinSharedUnit.props.onPress();
-      await iconRemoveStartUnit.props.onPress();
-    });
-
-    const iconAddPinSharedUnit = instance.findAll(
-      (el) => el.props.testID === TESTID.ICON_ADD_PIN_SHARED_UNIT + '-69'
-    );
-
-    const iconStarUnit = instance.findAll(
-      (el) => el.props.testID === TESTID.ICON_ADD_STAR_SHARED_UNIT + '-69'
-    );
-
-    expect(mockedRenewItem).toHaveBeenCalledTimes(0);
-    expect(iconAddPinSharedUnit).toHaveLength(0);
-    expect(iconStarUnit).toHaveLength(0);
+    expect(iconRemoveStar).toHaveLength(3);
   });
 });

package/src/commons/UnitSummary/ConfigHistoryChart/index.js

@@ -4,6 +4,7 @@ import moment from 'moment';
 import { API } from '../../../configs';
 import HistoryChart from '../../../commons/Device/HistoryChart';
 import { axiosGet } from '../../../utils/Apis/axios';
+import { updateConfigChart } from '../ConfigHistoryChart';
 
 export const dateTimeType = {
   date: 'date',
@@ -30,19 +31,7 @@ const ConfigHistoryChart = memo(({ configs }) => {
       const { success, data } = await axiosGet(API.CONFIG.DISPLAY_HISTORY(), {
         params,
       });
-      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;
-          })
-        );
-      }
+      updateConfigChart(success, data, configuration, setChartData);
     };
     fetchData();
   }, [startDate, endDate, configs]);

package/src/commons/UnitSummary/ConfigHistoryChart.js

@@ -11,6 +11,27 @@ export const dateTimeType = {
   dateTime: 'datetime',
 };
 
+export const 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;
+      })
+    );
+  }
+};
+
 const ConfigHistoryChart = memo(({ configs }) => {
   const [chartData, setChartData] = useState(configs);
   const [startDate, setStartDate] = useState(moment().subtract(1, 'days'));
@@ -28,19 +49,7 @@ const ConfigHistoryChart = memo(({ configs }) => {
       const { success, data } = await axiosGet(API.CONFIG.DISPLAY_HISTORY(), {
         params,
       });
-      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;
-          })
-        );
-      }
+      updateConfigChart(success, data, configuration, setChartData);
     };
     fetchData();
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/src/commons/WheelDateTimePicker/index.js

@@ -40,12 +40,12 @@ const WheelDateTimePicker = ({
       const date = moment(defaultValue);
       const maximumDate = moment(date).add(15, 'days');
       const minimumDate = moment(date).add(-15, 'days');
-      const [dateData, indexDate] =
+      const [newDateData, indexDate] =
         mode === 'datetime'
           ? getDateData(date, maximumDate, minimumDate)
           : [[{ value: date }], 0];
       return {
-        dateData: dateData,
+        dateData: newDateData,
         indexInitialDate: indexDate,
         indexInitialHour: date.hour(),
         indexInitialMinute: date.minute(),