@eohjsc/react-native-smart-city 0.2.83 → 0.2.86

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

@@ -7,7 +7,7 @@ import styles from '../styles/NotificationItemStyles';
 import Text from '../../../commons/Text';
 import { Colors, API, Images } from '../../../configs';
 import IconComponent from '../../../commons/IconComponent';
-import { NOTIFICATION_TYPES } from '../../../configs/Constants';
+import { NOTIFICATION_TYPES, SENSOR_TYPE } from '../../../configs/Constants';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { axiosPost } from '../../../utils/Apis/axios';
 import Routes from '../../../utils/Route';
@@ -80,7 +80,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
@@ -93,7 +93,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
@@ -105,7 +105,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
@@ -117,7 +117,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.MyBookingList,
+              screen: Routes.MyBookingList,
               params: { tab: 1 },
             }),
         };
@@ -129,7 +129,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.MyBookingList,
+              screen: Routes.MyBookingList,
               params: { tab: 1 },
             }),
         };
@@ -141,7 +141,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
@@ -153,7 +153,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.MyBookingList,
+              screen: Routes.MyBookingList,
               params: { tab: 1 },
             }),
         };
@@ -168,7 +168,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: violated_booking_id || booking_id },
             }),
         };
@@ -180,7 +180,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
@@ -192,7 +192,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
@@ -205,7 +205,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: new_booking_id },
             }),
         };
