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

package/src/screens/AddNewGateway/PlugAndPlay/FirstWarning.js

@@ -9,15 +9,17 @@ import { ViewButtonBottom } from '../../../commons';
 import { Colors } from '../../../configs';
 
 const FirstWarning = memo(({ route }) => {
-  const { unit_id } = route.params;
+  const { unit_id, unit_name } = route.params;
   const t = useTranslations();
   const { goBack, navigate } = useNavigation();
 
   const onRight = useCallback(() => {
     navigate(Routes.ScanChipQR, {
       unit_id: unit_id,
+      unit_name: unit_name,
+      isNewFlow: true,
     });
-  }, [navigate, unit_id]);
+  }, [navigate, unit_name, unit_id]);
 
   return (
     <View style={styles.screen}>

package/src/screens/AddNewOneTap/index.js

@@ -1,6 +1,6 @@
 import React, { memo, useCallback, useState } from 'react';
 import { ScrollView, SafeAreaView, Platform } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
+import { CommonActions, useNavigation } from '@react-navigation/native';
 
 import { API, Colors } from '../../configs';
 import { TESTID } from '../../configs/Constants';
@@ -12,7 +12,7 @@ import Text from '../../commons/Text';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { axiosPost, axiosPut } from '../../utils/Apis/axios';
 import Routes from '../../utils/Route';
-import { popAction, replace } from '../../navigations/utils';
+import { popAction } from '../../navigations/utils';
 import { AUTOMATE_TYPE } from '../../configs/Constants';
 
 const AddNewOneTap = memo(({ route }) => {
@@ -41,19 +41,33 @@ const AddNewOneTap = memo(({ route }) => {
       ? await axiosPut(API.AUTOMATE.UPDATE_AUTOMATE(automateId), params)
       : await axiosPost(API.AUTOMATE.CREATE_AUTOMATE(), params);
     if (success) {
-      dispatch(
-        replace(Routes.ScriptDetail, {
-          unit: unit,
-          id: data.id,
-          name: name,
-          type: type,
-          automate: { ...automate, ...data },
-          havePermission: true,
-          isCreateScriptSuccess: true,
-          isAutomateTab: isAutomateTab,
-          isMultiUnits,
-        })
-      );
+      navigate(Routes.ScriptDetail, {
+        unit: unit,
+        id: data.id,
+        name: name,
+        type: type,
+        automate: { ...automate, ...data },
+        havePermission: true,
+        isCreateScriptSuccess: true,
+        isAutomateTab: isAutomateTab,
+        isMultiUnits,
+      });
+      dispatch((state) => {
+        const routes = state.routes.filter(
+          (r) =>
+            r.name !== Routes.AddNewOneTap &&
+            r.name !== Routes.AddNewAutoSmart &&
+            r.name !== Routes.SelectUnit &&
+            r.name !== Routes.SelectSensorDevices &&
+            r.name !== Routes.SetSchedule &&
+            r.name !== Routes.SelectAction
+        );
+        return CommonActions.reset({
+          ...state,
+          routes,
+          index: routes.length - 1,
+        });
+      });
     }
   }, [
     isMultiUnits,
@@ -61,10 +75,11 @@ const AddNewOneTap = memo(({ route }) => {
     type,
     name,
     automateData,
-    automate,
     automateId,
-    dispatch,
+    navigate,
+    automate,
     isAutomateTab,
+    dispatch,
   ]);
 
   const onChangeName = useCallback((text) => {

package/src/screens/Automate/index.js

@@ -33,8 +33,8 @@ const Automate = () => {
   const prepareData = useCallback((rawData) => {
     rawData.forEach((item) => {
       item.automates = item.automates.sort((a, b) => {
-        const aIsStar = a.script.is_star;
-        const bIsStar = b.script.is_star;
+        const aIsStar = a.script?.is_star;
+        const bIsStar = b.script?.is_star;
         if ((aIsStar && bIsStar) || (!aIsStar && !bIsStar)) {
           return 0;
         } else if (aIsStar && !bIsStar) {

package/src/screens/Device/EditDevice/index.js

@@ -22,7 +22,8 @@ const EditDevice = memo(() => {
   const t = useTranslations();
   const navigation = useNavigation();
   const { params = {} } = useRoute();
-  const { sensor, setSensorNameDetail, sensorNameDetail } = params;
+  const { sensor, setSensorNameDetail, sensorNameDetail, setSensorDetail } =
+    params;
   const [inputName, setInputName] = useState(sensorNameDetail || '');
   const [sensorName, setSensorName] = useState(sensorNameDetail || '');
   const { stateAlertAction, hideAlertAction, onShowRename, onShowDelete } =
@@ -37,17 +38,18 @@ const EditDevice = memo(() => {
     if (success) {
       setSensorName(data?.name);
       setSensorNameDetail(data?.name);
+      setSensorDetail && setSensorDetail({ ...sensor, name: data?.name });
       ToastBottomHelper.success(t('rename_successfully'));
     } else {
       ToastBottomHelper.error(t('rename_failed'));
     }
     hideAlertAction();
   }, [
-    sensor.id,
+    sensor,
     inputName,
     hideAlertAction,
-    setSensorName,
     setSensorNameDetail,
+    setSensorDetail,
     t,
   ]);
 

package/src/screens/Device/components/SensorDisplayItem.js

@@ -18,6 +18,7 @@ import EmergencyDetail from '../../../commons/Device/Emergency/EmergencyDetail';
 import EmergencyButton from '../../../commons/Device/Emergency/EmergencyButton';
 import FooterInfo from '../../../commons/Device/FooterInfo';
 import MediaPlayerDetail from '../../../commons/MediaPlayerDetail';
+import SmartIr from '../../../screens/SmartIr';
 import { standardizeCameraScreenSize } from '../../../utils/Utils';
 import { Device } from '../../../configs';
 import { useSCContextSelector } from '../../../context';
@@ -122,6 +123,8 @@ export const SensorDisplayItem = ({
       }
     case 'info':
       return <FooterInfo data={item.configuration} />;
+    case 'smart_ir':
+      return <SmartIr item={item} />;
     default:
       break;
   }

package/src/screens/Device/detail.js

@@ -268,6 +268,7 @@ const DeviceDetail = ({ route }) => {
           sensor,
           setSensorNameDetail: setSensorName,
           sensorNameDetail: sensorName,
+          setSensorDetail: setSensor,
         },
       });
       menuItems.push({

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

@@ -6,7 +6,7 @@ import axios from 'axios';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import NotificationItem from '../components/NotificationItem';
-import { NOTIFICATION_TYPES } from '../../../configs/Constants';
+import { NOTIFICATION_TYPES, SENSOR_TYPE } from '../../../configs/Constants';
 import Routes from '../../../utils/Route';
 import { API } from '../../../configs';
 
@@ -130,6 +130,8 @@ describe('test NotificationItem', () => {
     NOTIFICATION_TYPES.NOTIFY_REMOVE_UNIT,
     NOTIFICATION_TYPES.NOTIFY_REMOVE_MEMBER,
     NOTIFICATION_TYPES.NOTIFY_MEMBER_LEAVE_UNIT,
+    NOTIFICATION_TYPES.NOTIFY_REMOVE_SUB_UNIT,
+    NOTIFICATION_TYPES.NOTIFY_REMOVE_DEVICE,
     'default case',
   ];
 
@@ -148,7 +150,13 @@ describe('test NotificationItem', () => {
     });
   }
 
-  const listSensorType = ['air_quality', 'turbidity', 'ph', 'clo', 'uv'];
+  const listSensorType = [
+    SENSOR_TYPE.AIR_QUALITY,
+    SENSOR_TYPE.TURBIDITY,
+    SENSOR_TYPE.PH,
+    SENSOR_TYPE.CLO,
+    SENSOR_TYPE.UV,
+  ];
   for (const sensorType of listSensorType) {
     test(`create ItemNotification NOTIFY_INDICATOR sensor_type ${sensorType}`, () => {
       item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;
@@ -179,7 +187,11 @@ describe('test NotificationItem', () => {
     });
   }
 
-  const listSensorType2 = ['smoke', 'fire'];
+  const listSensorType2 = [
+    SENSOR_TYPE.SMOKE,
+    SENSOR_TYPE.FIRE,
+    SENSOR_TYPE.SOS,
+  ];
   for (const sensorType of listSensorType2) {
     test(`create ItemNotification NOTIFY_INDICATOR sensor_type ${sensorType}`, () => {
       item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;

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';
@@ -224,7 +224,7 @@ const NotificationItem = memo(({ item }) => {
       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(
@@ -428,6 +444,9 @@ const NotificationItem = memo(({ item }) => {
               },
             });
           },
+          iconContent: (
+            <IconComponent icon={'home'} style={styles.backgroundSummer} />
+          ),
         };
       case NOTIFICATION_TYPES.NOTIFY_RENAME_SUB_UNIT:
         const stationId = paramsJSON?.sub_unit_id;
@@ -445,6 +464,31 @@ const NotificationItem = memo(({ item }) => {
               },
             });
           },
+          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 {

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,
       },
     };
   });

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

@@ -5,7 +5,17 @@ import { axiosPost } from '../../../utils/Apis/axios';
 import Routes from '../../../utils/Route';
 
 const useChipScan = (route) => {
-  const { unit_id, 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);
 
@@ -13,56 +23,92 @@ const useChipScan = (route) => {
     async (data) => {
       setLoading(true);
       const body = JSON.parse(data);
-      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,
-                  devicePrefixName,
-                  body,
-                });
+      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.navigate(Routes.ConnectingGateway, {
-                  new_chip,
-                  ...route.params,
-                });
+                navigation.goBack();
               }
-            } else {
-              navigation.goBack();
             }
+            break;
+          default:
+            navigation.goBack();
+            break;
+        }
+      } 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,
           }
-          break;
-        default:
+        );
+        if (success) {
+          navigation.navigate(Routes.ConnectingGateway, {
+            new_chip,
+            ...route.params,
+          });
+        } else {
           navigation.goBack();
-          break;
+        }
       }
     },
-    [imei, navigation, route.params, unit_id]
+    [
+      chipName,
+      imei,
+      isNewFlow,
+      navigation,
+      phoneNumber,
+      route.params,
+      station,
+      unit_id,
+      unit_name,
+      wifiName,
+      wifiPass,
+    ]
   );
 
   return {

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

@@ -159,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),
           }));
         }
       }