@eohjsc/react-native-smart-city 0.3.37 → 0.3.39

package/src/screens/Device/detail.js

@@ -7,59 +7,57 @@ import React, {
   useContext,
 } from 'react';
 import { View, TouchableOpacity, Platform } from 'react-native';
-import { useTranslations } from '../../hooks/Common/useTranslations';
-import moment from 'moment';
-import { get } from 'lodash';
+import { useNavigation } from '@react-navigation/native';
 import { useSelector } from 'react-redux';
 import { IconFill, IconOutline } from '@ant-design/icons-react-native';
 import { Icon } from '@ant-design/react-native';
-import Routes from '../../utils/Route';
+import moment from 'moment';
+import { get } from 'lodash';
+
+import { SCContext } from '../../context';
+import { Action } from '../../context/actionType';
+import { useSCContextSelector } from '../../context';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 import { useCountUp } from './hooks/useCountUp';
-import { getData as getLocalData } from '../../utils/Storage';
-import { API, Colors } from '../../configs';
-import { axiosGet } from '../../utils/Apis/axios';
-import {
-  isDeviceConnected,
-  scanBluetoothDevices,
-} from '../../iot/RemoteControl/Bluetooth';
-import WrapHeaderScrollable from '../../commons/Sharing/WrapHeaderScrollable';
-import { getActionComponent } from '../../commons/ActionGroup';
-import { AlertSendConfirm } from '../../commons/EmergencyButton/AlertSendConfirm';
-import { AlertSent } from '../../commons/EmergencyButton/AlertSent';
 import {
   useAlertResolveEmergency,
   useEmergencyButton,
 } from './hooks/useEmergencyButton';
 import { useFavoriteDevice } from './hooks/useFavoriteDevice';
-import BottomButtonView from '../../commons/BottomButtonView';
-import Text from '../../commons/Text';
-import { AlertAction, ButtonPopup, MenuActionMore } from '../../commons';
-import { DEVICE_TYPE, AccessibilityLabel } from '../../configs/Constants';
-import { SCContext } from '../../context';
-import { Action } from '../../context/actionType';
-
 import { usePopover } from '../../hooks/Common';
 import { useConfigGlobalState } from '../../iot/states';
-import { useNavigation } from '@react-navigation/native';
-import styles from './styles';
-import {
-  useIsOwnerOfUnit,
-  useBoolean,
-  useHomeAssistantDeviceConnected,
-} from '../../hooks/Common';
+import { useIsOwnerOfUnit, useBoolean } from '../../hooks/Common';
 import {
+  useBluetoothConnection,
   useHomeAssistantConnection,
   useValueEvaluations,
+  useBluetoothDeviceConnected,
+  useHomeAssistantDeviceConnected,
+  useEoHBackendDeviceConnected,
 } from '../../hooks/IoT';
-import { SensorDisplayItem } from './components/SensorDisplayItem';
-import { useSCContextSelector } from '../../context';
-import { EmergencyCountdown } from './components/EmergencyCountdown';
-import { SensorConnectStatusViewHeader } from './components/SensorConnectStatusViewHeader';
 import { useDisconnectedDevice } from './hooks/useDisconnectedDevice';
 import { useEvaluateValue } from './hooks/useEvaluateValue';
 import { useDeviceWatchConfigControl } from './hooks/useDeviceWatchConfigControl';
+
+import WrapHeaderScrollable from '../../commons/Sharing/WrapHeaderScrollable';
+import { getActionComponent } from '../../commons/ActionGroup';
+import { AlertSendConfirm } from '../../commons/EmergencyButton/AlertSendConfirm';
+import { AlertSent } from '../../commons/EmergencyButton/AlertSent';
+import BottomButtonView from '../../commons/BottomButtonView';
+import Text from '../../commons/Text';
+import { AlertAction, ButtonPopup, MenuActionMore } from '../../commons';
+import { SensorDisplayItem } from './components/SensorDisplayItem';
+import { EmergencyCountdown } from './components/EmergencyCountdown';
+import { SensorConnectStatusViewHeader } from './components/SensorConnectStatusViewHeader';
 import { Card } from '../../commons/CardShadow';
 import PreventAccess from '../../commons/PreventAccess';
