@eohjsc/react-native-smart-city 0.3.85 → 0.3.87

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

@@ -1,4 +1,4 @@
-import React, { memo, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import moment from 'moment';
 
 import { API } from '../../../configs';
@@ -23,6 +23,37 @@ const fetchDataS3 = async (url) => {
   return data;
 };
 
+export const useFetchConfigHistory = (configs, setChartData) => {
+  const fetchDataDisplayHistory = useCallback(
+    async (startDate, endDate) => {
+      if (!configs.length || !startDate || !endDate) {
+        return;
+      }
+
+      let params = new URLSearchParams();
+      let validConfigs = configs.filter((item) => item.id);
+      if (!validConfigs.length) {
+        return;
+      }
+      validConfigs.forEach((item) => {
+        params.append('configs', item.id);
+      });
+      params.append('date_from', startDate.format('YYYY-MM-DDTHH:mm:ss'));
+      params.append('date_to', endDate.format('YYYY-MM-DDTHH:mm:ss'));
+
+      const { success, data } = await axiosGet(
+        API.CONFIG.DISPLAY_HISTORY_V3(),
+        {
+          params,
+        }
+      );
+      await updateConfigChart(success, data, configs, setChartData);
+    },
+    [configs, setChartData]
+  );
+  return fetchDataDisplayHistory;
+};
+
 export const updateConfigChart = async (
   success,
   data,
@@ -90,16 +121,9 @@ export const updateConfigChart = async (
   });
 };
 
-const areEqual = ({ configs: oldConfigs }, { configs: newConfigs }) => {
-  return (
-    JSON.stringify(oldConfigs.map((config) => config.id).sort()) ===
-    JSON.stringify(newConfigs.map((config) => config.id).sort())
-  );
-};
-
 let timeoutId;
 
