@eohjsc/react-native-smart-city 0.3.48 → 0.3.50

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

@@ -23,13 +23,6 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <SelectAction route={route} />
@@ -101,7 +94,8 @@ describe('Test SelectAction', () => {
     const config1 = 1,
       config2 = 2,
       config3 = 3,
-      config4 = 4;
+      config4 = 4,
+      config5 = 5;
     const response = {
       status: 200,
       success: true,
@@ -152,13 +146,25 @@ describe('Test SelectAction', () => {
             text_format: '{number} \u00b0C',
           },
         },
+        {
+          title: '',
+          template: 'NumberUpDownActionTemplate',
+          configuration: {
+            config: config4,
+            allow_config_store_value: true,
+            action: '11111111-6c1a-452d-a1d1-87a314c20528',
+            min_value: 12,
+            max_value: 20,
+            text_format: '{number} \u00b0C',
+          },
+        },
         {
           title: '',
           template: 'StatesGridActionTemplate',
           configuration: {
             options: [
               {
-                config: config4,
+                config: config5,
                 is_on_value: 1,
                 action: '800ff454-4e2a-4a38-bad6-1bded728193e',
                 allow_config_store_value: true,
@@ -179,7 +185,7 @@ describe('Test SelectAction', () => {
     const renderActionItem = instance.find(
       (el) => el.props.accessibilityLabel === AccessibilityLabel.ACTION_ITEM
     );
-    expect(renderActionItem.props.data.length).toBe(4);
+    expect(renderActionItem.props.data.length).toBe(5);
 
     const simpleActionOn = instance.find(
       (el) =>
@@ -209,22 +215,27 @@ describe('Test SelectAction', () => {
       await touchOpacity.props.onPress();
     });
 
-    const buttonNumberUp = instance.find(
+    const buttonNumberUp = instance.findAll(
       (item) =>
         item.props.accessibilityLabel ===
           AccessibilityLabel.NUMBER_UP_DOWN_ACTION_UP &&
         item.type === TouchableOpacity
     );
-    const buttonSaveNumberAction = instance.find(
+    expect(buttonNumberUp).toHaveLength(2);
+
+    const buttonSaveNumberAction = instance.findAll(
       (item) =>
         item.props.accessibilityLabel ===
           AccessibilityLabel.NUMBER_UP_DOWN_ACTION_DONE &&
         item.type === TouchableOpacity
     );
+    expect(buttonSaveNumberAction).toHaveLength(2);
 
     await act(async () => {
-      await buttonNumberUp.props.onPress();
-      await buttonSaveNumberAction.props.onPress();
+      await buttonNumberUp[0].props.onPress();
+      await buttonNumberUp[1].props.onPress();
+      await buttonSaveNumberAction[0].props.onPress();
+      await buttonSaveNumberAction[1].props.onPress();
     });
 
     const chooseMode = instance.find(
@@ -234,7 +245,7 @@ describe('Test SelectAction', () => {
         item.type === TouchableOpacity
     );
     await act(async () => {
-      await chooseMode.props.onPress(response.data[3].configuration.options[0]);
+      await chooseMode.props.onPress(response.data[4].configuration.options[0]);
     });
 
     mock.onPost(API.AUTOMATE.ADD_SCRIPT_ACTION(1)).reply(200);
@@ -275,9 +286,17 @@ describe('Test SelectAction', () => {
               config_value: 29,
             },
           },
+          {
+            action: '11111111-6c1a-452d-a1d1-87a314c20528',
+            data: {
+              temperature: 28,
+              config_id: config4,
+              config_value: 28,
+            },
+          },
           {
             action: '800ff454-4e2a-4a38-bad6-1bded728193e',
-            data: { config_id: config4, config_value: 1 },
+            data: { config_id: config5, config_value: 1 },
           },
         ],
         unit: 1,

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

@@ -32,13 +32,6 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <SelectSensorDevices route={route} />

package/src/screens/AddNewDevice/__test__/AddNewDevice.test.js

@@ -22,10 +22,6 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-jest.mock('react', () => {
-  return { ...jest.requireActual('react'), memo: (x) => x };
-});
-
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 
@@ -101,7 +97,7 @@ describe('Test AddNewDevice', () => {
   });
 
   it('fetchDetails fail', async () => {
-    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(400);
+    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(500);
     await act(async () => {
       tree = await create(wrapComponent(route));
     });

package/src/screens/AddNewGateway/ConnectingDevice.js

@@ -1,8 +1,12 @@
-import { useNavigation } from '@react-navigation/native';
 import React, { useCallback, useEffect, useState } from 'react';
+import { useNavigation } from '@react-navigation/native';
+import { Alert } from 'react-native';
+
 import Processing from '../../commons/Processing';
 import Routes from '../../utils/Route';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 
+let timeout;
 const ConnectingDevice = ({
   title,
   fail,
@@ -13,13 +17,13 @@ const ConnectingDevice = ({
   chipId,
   sensorId,
   addDeviceType,
-  goBack,
   showPopupTurnOnGuide,
   setHidePopupTurnOnGuide,
   setIsRecallChipScan,
   isChangeAddressSuccess,
 }) => {
-  const { navigate } = useNavigation();
+  const t = useTranslations();
+  const { navigate, goBack } = useNavigation();
 
   const [renameParams, setRenameParams] = useState({
     unitId,
@@ -31,11 +35,29 @@ const ConnectingDevice = ({
 
   const complete = useCallback(
     (deviceInfo) => {
+      timeout && clearTimeout(timeout);
       navigate(Routes.RenameNewDevices, renameParams);
     },
     [navigate, renameParams]
   );
 
+  useEffect(() => {
+    timeout = setTimeout(() => {
+      Alert.alert(t('continue_to_wait'), t('it_has_been_5_minutes'), [
+        {
+          text: t('back'),
+          onPress: goBack,
+        },
+        {
+          text: t('continue'),
+        },
+      ]);
+    }, 300 * 1000); // when test, it takes more than 3 min
+    return () => {
+      clearTimeout(timeout);
+    };
+  }, [fail, goBack, t]);
+
   const onMessage = useCallback(
     (data) => {
       setRenameParams((oldParams) => {

package/src/screens/AddNewGateway/ConnectingWifiGuide.js

@@ -99,7 +99,7 @@ const ConnectingWifiGuide = ({ route }) => {
         setWifiList(data.wifi);
         setCurrentState(0);
         clearInterval(intervalSend);
-        socket.close();
+        socket?.close();
         socket = null;
       }
     });

package/src/screens/AddNewGateway/ConnectingWifiGuideStyles.js

@@ -1,4 +1,6 @@
+import { Platform } from 'react-native';
 import { Dimensions, StyleSheet } from 'react-native';
+import { getBottomSpace } from 'react-native-iphone-x-helper';
 import { Colors } from '../../configs';
 
 const customWidth = (Dimensions.get('window').width - 32 - 15) / 2; // set gap between flex item is 15px
@@ -55,4 +57,12 @@ export default StyleSheet.create({
     textAlign: 'center',
     lineHeight: 24,
   },
+  bottomButtonView: {
+    marginBottom:
+      getBottomSpace() +
+      Platform.select({
+        android: 10,
+        ios: -10,
+      }),
+  },
 });

package/src/screens/AddNewGateway/ConnectingZigbeeDevice.js

@@ -1,6 +1,7 @@
 import { useNavigation } from '@react-navigation/native';
-import React, { useCallback, useState } from 'react';
+import React, { useCallback } from 'react';
 import { Alert } from 'react-native';
+
 import API from '../../configs/API';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { axiosPost } from '../../utils/Apis/axios';
@@ -10,14 +11,13 @@ const ConnectingZigbeeDevice = ({ route }) => {
   const t = useTranslations();
   const { goBack } = useNavigation();
   const { unitId, subUnit, chipId } = route?.params || {};
-  const [sensorId, setSensorId] = useState(null);
 
   const fail = useCallback(
     (message) => {
       Alert.alert(t('fail_add_zigbee_device'), message, [
         {
           text: t('ok'),
-          onPress: () => goBack(),
+          onPress: goBack,
         },
       ]);
     },
@@ -39,9 +39,8 @@ const ConnectingZigbeeDevice = ({ route }) => {
         fail(JSON.stringify(problem || data));
         return;
       }
-      setSensorId(data.id);
     },
-    [chipId, fail, subUnit, unitId]
+    [chipId, fail, subUnit?.id, unitId]
   );
 
   return (
@@ -53,7 +52,7 @@ const ConnectingZigbeeDevice = ({ route }) => {
       unitId={unitId}
       subUnit={subUnit}
       chipId={chipId}
-      sensorId={sensorId}
+      sensorId={null}
     />
   );
 };

package/src/screens/AddNewGateway/ShareWifiPassword.js

@@ -105,6 +105,7 @@ const ShareWifiPassword = ({ route }) => {
         }
         if (ssid !== currentSsid) {
           clearInterval(checkWifiInterval);
+          setIsShowPopupPassword(false);
           navigation.navigate(Routes.ConnectingWifiDevice, {
             unitId,
             subUnit,
@@ -149,7 +150,7 @@ const ShareWifiPassword = ({ route }) => {
 
     socket.on('message', (msg, rinfo) => {
       if (handleSocketOnMsg(currentSsid, msg)) {
-        socket.close();
+        socket?.close();
         socket = null;
       }
     });

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

@@ -20,10 +20,6 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-jest.mock('react', () => {
-  return { ...jest.requireActual('react'), memo: (x) => x };
-});
-
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 

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

@@ -15,10 +15,6 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-jest.mock('react', () => {
-  return { ...jest.requireActual('react'), memo: (x) => x };
-});
-
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 

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

@@ -18,10 +18,6 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-jest.mock('react', () => {
-  return { ...jest.requireActual('react'), memo: (x) => x };
-});
-
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 
@@ -64,7 +60,8 @@ describe('Test connecting wifi device', () => {
     });
     const instance = tree.root;
     expect(instance.findAllByType(Processing)).toHaveLength(1);
-    jest.runAllTimers();
+    jest.runOnlyPendingTimers();
+
     expect(mock.history.post).toHaveLength(0);
     const connectingDevice = instance.findByType(ConnectingDevice);
     await act(async () => {

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

@@ -8,6 +8,7 @@ import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import api from '../../../utils/Apis/axios';
 import Processing from '../../../commons/Processing';
+import { Alert } from 'react-native';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -17,13 +18,21 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-jest.mock('react', () => {
-  return { ...jest.requireActual('react'), memo: (x) => x };
+jest.mock('react-native', () => {
+  const RN = jest.requireActual('react-native');
+  return Object.setPrototypeOf(
+    {
+      Alert: {
+        ...RN.Alert,
+        alert: jest.fn(),
+      },
+    },
+    RN
+  );
 });
 
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
-
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
@@ -66,10 +75,21 @@ describe('Test connecting modbus device', () => {
     expect(mock.history.post).toHaveLength(1);
   });
 
-  it('receive sensor-id from channel then rename sensor-id', async () => {
-    mock.onPost().reply(200, {
-      id: 1,
+  it('timeout', async () => {
+    jest.useFakeTimers();
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+
+    await act(async () => {
+      jest.runOnlyPendingTimers();
     });
+    expect(Alert.alert).toBeCalled();
+  });
+
+  it('receive sensor-id from channel then rename sensor-id', async () => {
+    mock.onPost().reply(200, {});
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -80,6 +100,9 @@ describe('Test connecting modbus device', () => {
         channel = channels[key];
       }
     }
+    await act(async () => {
+      await channel.trigger('progress', { data: { sensorId: 1 } });
+    });
     await act(async () => {
       await channel.trigger('progress', { success: 1 });
     });

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

@@ -18,13 +18,6 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 

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

@@ -15,10 +15,6 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-jest.mock('react', () => {
-  return { ...jest.requireActual('react'), memo: (x) => x };
-});
-
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 

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

@@ -13,10 +13,6 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-jest.mock('react', () => {
-  return { ...jest.requireActual('react'), memo: (x) => x };
-});
-
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 

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

@@ -13,10 +13,6 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-jest.mock('react', () => {
-  return { ...jest.requireActual('react'), memo: (x) => x };
-});
-
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 

package/src/screens/AddNewOneTap/__test__/AddNewOneTap.test.js

@@ -36,13 +36,6 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
 let tree;
 
 describe('test AddNewOneTap', () => {

package/src/screens/ConfirmUnitDeletion/__test__/ConfirmUnitDeletion.test.js

@@ -35,7 +35,6 @@ jest.mock('react', () => {
   return {
     ...jest.requireActual('react'),
     useState: jest.fn((init) => [init, mockSetState]),
-    memo: (x) => x,
   };
 });
 

package/src/screens/Device/EditDevice/__test__/EditDevice.test.js

@@ -23,13 +23,6 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
 const mockPop = jest.fn();
 const mockSetSensorDetail = jest.fn();
 jest.mock('@react-navigation/native', () => {

package/src/screens/Device/__test__/detail.test.js

@@ -735,7 +735,7 @@ describe('test DeviceDetail', () => {
   });
 
   it('Open popup ble when server down', async () => {
-    store.app.isBluetoothEnabled = false;
+    store.bluetooth.isEnabled = false;
     data_sensor_display.items[1].configuration.configuration.action1_data.command_prefer_over_bluetooth = true;
     const responseDisplay = {
       status: 200,

package/src/screens/Device/detail.js

@@ -101,7 +101,7 @@ const DeviceDetail = ({ route }) => {
     (state) => state.app.isNetworkConnected
   );
   const isBluetoothEnabled = useSCContextSelector((state) => {
-    return state.app.isBluetoothEnabled;
+    return state.bluetooth.isEnabled;
   });
 
   const { isConnected: isEoHBackendConnected } =
@@ -165,9 +165,7 @@ const DeviceDetail = ({ route }) => {
   }, [currentUserId, unit]);
 
   const fetchUnitDetail = useCallback(async () => {
-    const { success, data } = await axiosGet(API.UNIT.UNIT_DETAIL(unitId), {
-      headers: { 'Cache-Control': 'no-cache' },
-    });
+    const { success, data } = await axiosGet(API.UNIT.UNIT_DETAIL(unitId));
     if (success) {
       setUnit(data);
     }
@@ -181,7 +179,15 @@ const DeviceDetail = ({ route }) => {
 
   const { connectHomeAssistant } = useHomeAssistantConnection();
 
-  const { bluetoothScanDevices } = useBluetoothConnection();
+  const {
+    permissionsGranted: bluetoothPermGranted,
+    requestPerm: requestBluetoothPerm,
+    bluetoothScanDevices,
+  } = useBluetoothConnection();
+
+  useEffect(() => {
+    isDeviceHasBle && isBluetoothEnabled && requestBluetoothPerm();
+  }, [isDeviceHasBle, isBluetoothEnabled, requestBluetoothPerm]);
 
   useEffect(() => {
     if (
@@ -202,7 +208,7 @@ const DeviceDetail = ({ route }) => {
       bluetoothScanDevices([bluetooth.address]);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isBluetoothEnabled, controlOptions, unit]);
+  }, [isBluetoothEnabled, bluetoothPermGranted, controlOptions, unit]);
 
   const fetchSensorDetail = useCallback(async () => {
     const { success, data, resp_status } = await axiosGet(

package/src/screens/Device/hooks/useDisconnectedDevice.js

@@ -1,10 +1,12 @@
 import { useNavigation } from '@react-navigation/native';
-import { useCallback, useEffect } from 'react';
-import { Alert, Linking, Platform } from 'react-native';
+import { useState, useCallback, useEffect } from 'react';
+import { Linking, Platform } from 'react-native';
+import AlertAsync from 'react-native-alert-async';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { useSCContextSelector } from '../../../context';
-import { enableBluetoothForAndroid } from '../../../iot/RemoteControl/Bluetooth';
 import { ToastBottomHelper } from '../../../utils/Utils';
+import { enableBluetoothForAndroid } from '../../../iot/RemoteControl/Bluetooth';
+import { useBluetoothConnection } from '../../../hooks/IoT';
 
 export const useDisconnectedDevice = (
   sensorName,
@@ -12,10 +14,27 @@ export const useDisconnectedDevice = (
   serverDown
 ) => {
   const t = useTranslations();
+  const { goBack } = useNavigation();
+  const [allowEnableBluetooth, setAllowEnableBluetooth] = useState(false);
+
   const openBluetoothIOS = () => {
     Linking.openURL('App-Prefs:Bluetooth');
   };
-  const { goBack } = useNavigation();
+
+  const {
+    permissionsGranted: bluetoothPermGranted,
+    requestPerm: requestBluetoothPerm,
+  } = useBluetoothConnection();
+
+  useEffect(() => {
+    allowEnableBluetooth && bluetoothPermGranted && enableBluetoothForAndroid();
+  }, [allowEnableBluetooth, bluetoothPermGranted]);
+
+  const enableBluetooth = async () => {
+    setAllowEnableBluetooth(true);
+    !bluetoothPermGranted && (await requestBluetoothPerm());
+  };
+
   const actions =
     Platform.OS === 'ios'
       ? [
@@ -35,12 +54,12 @@ export const useDisconnectedDevice = (
           },
           {
             text: 'Open',
-            onPress: () => enableBluetoothForAndroid(),
+            onPress: () => enableBluetooth(),
           },
         ];
 
   const isBluetoothEnabled = useSCContextSelector(
-    (state) => state.app.isBluetoothEnabled
+    (state) => state.bluetooth.isEnabled
   );
   const isNetworkConnected = useSCContextSelector(
     (state) => state.app.isNetworkConnected
@@ -61,7 +80,7 @@ export const useDisconnectedDevice = (
             })
           );
         } else if (isBluetoothEnabled === false) {
-          Alert.alert(
+          AlertAsync(
             '',
             t(
               'your_connection_to_the_server_was_disconnected_please_open_the_bluetooth_to_continue'