+
+import styles from './styles';
+import Routes from '../../utils/Route';
+import { getData as getLocalData } from '../../utils/Storage';
+import { API, Colors } from '../../configs';
+import { DEVICE_TYPE, AccessibilityLabel } from '../../configs/Constants';
+import { axiosGet } from '../../utils/Apis/axios';
 import { notImplemented } from '../../utils/Utils';
 
 const DeviceDetail = ({ route }) => {
@@ -102,20 +100,17 @@ const DeviceDetail = ({ route }) => {
   const isNetworkConnected = useSCContextSelector(
     (state) => state.app.isNetworkConnected
   );
-  const isBluetoothEnabled = useSCContextSelector((state) => {
-    return state.app.isBluetoothEnabled;
-  });
+
+  const { isConnected: isEoHBackendConnected } =
+    useEoHBackendDeviceConnected(sensor);
+
   const {
     isConnected: isHomeAssistantConnected,
     isConnecting: isHomeAssistantConnecting,
   } = useHomeAssistantDeviceConnected(sensor);
 
-  const isDeviceConnectedViaBle = useMemo(
-    () =>
-      isBluetoothEnabled &&
-      isDeviceConnected(sensor?.remote_control_options?.bluetooth?.address),
-    [sensor, isBluetoothEnabled]
-  );
+  const { isConnected: isBluetoothConnected } =
+    useBluetoothDeviceConnected(sensor);
 
   const isDeviceHasBle = useMemo(() => {
     const action = display.items.filter((item) => item.type === 'action');
@@ -183,6 +178,8 @@ const DeviceDetail = ({ route }) => {
 
   const { connectHomeAssistant } = useHomeAssistantConnection();
 
+  const { bluetoothScanDevices } = useBluetoothConnection();
+
   useEffect(() => {
     if (
       unit.remote_control_options &&
@@ -196,6 +193,14 @@ const DeviceDetail = ({ route }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [unit, isNetworkConnected]);
 
+  useEffect(() => {
+    if (controlOptions?.bluetooth) {
+      const bluetooth = controlOptions.bluetooth;
+      bluetoothScanDevices([bluetooth.address]);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [controlOptions, unit]);
+
   const fetchSensorDetail = useCallback(async () => {
     const { success, data, resp_status } = await axiosGet(
       API.DEVICE.SENSOR_DETAIL(sensorId || sensor?.id)
@@ -424,16 +429,9 @@ const DeviceDetail = ({ route }) => {
 
   const { countUpStr } = useCountUp(lastEvent.reportedAt);
 
-  useEffect(() => {
-    if (controlOptions?.bluetooth) {
-      const bluetooth = controlOptions.bluetooth;
-      scanBluetoothDevices([bluetooth.address]);
-    }
-  }, [controlOptions, unit]);
-
   useEffect(() => {
     fetchDataDeviceDetail();
-  }, [sensor, fetchDataDeviceDetail]);
+  }, [sensor, isNetworkConnected, fetchDataDeviceDetail]);
 
   const onRefresh = useCallback(() => {
     fetchSensorDetail();
@@ -542,6 +540,7 @@ const DeviceDetail = ({ route }) => {
       });
     };
     if (
+      isNetworkConnected &&
       sensor?.is_managed_by_backend &&
       sensor?.device_type !== DEVICE_TYPE.LG_THINQ
     ) {
@@ -553,7 +552,7 @@ const DeviceDetail = ({ route }) => {
         setLoading((preState) => ({ ...preState, isConnected: false }));
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [sensor, display]);
+  }, [sensor, display, isNetworkConnected]);
 
   const isShowEmergencyResolve =
     display.items.filter(
@@ -573,6 +572,7 @@ const DeviceDetail = ({ route }) => {
       params: { unitId: unit?.id, group },
     });
   }, [navigation, unit?.group, unit?.id]);
+
   const isHaveColorSliderTemplate = useMemo(() => {
     let isFlag = false;
     display?.items.some((item) => {
@@ -592,14 +592,8 @@ const DeviceDetail = ({ route }) => {
     return (
       <SensorConnectStatusViewHeader
         sensor={sensor}
-        connectedViaNetwork={
-          isNetworkConnected && displayValuesData.isConnected
-        }
-        connectedViaBle={
-          (!isNetworkConnected ||
-            (isNetworkConnected && !displayValuesData.isConnected)) &&
-          isDeviceConnectedViaBle
-        }
+        connectedViaNetwork={isEoHBackendConnected}
+        connectedViaBle={isBluetoothConnected}
         connectedViaHomeAssistant={isHomeAssistantConnected}
         isHomeAssistantConnecting={isHomeAssistantConnecting}
         lastUpdated={displayValuesData.lastUpdated}

package/src/screens/Notification/__test__/NotificationItem.test.js

@@ -6,14 +6,11 @@ import MockAdapter from 'axios-mock-adapter';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import NotificationItem from '../components/NotificationItem';
-import {
-  NOTIFICATION_TYPES,
-  SENSOR_TYPE,
-  EMERGENCY_TYPE,
-} from '../../../configs/Constants';
+import { NOTIFICATION_TYPES, EMERGENCY_TYPE } from '../../../configs/Constants';
 import Routes from '../../../utils/Route';
 import { API } from '../../../configs';
 import api from '../../../utils/Apis/axios';
+import { AccessibilityLabel } from '../../../configs/Constants';
 
 const wrapComponent = (item) => (
   <SCProvider initState={mockSCStore({})}>
@@ -132,17 +129,16 @@ describe('test NotificationItem', () => {
   }
 
   const listSensorType = [
-    SENSOR_TYPE.AIR_QUALITY,
-    SENSOR_TYPE.TURBIDITY,
-    SENSOR_TYPE.PH,
-    SENSOR_TYPE.CLO,
-    SENSOR_TYPE.UV,
+    NOTIFICATION_TYPES.AIR_QUALITY,
+    NOTIFICATION_TYPES.TURBIDITY,
+    NOTIFICATION_TYPES.PH,
+    NOTIFICATION_TYPES.CLO,
+    NOTIFICATION_TYPES.UV,
   ];
-  for (const sensorType of listSensorType) {
-    test(`create ItemNotification NOTIFY_INDICATOR sensor_type ${sensorType}`, async () => {
-      item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;
+  for (const content_code of listSensorType) {
+    test(`create ItemNotification ${content_code}`, async () => {
+      item.content_code = content_code;
       item.params = {
-        sensor_type: sensorType,
         unit_id: 5,
         summary_id: 11,
       };
@@ -164,32 +160,16 @@ describe('test NotificationItem', () => {
     });
   }
 
-  it('test case NOTIFY_INDICATOR no sensor_type', async () => {
-    item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;
-    item.params = {
-      sensor_type: null,
-      unit_id: 5,
-      summary_id: 11,
-    };
-    await act(async () => {
-      tree = await create(wrapComponent(item));
-    });
-    const instance = tree.root;
-    const button = instance.findAllByType(TouchableOpacity);
-    expect(button).toHaveLength(0);
-  });
-
   const listSensorType2 = [
-    SENSOR_TYPE.SMOKE,
-    SENSOR_TYPE.FIRE,
-    SENSOR_TYPE.SOS,
-    SENSOR_TYPE.FILTER_WATER,
+    NOTIFICATION_TYPES.SMOKE,
+    NOTIFICATION_TYPES.FIRE,
+    NOTIFICATION_TYPES.SOS,
+    NOTIFICATION_TYPES.FILTER_WATER,
   ];
-  for (const sensorType of listSensorType2) {
-    test(`create ItemNotification NOTIFY_INDICATOR sensor_type ${sensorType}`, async () => {
-      item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;
+  for (const content_code of listSensorType2) {
+    test(`create ItemNotification ${content_code}`, async () => {
+      item.content_code = content_code;
       item.params = {
-        sensor_type: sensorType,
         unit_id: 70,
         sensor_id: 394,
       };
@@ -212,10 +192,9 @@ describe('test NotificationItem', () => {
     });
   }
 
-  it('test onClick Item Notify', async () => {
-    item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;
+  test('test onClick Item Notify', async () => {
+    item.content_code = NOTIFICATION_TYPES.AIR_QUALITY;
     item.params = {
-      sensor_type: 'air_quality',
       unit_id: 5,
       summary_id: 11,
     };
@@ -314,4 +293,29 @@ describe('test NotificationItem', () => {
     const button = instance.findAllByType(TouchableOpacity);
     expect(button).toHaveLength(0);
   });
+
+  test('test case NOTIFY_REMOVE_UNIT to unit_onwer', async () => {
+    item.content_code = NOTIFICATION_TYPES.NOTIFY_REMOVE_UNIT;
+    item.params = {
+      unit_id: 1,
+      unit_owner_name: 'EoH owner',
+      unit_name: 'EoH',
+    };
+    await act(async () => {
+      tree = await create(wrapComponent(item));
+    });
+    const instance = tree.root;
+    const customText = instance.findByProps({
+      accessibilityLabel: AccessibilityLabel.CUSTOM_TEXT,
+    });
+    expect(customText.props.children[0].props.children).toEqual('Unit ');
+    expect(customText.props.children[1].props.children).toEqual('EoH');
+    expect(customText.props.children[2].props.children).toEqual(
+      ' has been removed by '
+    );
+    expect(customText.props.children[3].props.children).toEqual('EoH owner');
+    expect(customText.props.children[4].props.children).toEqual(
+      '. You cannot access to this unit anymore.'
+    );
+  });
 });

package/src/screens/Notification/components/NotificationItem.js

@@ -7,14 +7,11 @@ import styles from '../styles/NotificationItemStyles';
 import Text from '../../../commons/Text';
 import { Colors, API, Images } from '../../../configs';
 import IconComponent from '../../../commons/IconComponent';
-import {
-  NOTIFICATION_TYPES,
-  SENSOR_TYPE,
-  EMERGENCY_TYPE,
-} from '../../../configs/Constants';
+import { NOTIFICATION_TYPES, EMERGENCY_TYPE } from '../../../configs/Constants';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { axiosPost } from '../../../utils/Apis/axios';
 import Routes from '../../../utils/Route';
+import { AccessibilityLabel } from '../../../configs/Constants';
 
 const NotificationItem = memo(({ item }) => {
   const t = useTranslations();
@@ -63,141 +60,133 @@ const NotificationItem = memo(({ item }) => {
             />
           ),
         };
-      case NOTIFICATION_TYPES.NOTIFY_INDICATOR:
-        switch (params?.sensor_type) {
-          case SENSOR_TYPE.AIR_QUALITY:
-            return {
-              content: customColorText(
-                t('text_notification_content_air_quality_high')
-              ),
-              redirect: () =>
-                navigation.navigate(Routes.UnitStack, {
-                  screen: Routes.UnitSummary,
-                  params: {
-                    summaryId: params?.summary_id,
-                    unitId,
-                  },
-                }),
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
-            };
-          case SENSOR_TYPE.TURBIDITY:
-            return {
-              content: customColorText(
-                t('text_notification_content_turbility_high')
-              ),
-              redirect: () =>
-                navigation.navigate(Routes.UnitStack, {
-                  screen: Routes.UnitSummary,
-                  params: {
-                    summaryId: params?.summary_id,
-                    unitId,
-                  },
-                }),
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
-            };
-          case SENSOR_TYPE.PH:
-            return {
-              content: customColorText(
-                t('text_notification_content_pH_index_high')
-              ),
-              redirect: () =>
-                navigation.navigate(Routes.UnitStack, {
-                  screen: Routes.UnitSummary,
-                  params: {
-                    summaryId: params?.summary_id,
-                    unitId,
-                  },
-                }),
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
-            };
-          case SENSOR_TYPE.CLO:
-            return {
-              content: customColorText(t('text_notification_content_clo_high')),
-              redirect: () =>
-                navigation.navigate(Routes.UnitStack, {
-                  screen: Routes.UnitSummary,
-                  params: {
-                    summaryId: params?.summary_id,
-                    unitId,
-                  },
-                }),
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
-            };
-          case SENSOR_TYPE.UV:
-            return {
-              content: customColorText(
-                t('text_notification_content_uv_index_high')
-              ),
-              redirect: () =>
-                navigation.navigate(Routes.UnitStack, {
-                  screen: Routes.UnitSummary,
-                  params: {
-                    summaryId: params?.summary_id,
-                    unitId,
-                  },
-                }),
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
-            };
-          case SENSOR_TYPE.SMOKE:
-            return {
-              content: customColorText(t('text_notification_content_smoke')),
-              redirect: () =>
-                navigation.navigate(Routes.UnitStack, {
-                  screen: Routes.DeviceDetail,
-                  params: {
-                    unitId,
-                    sensorId,
-                  },
-                }),
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
-            };
-          case SENSOR_TYPE.FIRE:
-            return {
-              content: customColorText(t('text_notification_content_fire')),
-              redirect: () =>
-                navigation.navigate(Routes.UnitStack, {
-                  screen: Routes.DeviceDetail,
-                  params: {
-                    unitId,
-                    sensorId,
-                  },
-                }),
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
-            };
-          case SENSOR_TYPE.SOS:
-            return {
-              content: customColorText(
-                t('text_notification_content_active_sos')
-              ),
-              redirect: () =>
-                navigation.navigate(Routes.UnitStack, {
-                  screen: Routes.DeviceDetail,
-                  params: {
-                    unitId,
-                    sensorId,
-                  },
-                }),
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
-            };
-          case SENSOR_TYPE.FILTER_WATER:
-            return {
-              content: customColorText(
-                t('text_notification_content_replace_water_filter')
-              ),
-              redirect: () =>
-                navigation.navigate(Routes.UnitStack, {
-                  screen: Routes.DeviceDetail,
-                  params: {
-                    unitId,
-                    sensorId,
-                  },
-                }),
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
-            };
-          default:
-            return null;
-        }
-
+      case NOTIFICATION_TYPES.AIR_QUALITY:
+        return {
+          content: customColorText(
+            t('text_notification_content_air_quality_high')
+          ),
+          redirect: () =>
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.UnitSummary,
+              params: {
+                summaryId: params?.summary_id,
+                unitId,
+              },
+            }),
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
+      case NOTIFICATION_TYPES.TURBIDITY:
+        return {
+          content: customColorText(
+            t('text_notification_content_air_quality_high')
+          ),
+          redirect: () =>
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.UnitSummary,
+              params: {
+                summaryId: params?.summary_id,
+                unitId,
+              },
+            }),
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
+      case NOTIFICATION_TYPES.PH:
+        return {
+          content: customColorText(
+            t('text_notification_content_pH_index_high')
+          ),
+          redirect: () =>
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.UnitSummary,
+              params: {
+                summaryId: params?.summary_id,
+                unitId,
+              },
+            }),
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
+      case NOTIFICATION_TYPES.CLO:
+        return {
+          content: customColorText(t('text_notification_content_clo_high')),
+          redirect: () =>
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.UnitSummary,
+              params: {
+                summaryId: params?.summary_id,
+                unitId,
+              },
+            }),
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
+      case NOTIFICATION_TYPES.UV:
+        return {
+          content: customColorText(
+            t('text_notification_content_uv_index_high')
+          ),
+          redirect: () =>
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.UnitSummary,
+              params: {
+                summaryId: params?.summary_id,
+                unitId,
+              },
+            }),
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
+      case NOTIFICATION_TYPES.SMOKE:
+        return {
+          content: customColorText(t('text_notification_content_smoke')),
+          redirect: () =>
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.DeviceDetail,
+              params: {
+                unitId,
+                sensorId,
+              },
+            }),
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
+      case NOTIFICATION_TYPES.FIRE:
+        return {
+          content: customColorText(t('text_notification_content_fire')),
+          redirect: () =>
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.DeviceDetail,
+              params: {
+                unitId,
+                sensorId,
+              },
+            }),
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
+      case NOTIFICATION_TYPES.SOS:
+        return {
+          content: customColorText(t('text_notification_content_active_sos')),
+          redirect: () =>
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.DeviceDetail,
+              params: {
+                unitId,
+                sensorId,
+              },
+            }),
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
+      case NOTIFICATION_TYPES.FILTER_WATER:
+        return {
+          content: customColorText(
+            t('text_notification_content_replace_water_filter')
+          ),
+          redirect: () =>
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.DeviceDetail,
+              params: {
+                unitId,
+                sensorId,
+              },
+            }),
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
       case NOTIFICATION_TYPES.NOTIFY_REMOVE_UNIT:
         return {
           content: customColorText(
@@ -379,7 +368,11 @@ const NotificationItem = memo(({ item }) => {
         </View>
 
         <View style={styles.viewRight}>
-          <Text type="Body" color={Colors.Gray9}>
+          <Text
+            type="Body"
+            color={Colors.Gray9}
+            accessibilityLabel={AccessibilityLabel.CUSTOM_TEXT}
+          >
             {content}
           </Text>
           <Text color={Colors.Gray7} type="Label" style={[styles.time]}>

package/src/screens/SmartAccount/Connecting/index.js

@@ -32,6 +32,7 @@ const SmartAccountConnecting = ({ route }) => {
     smart_account_id,
     smart_account_id_from_backend,
     device_data,
+    chipId,
   } = route.params;
 
   const handleRefreshPercent = useCallback(() => {
@@ -60,6 +61,7 @@ const SmartAccountConnecting = ({ route }) => {
           device_data: data.sensors_unidentified || device_data,
           unit_id: unit_id,
           smart_account_id_from_backend: data.smart_account_id,
+          chipId: data?.chip_id,
         });
 
         clearTimeout(timeConnecting);
@@ -96,6 +98,7 @@ const SmartAccountConnecting = ({ route }) => {
           stationId,
           username,
           brand,
+          chipId,
         });
         clearTimeout(timeAddDevice);
       }, 1000);