@@ -217,14 +217,14 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
       case NOTIFICATION_TYPES.NOTIFY_INDICATOR:
         const { sensor_type, summary_id } = paramsJSON;
         switch (sensor_type) {
-          case 'air_quality':
+          case SENSOR_TYPE.AIR_QUALITY:
             return {
               content: customColorText(
                 t('text_notification_content_air_quality_high'),
@@ -240,7 +240,7 @@ const NotificationItem = memo(({ item }) => {
                 }),
               iconContent: <Image source={Images.logo} style={styles.logo} />,
             };
-          case 'turbidity':
+          case SENSOR_TYPE.TURBIDITY:
             return {
               content: customColorText(
                 t('text_notification_content_turbility_high'),
@@ -256,7 +256,7 @@ const NotificationItem = memo(({ item }) => {
                 }),
               iconContent: <Image source={Images.logo} style={styles.logo} />,
             };
-          case 'ph':
+          case SENSOR_TYPE.PH:
             return {
               content: customColorText(
                 t('text_notification_content_pH_index_high'),
@@ -272,7 +272,7 @@ const NotificationItem = memo(({ item }) => {
                 }),
               iconContent: <Image source={Images.logo} style={styles.logo} />,
             };
-          case 'clo':
+          case SENSOR_TYPE.CLO:
             return {
               content: customColorText(
                 t('text_notification_content_clo_high'),
@@ -288,7 +288,7 @@ const NotificationItem = memo(({ item }) => {
                 }),
               iconContent: <Image source={Images.logo} style={styles.logo} />,
             };
-          case 'uv':
+          case SENSOR_TYPE.UV:
             return {
               content: customColorText(
                 t('text_notification_content_uv_index_high'),
@@ -304,7 +304,7 @@ const NotificationItem = memo(({ item }) => {
                 }),
               iconContent: <Image source={Images.logo} style={styles.logo} />,
             };
-          case 'smoke':
+          case SENSOR_TYPE.SMOKE:
             return {
               content: customColorText(
                 t('text_notification_content_smoke'),
@@ -320,7 +320,7 @@ const NotificationItem = memo(({ item }) => {
                 }),
               iconContent: <Image source={Images.logo} style={styles.logo} />,
             };
-          case 'fire':
+          case SENSOR_TYPE.FIRE:
             return {
               content: customColorText(
                 t('text_notification_content_fire'),
@@ -336,6 +336,22 @@ const NotificationItem = memo(({ item }) => {
                 }),
               iconContent: <Image source={Images.logo} style={styles.logo} />,
             };
+          case SENSOR_TYPE.SOS:
+            return {
+              content: customColorText(
+                t('text_notification_content_active_sos'),
+                arrParams
+              ),
+              redirect: () =>
+                navigation.navigate(Routes.UnitStack, {
+                  screen: Routes.DeviceDetail,
+                  params: {
+                    unitId,
+                    sensorId,
+                  },
+                }),
+              iconContent: <Image source={Images.logo} style={styles.logo} />,
+            };
           default:
             return {
               content: customColorText(
@@ -398,6 +414,82 @@ const NotificationItem = memo(({ item }) => {
             <IconComponent icon={'home'} style={styles.backgroundSummer} />
           ),
         };
+      case NOTIFICATION_TYPES.NOTIFY_DEVICE_DISCONNECT:
+        return {
+          content: customColorText(
+            t('text_notification_content_divice_disconnect'),
+            arrParams
+          ),
+          redirect: () => {
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.DeviceDetail,
+              params: {
+                unitId,
+                sensorId,
+              },
+            });
+          },
+        };
+      case NOTIFICATION_TYPES.NOTIFY_UPDATE_ADDRESS:
+        return {
+          content: customColorText(
+            t('text_notification_content_update_address'),
+            arrParams
+          ),
+          redirect: () => {
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.UnitDetail,
+              params: {
+                unitId,
+              },
+            });
+          },
+          iconContent: (
+            <IconComponent icon={'home'} style={styles.backgroundSummer} />
+          ),
+        };
+      case NOTIFICATION_TYPES.NOTIFY_RENAME_SUB_UNIT:
+        const stationId = paramsJSON?.sub_unit_id;
+        return {
+          content: customColorText(
+            t('text_notification_content_rename_sub_unit'),
+            arrParams
+          ),
+          redirect: () => {
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.UnitDetail,
+              params: {
+                unitId,
+                stationId,
+              },
+            });
+          },
+          iconContent: (
+            <IconComponent icon={'home'} style={styles.backgroundSummer} />
+          ),
+        };
+      case NOTIFICATION_TYPES.NOTIFY_REMOVE_SUB_UNIT:
+        return {
+          content: customColorText(
+            t('text_notification_content_remove_sub_unit'),
+            arrParams
+          ),
+          redirect: () => null,
+          iconContent: (
+            <IconComponent icon={'home'} style={styles.backgroundSummer} />
+          ),
+        };
+      case NOTIFICATION_TYPES.NOTIFY_REMOVE_DEVICE:
+        return {
+          content: customColorText(
+            t('text_notification_content_remove_device'),
+            arrParams
+          ),
+          redirect: () => null,
+          iconContent: (
+            <IconComponent icon={'home'} style={styles.backgroundSummer} />
+          ),
+        };
       default:
         return {
           content: customColorText(t('this_notification_will_be_updated_soon')),

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

@@ -43,6 +43,7 @@ describe('test ScanChipQR', () => {
         station_id: 1,
         phoneNumber: '0909123456',
         chipName: 'Chip name',
+        isNewFlow: true,
       },
     };
   });
@@ -62,7 +63,7 @@ describe('test ScanChipQR', () => {
     expect(qrScan[0].props.loading).toEqual(false);
   });
 
-  test('onScan success', async () => {
+  test('onScan addDeviceNewFlow success', async () => {
     const new_chip = {
       id: 1,
       name: 'ABC',
@@ -76,7 +77,7 @@ describe('test ScanChipQR', () => {
     });
 
     let tree;
-    const body = { id: 1, imei: 'IMEI_X', name: 'New Chip' };
+    const body = { id: 1, imei: 'SENSOR-X341241', name: 'New Chip' };
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -87,10 +88,14 @@ describe('test ScanChipQR', () => {
       qrScan.props.onScan(JSON.stringify(body));
     });
     expect(qrScan.props.loading).toEqual(true);
-    expect(axios.post).toHaveBeenCalled();
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.ConnectingGateway, {
-      new_chip,
-      ...route.params,
+    expect(mockedNavigate).toHaveBeenCalledWith(Routes.AddDeviceStack, {
+      params: {
+        scan_sensor_data: { id: 1, imei: 'SENSOR-X341241', name: 'New Chip' },
+        addType: 'AddDeviceNewFlow',
+        devicePrefixName: 'SENSOR',
+        unit_id: undefined,
+      },
+      screen: 'AddGatewaySelectGateway',
     });
   });
 
@@ -118,7 +123,6 @@ describe('test ScanChipQR', () => {
       qrScan.props.onScan(JSON.stringify(body));
     });
     expect(qrScan.props.loading).toEqual(true);
-    expect(axios.post).toHaveBeenCalled();
     expect(mockedGoBack).toHaveBeenCalled();
   });
 });

package/src/screens/ScanChipQR/hooks/index.js

@@ -5,8 +5,17 @@ import { axiosPost } from '../../../utils/Apis/axios';
 import Routes from '../../../utils/Route';
 
 const useChipScan = (route) => {
-  const { unit_id, station, phoneNumber, chipName, wifiName, wifiPass, imei } =
-    route.params;
+  const {
+    unit_id,
+    unit_name,
+    imei,
+    isNewFlow,
+    phoneNumber,
+    chipName,
+    wifiName,
+    wifiPass,
+    station,
+  } = route.params;
   const navigation = useNavigation();
   const [loading, setLoading] = useState(false);
 
@@ -14,44 +23,89 @@ const useChipScan = (route) => {
     async (data) => {
       setLoading(true);
       const body = JSON.parse(data);
-      const { success, data: new_chip } = await axiosPost(
-        API.UNIT.CHIP_SCAN(unit_id),
-        {
-          imei: imei || body.imei,
-          qr_code: body.imei,
-          phone: phoneNumber,
-          name: chipName,
-          station: station,
-          wifi_ssid: wifiName,
-          wifi_pass: wifiPass,
+      if (isNewFlow) {
+        const devicePrefixName = body?.imei.split('-')[0];
+        switch (devicePrefixName) {
+          case 'SENSOR':
+            navigation.navigate(Routes.AddDeviceStack, {
+              screen: Routes.AddGatewaySelectGateway,
+              params: {
+                scan_sensor_data: { ...body },
+                addType: 'AddDeviceNewFlow',
+                unit_id: unit_id,
+                devicePrefixName,
+              },
+            });
+            break;
+          case 'ROBOT':
+          case 'LITE':
+            {
+              const { success, data: new_chip } = await axiosPost(
+                API.UNIT.CHIP_SCAN_GET_WIFI_INFO(),
+                {
+                  imei: imei || body.imei,
+                  qr_code: body.imei,
+                }
+              );
+              if (success) {
+                if (new_chip.is_wifi) {
+                  navigation.navigate(Routes.ConnectWifiWarning, {
+                    wifi_ssid: new_chip.wifi_ssid,
+                    wifi_pass: new_chip.wifi_pass,
+                    chip_id: new_chip.id,
+                    unit_id: unit_id,
+                    unit_name: unit_name,
+                    devicePrefixName,
+                    body,
+                  });
+                } else {
+                  navigation.navigate(Routes.ConnectingGateway, {
+                    new_chip,
+                    ...route.params,
+                  });
+                }
+              } else {
+                navigation.goBack();
+              }
+            }
+            break;
+          default:
+            navigation.goBack();
+            break;
         }
-      );
-      if (success) {
-        if (new_chip.is_wifi) {
-          navigation.navigate(Routes.ConnectWifiWarning, {
-            wifi_ssid: new_chip.wifi_ssid,
-            wifi_pass: new_chip.wifi_pass,
-            chip_id: new_chip.id,
-            unit_id: unit_id,
-          });
-        } else {
+      } else {
+        const { success, data: new_chip } = await axiosPost(
+          API.UNIT.CHIP_SCAN(unit_id),
+          {
+            imei: imei,
+            qr_code: body.imei,
+            phone: phoneNumber,
+            name: chipName,
+            station: station,
+            wifi_ssid: wifiName,
+            wifi_pass: wifiPass,
+          }
+        );
+        if (success) {
           navigation.navigate(Routes.ConnectingGateway, {
             new_chip,
             ...route.params,
           });
+        } else {
+          navigation.goBack();
         }
-      } else {
-        navigation.goBack();
       }
     },
     [
       chipName,
       imei,
+      isNewFlow,
       navigation,
       phoneNumber,
       route.params,
       station,
       unit_id,
+      unit_name,
       wifiName,
       wifiPass,
     ]

package/src/screens/ScriptDetail/index.js

@@ -236,12 +236,7 @@ const ScriptDetail = ({ route }) => {
   }, [name, automate]);
 
   const onGoBack = useCallback(() => {
-    if (isCreateScriptSuccess || isCreateNewAction) {
-      dispatch(popAction(5));
-      isAutomateTab && goBack();
-    } else {
-      goBack();
-    }
+    goBack();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isCreateScriptSuccess]);
 

package/src/screens/SelectUnit/index.js

@@ -93,6 +93,7 @@ const SelectUnit = () => {
     const isSelectedItem = selectedItem?.id === id;
     return (
       <TouchableOpacity
+        key={id}
         onPress={onPressItem(item)}
         style={styles.wrapItem}
         testID={TESTID.ITEM_UNIT}

package/src/screens/SharedUnit/index.js

@@ -128,7 +128,7 @@ const Shared = () => {
             renderItem={({ item, index }) => {
               return (
                 <SharedUnit
-                  key={`${item.id}-${item.is_star}-${item.is_pin}`}
+                  key={`${item.id}-${item?.is_star}-${item?.is_pin}`}
                   navigation={navigation}
                   item={item}
                   index={index}

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

@@ -0,0 +1,61 @@
+import React from 'react';
+import { TouchableOpacity } from 'react-native';
+import renderer, { act } from 'react-test-renderer';
+import SmartIr from '../index';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+
+const wrapComponent = (item) => (
+  <SCProvider initState={mockSCStore({})}>
+    <SmartIr item={item} />
+  </SCProvider>
+);
+const mockNavigate = jest.fn();
+jest.mock('@react-navigation/native', () => {
+  return {
+    ...jest.requireActual('@react-navigation/native'),
+    useNavigation: () => ({
+      navigate: mockNavigate,
+    }),
+  };
+});
+describe('Test SmartIr', () => {
+  let tree;
+  beforeEach(() => {
+    mockNavigate.mockClear();
+  });
+  test('render SmartIr', () => {
+    const item = {
+      configuration: { devices: [] },
+      id: 11,
+      order: 1,
+      template: 'smart_ir',
+      type: 'smart_ir',
+    };
+    act(() => {
+      tree = renderer.create(wrapComponent(item));
+    });
+    const instance = tree.root;
+    const itemAddNew = instance.findAllByType(TouchableOpacity);
+    expect(itemAddNew).toHaveLength(2);
+  });
+
+  test('render SmartIr on AddNew', () => {
+    const item = {
+      configuration: { devices: [] },
+      id: 11,
+      order: 1,
+      template: 'smart_ir',
+      type: 'smart_ir',
+    };
+    act(() => {
+      tree = renderer.create(wrapComponent(item));
+    });
+    const instance = tree.root;
+    const itemAddNew = instance.findAllByType(TouchableOpacity);
+    expect(itemAddNew).toHaveLength(2);
+    act(() => {
+      itemAddNew[0].props.onPress();
+    });
+  });
+});

package/src/screens/SmartIr/index.js

@@ -0,0 +1,23 @@
+import React, { memo, useCallback } from 'react';
+import { View, Alert } from 'react-native';
+import { useTranslations } from '../../hooks/Common/useTranslations';
+import ItemAddNew from '../../commons/Device/ItemAddNew';
+import styles from './styles';
+
+const SmartIr = memo(({ item }) => {
+  const t = useTranslations();
+  const AddRemoteControl = useCallback(() => {
+    Alert.alert(t('feature_under_development'));
+  }, [t]);
+  return (
+    <View style={styles.container}>
+      <ItemAddNew
+        title={t('add_remote_control')}
+        wrapStyle={styles.itemAddNew}
+        onAddNew={AddRemoteControl}
+      />
+    </View>
+  );
+});
+
+export default SmartIr;

package/src/screens/SmartIr/styles.js

@@ -0,0 +1,14 @@
+import { StyleSheet } from 'react-native';
+
+export default StyleSheet.create({
+  container: {
+    flex: 1,
+    paddingHorizontal: 16,
+  },
+  itemAddNew: {
+    flex: 1,
+    width: '100%',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+});

package/src/screens/Unit/AddMenu.js

@@ -56,7 +56,10 @@ const AddMenu = memo(({ unit, afterItemClick, showAdd, setHideAdd }) => {
         route: Routes.AddGatewayStack,
         text: t('gateway') + ' Wifi',
         image: <AddDeviceIcon width={43} height={43} />,
-        data: { screen: Routes.FirstWarning, params: { unit_id: unit.id } },
+        data: {
+          screen: Routes.FirstWarning,
+          params: { unit_id: unit?.id, unit_name: unit?.name },
+        },
       },
       {
         id: 6,

package/src/screens/Unit/Detail.js

@@ -11,7 +11,12 @@ import Summaries from './Summaries';
 
 import Text from '../../commons/Text';
 import { API } from '../../configs';
-import { useBoolean, useIsOwnerOfUnit, usePopover } from '../../hooks/Common';
+import {
+  useBlockBackAndroid,
+  useBoolean,
+  useIsOwnerOfUnit,
+  usePopover,
+} from '../../hooks/Common';
 import { scanBluetoothDevices } from '../../iot/RemoteControl/Bluetooth';
 import { googleHomeConnect } from '../../iot/RemoteControl/GoogleHome';
 import { axiosPost, fetchWithCache } from '../../utils/Apis/axios';
@@ -41,6 +46,7 @@ const UnitDetail = ({ route }) => {
     unitData,
     isOneTap,
     routeName,
+    stationId,
     isAddSubUnit,
     isSuccessfullyConnected,
   } = route.params;
@@ -48,6 +54,13 @@ const UnitDetail = ({ route }) => {
   const isFocused = useIsFocused();
   const { stateData, setAction } = useContext(SCContext);
   const { navigate } = useNavigation();
+  const RouterHardware = useCallback(
+    (routeHardware) => () => {
+      navigate(routeHardware);
+    },
+    [navigate]
+  );
+  useBlockBackAndroid(RouterHardware(Routes.Dashboard));
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
   const isLavidaSource = useSCContextSelector(
     (state) => state.app.isLavidaSource
@@ -146,7 +159,7 @@ const UnitDetail = ({ route }) => {
           ]);
           setFavorites((prevData) => ({
             ...prevData,
-            automates: data.filter((item) => item.script.is_star),
+            automates: data.filter((item) => item?.script?.is_star),
           }));
         }
       }
@@ -268,6 +281,15 @@ const UnitDetail = ({ route }) => {
     }
   }, [listMenuItem.length, isAddSubUnit]);
 
+  useEffect(() => {
+    if (listMenuItem.length && stationId) {
+      const getStationCurrent = listMenuItem.filter(
+        (item) => item?.station.id === stationId
+      );
+      setIndexStation(getStationCurrent[0]?.index);
+    }
+  }, [listMenuItem, listMenuItem.length, stationId]);
+
   const onSnapToItem = useCallback(
     (item, index) => {
       setStation(unit.stations[index]);

package/src/screens/Unit/ManageUnit.js

@@ -36,7 +36,7 @@ const ButtonWrapper = ({
     <TouchableOpacity
       onPress={onPress}
       testID={testId}
-      style={!icon ? styles.buttonWrapper : styles.buttonWrapperAvatar}
+      style={styles.buttonWrapper}
     >
       <View style={styles.buttonInfo}>
         {!icon ? (