-const ConfigHistoryChart = memo(({ configs }) => {
+const ConfigHistoryChart = ({ configs }) => {
   const [chartData, setChartData] = useState(configs);
   const [startDate, setStartDate] = useState(
     moment().subtract(1, 'days').valueOf()
@@ -121,9 +145,12 @@ const ConfigHistoryChart = memo(({ configs }) => {
         'date_to',
         moment(endDate).utc().format('YYYY-MM-DD HH:mm:ss')
       );
-      const { success, data } = await axiosGet(API.CONFIG.DISPLAY_HISTORY(), {
-        params,
-      });
+      const { success, data } = await axiosGet(
+        API.CONFIG.DISPLAY_HISTORY_V3(),
+        {
+          params,
+        }
+      );
       updateConfigChart(success, data, configuration, setChartData);
     };
 
@@ -145,6 +172,6 @@ const ConfigHistoryChart = memo(({ configs }) => {
       setEndDate={setEndDate}
     />
   );
-}, areEqual);
+};
 
 export default ConfigHistoryChart;

package/src/commons/WrapParallaxScrollView/index.js

@@ -1,12 +1,13 @@
 import React, { useCallback } from 'react';
-import { Image, StatusBar, View, StyleSheet } from 'react-native';
-import ParallaxScrollView from '../../libs/react-native-parallax-scroll-view';
+import { StatusBar, View, StyleSheet } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
 
 import { Colors, Device, Images } from '../../configs';
 import Text from '../Text';
 import HeaderUnit from '../Unit/HeaderUnit';
 import { AccessibilityLabel } from '../../configs/Constants';
+import FImage from '../FImage';
+import ParallaxScrollView from '../../libs/react-native-parallax-scroll-view';
 
 const stickyHeaderHeight =
   Device.TopbarHeight + (Device.isIOS ? 0 : StatusBar.currentHeight);
@@ -62,9 +63,9 @@ const WrapParallaxScrollView = ({
   const renderBackground = useCallback(
     () => (
       <View style={styles.image}>
-        <Image
+        <FImage
           style={styles.image}
-          source={{ uri: uriImg }}
+          source={uriImg ? { uri: uriImg } : Images.unitDefaultBackground}
           defaultSource={Images.BgUnit}
           resizeMode="cover"
         />

package/src/configs/API.js

@@ -86,7 +86,7 @@ const API = {
     ACCESS: (id) => `/property_manager/shared_sensors/${id}/access/`,
   },
   CONFIG: {
-    DISPLAY_HISTORY: () => '/chip_manager/configs/value_history_v3/',
+    DISPLAY_HISTORY_V3: () => '/chip_manager/configs/value_history_v3/',
   },
   AUTOMATE: {
     ACTION_ONE_TAP: (id) => `/property_manager/automate/${id}/action_one_tap/`,
@@ -222,6 +222,7 @@ const API = {
       REBOOT: (id) => `/chip_manager/developer_mode_chips/${id}/reboot_chip/`,
     },
     ARDUINO: {
+      DETAIL: (id) => `/iot/modules/arduino/gateways/${id}/`,
       DEVICE: (gatewayId) =>
         `/iot/modules/arduino/gateways/${gatewayId}/devices/`,
       DEVICE_DETAIL: (gatewayId, deviceId) =>
@@ -236,6 +237,7 @@ const API = {
         `/iot/modules/arduino/gateways/${gatewayId}/devices/${deviceId}/actions/${actionId}/`,
     },
     ZIGBEE: {
+      DETAIL: (id) => `/iot/modules/zigbee/gateways/${id}/`,
       SEARCH_DEVICE: (id) => `/iot/modules/zigbee/chips/${id}/search_device/`,
       DEVICE_CONFIGURATION: (id, deviceId) =>
         `/iot/modules/zigbee/chips/${id}/sensors/${deviceId}/configuration/`,
@@ -250,6 +252,7 @@ const API = {
         `/iot/modules/zigbee/gateways/${gatewayId}/devices/${deviceId}/zigbee_actions/`,
     },
     MODBUS: {
+      DETAIL: (id) => `/iot/modules/modbus/gateways/${id}/`,
       DEVICE: (gatewayId) =>
         `/iot/modules/modbus/gateways/${gatewayId}/devices/`,
       DEVICE_DETAIL: (gatewayId, deviceId) =>
@@ -260,8 +263,6 @@ const API = {
         `/iot/modules/modbus/gateways/${gatewayId}/devices/${deviceId}/actions/`,
       ACTION_DETAIL: (gatewayId, deviceId, actionId) =>
         `/iot/modules/modbus/gateways/${gatewayId}/devices/${deviceId}/actions/${actionId}/`,
-      ACTION_ITEM_DETAIL: (actionId, actionItemId) =>
-        `/iot/modules/modbus/actions/${actionId}/items/${actionItemId}/`,
     },
   },
 };

package/src/configs/AccessibilityLabel.js

@@ -94,6 +94,10 @@ export default {
   GROUP_BUTTON_TYPE: {
     BUTTON_BOTTOM: 'BUTTON_BOTTOM',
   },
+  HEADER_BUTTON_TYPE_RELOAD: 'HEADER_BUTTON_TYPE_RELOAD',
+  HEADER_BUTTON_TYPE_MORE: 'HEADER_BUTTON_TYPE_MORE',
+  ICON_OUTLINE_TYPE_RELOAD: 'ICON_OUTLINE_TYPE_RELOAD',
+  ICON_OUTLINE_TYPE_MORE: 'ICON_OUTLINE_TYPE_MORE',
 
   // sub unit
   SUB_UNIT_FULL_CAMERA: 'SUB_UNIT_FULL_CAMERA',
@@ -358,6 +362,9 @@ export default {
   STATION_DEVICE_PERMISSIONS: 'STATION_DEVICE_PERMISSIONS',
   TEXT_NO_DATA_STATIONS: 'TEXT_NO_DATA_STATIONS',
 
+  // Gauge widget
+  WRAP_TOOL_TIP: 'WRAP_TOOL_TIP',
+
   // Manage Unit
   MANAGE_UNIT_CHANGE_NAME: 'MANAGE_UNIT_CHANGE_NAME',
   MANAGE_UNIT_CHANGE_LOCATION: 'MANAGE_UNIT_CHANGE_LOCATION',

package/src/configs/Constants.js

@@ -90,6 +90,7 @@ export const PERMISSION_TYPE = {
   CONFIG: 'CONFIG',
   CONFIG_WRITE: 'CONFIG_WRITE',
   CONFIG_READ: 'CONFIG_READ',
+  VIRTUAL_PIN: 'VIRTUAL_PIN',
 };
 
 const marginItem = 12;

package/src/configs/Images.js

@@ -26,4 +26,5 @@ export default {
   lg: require('../Images/SmartAccount/LG.png'),
   inforCode: require('../Images/DevMode/inforCode.png'),
   activeCurrentSensor: require('../Images/Common/Sunny.png'),
+  unitDefaultBackground: require('../Images/Common/unit_default_background.png'),
 };

package/src/context/actionType.ts

@@ -33,6 +33,9 @@ export const Action = {
   REFRESH_PERCENT: 'REFRESH_PERCENT',
   PROCESS_DONE: 'PROCESS_DONE',
   IS_EMERGENCY_POPUP: 'IS_EMERGENCY_POPUP',
+  IS_CHECK_CLEAR_CACHE_UNITS: 'IS_CHECK_CLEAR_CACHE_UNITS',
+  DELETE_UNIT_SUCCESSFULLY: 'DELETE_UNIT_SUCCESSFULLY',
+  RESET_DELETE_UNIT_ACTION: 'RESET_DELETE_UNIT_ACTION',
   // NOTE: DEV MODE
   SET_WIDGET_DRAGGING: 'SET_WIDGET_DRAGGING',
   SET_IS_EDITING_TEMPLATE: 'SET_IS_EDITING_TEMPLATE',
@@ -96,6 +99,8 @@ export type AppType = {
   notificationData: any;
   popoverAnimating: boolean;
   isLockWhenPickColor: boolean;
+  isNeedUpdateCache: boolean;
+  isDeleteUnitSuccessFully: boolean;
 };
 
 export type IoTType = {

package/src/context/mockStore.ts

@@ -92,6 +92,7 @@ export const mockSCStore = (data: ContextData): ContextData => {
       isConnectWifiGateway: false,
       isNetworkConnected: true,
       isLockWhenPickColor: false,
+      ...data.app,
     },
     unit: {
       favoriteDeviceIds: [

package/src/context/reducer.ts

@@ -69,6 +69,8 @@ export const initialState = {
     popoverAnimating: false,
     isLockWhenPickColor: false,
     isEmergencyPopupScreen: false,
+    isNeedUpdateCache: false,
+    isDeleteUnitSuccessFully: false,
   },
   iot: {
     bluetooth: {
@@ -443,6 +445,15 @@ export const reducer = (currentState: ContextData, action: Action) => {
         },
       };
 
+    case Action.IS_CHECK_CLEAR_CACHE_UNITS:
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          isNeedUpdateCache: payload,
+        },
+      };
+
     case Action.SET_POPOVER_ANIMATING:
       return {
         ...currentState,
@@ -496,6 +507,24 @@ export const reducer = (currentState: ContextData, action: Action) => {
         ...currentState,
       };
 
+    case Action.DELETE_UNIT_SUCCESSFULLY:
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          isDeleteUnitSuccessFully: true,
+        },
+      };
+
+    case Action.RESET_DELETE_UNIT_ACTION:
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          isDeleteUnitSuccessFully: false,
+        },
+      };
+
     default:
       return currentState;
   }

package/src/hooks/Common/useTranslations.ts

@@ -9,7 +9,7 @@ import { useSCContextSelector } from '../../context';
 import { getConfigGlobalState } from '../../iot/states.js';
 
 export const useTranslations = () => {
-  const lang = useSCContextSelector((state) => state.language);
+  const lang = useSCContextSelector((state) => state?.language || 'en');
 
   const language: Language = lang as Language;
 

package/src/hooks/IoT/useRemoteControl.js

@@ -1,4 +1,3 @@
-/* eslint-disable promise/prefer-await-to-callbacks */
 import { useCallback } from 'react';
 import { useSCContextSelector } from '../../context';
 import { sendCommandOverHomeAssistant } from '../../iot/RemoteControl/HomeAssistant';

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

@@ -125,7 +125,7 @@ it('test date picker pick valid and invalid date', async () => {
   });
   const instance = tree.root;
   const dateTimeRangeChange = instance.findByType(DateTimeRangeChange);
-  const datePicker = instance.findByType(DateTimePickerModal);
+  const datePicker = instance.findAllByType(DateTimePickerModal)[2];
 
   expect(dateTimeRangeChange.props.startTime).toBe(dateFrom.valueOf());
   expect(dateTimeRangeChange.props.endTime).toBe(dateTo.valueOf());

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

@@ -114,7 +114,7 @@ describe('Test Activity log', () => {
     expect(filterPopup[0].props.isVisible).toBeTruthy();
 
     const dateTimeRangeChange = instance.findByType(DateTimeRangeChange);
-    const datePicker = instance.findByType(DateTimePickerModal);
+    const datePicker = instance.findAllByType(DateTimePickerModal)[2];
 
     // pick start date
     await act(async () => {

package/src/screens/AddNewAction/__test__/LoadingSelectAction.test.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import { View } from 'react-native';
+import { act, create } from 'react-test-renderer';
+
+import LoadingSelectAction from '../Components/LoadingSelectAction';
+describe('Test LoadingSelectAction', () => {
+  let tree;
+  it('Test render', async () => {
+    await act(async () => {
+      tree = await create(<LoadingSelectAction />);
+    });
+    const instance = tree.root;
+    const views = instance.findAllByType(View);
+    expect(views).toHaveLength(1);
+  });
+});

package/src/screens/AddNewGateway/__test__/ScanModbusQR.test.js

@@ -7,6 +7,7 @@ import { mockSCStore } from '../../../context/mockStore';
 import QRScan from '../../ScanChipQR/components/QRScan';
 import { getTranslate } from '../../../utils/I18n';
 import Routes from '../../../utils/Route';
+import ViewButtonBottom from '../../../commons/ViewButtonBottom';
 
 const mockedGoBack = jest.fn();
 const mockedNavigate = jest.fn();
@@ -41,6 +42,20 @@ describe('test scan modbus QR', () => {
     expect(qrScanComponents).toHaveLength(1);
   });
 
+  it('cancel scan modbus device', async () => {
+    const route = { params: {} };
+    await act(async () => {
+      tree = renderer.create(wrapComponent(route));
+    });
+
+    const instance = tree.root;
+    const qrScanComponent = instance.findAllByType(ViewButtonBottom)[0];
+    await act(async () => {
+      qrScanComponent.props.onLeftClick();
+    });
+    expect(mockedGoBack).toHaveBeenCalled();
+  });
+
   const scanQRCode = async (data) => {
     const route = { params: {} };
     await act(async () => {

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

@@ -4,7 +4,7 @@ import AllCamera from '..';
 import { act, create } from 'react-test-renderer';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import Carousel from 'react-native-snap-carousel';
+import Carousel from 'react-native-new-snap-carousel';
 
 const arrCameras = [
   {

package/src/screens/AllCamera/index.js

@@ -8,9 +8,9 @@ import React, {
 import { View, Text, TouchableOpacity, Platform, Image } from 'react-native';
 import { useRoute, useNavigation } from '@react-navigation/native';
 import { chunk } from 'lodash';
-import Carousel from 'react-native-snap-carousel';
-
+import Carousel from 'react-native-new-snap-carousel';
 import { useTranslations } from '../../hooks/Common/useTranslations';
+
 import { Images, Colors } from '../../configs';
 import { useHiddenStatusBar } from '../../hooks/Common/useStatusBar';
 import { HeaderCustom } from '../../commons/Header';