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

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

@@ -34,11 +34,11 @@ const NotificationItem = memo(({ item }) => {
   const customColorText = (text, params) => {
     return text.split('**').map((str, i) =>
       i % 2 === 0 ? (
-        <Text type="Body" key={i}>
+        <Text type="Body" key={i} style={styles.textNotification}>
           {str}
         </Text>
       ) : (
-        <Text type="Body" bold key={i}>
+        <Text type="Body" bold key={i} style={styles.textNotification}>
           {params[(i - 1) / 2]}
         </Text>
       )
@@ -49,6 +49,7 @@ const NotificationItem = memo(({ item }) => {
     const paramsJSON = JSON.parse(params.replace(regex, '"'));
     const booking_id = paramsJSON.booking_id && paramsJSON.booking_id;
     const unitId = paramsJSON?.unit_id;
+    const sensorId = paramsJSON?.sensor_id;
     switch (content_code) {
       case NOTIFICATION_TYPES.NOTIFY_INVITE_MEMBER:
         return {
@@ -79,7 +80,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
@@ -92,7 +93,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
@@ -104,7 +105,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
@@ -116,7 +117,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.MyBookingList,
+              screen: Routes.MyBookingList,
               params: { tab: 1 },
             }),
         };
@@ -128,7 +129,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.MyBookingList,
+              screen: Routes.MyBookingList,
               params: { tab: 1 },
             }),
         };
@@ -140,7 +141,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
@@ -152,7 +153,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.MyBookingList,
+              screen: Routes.MyBookingList,
               params: { tab: 1 },
             }),
         };
@@ -167,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 },
             }),
         };
@@ -179,7 +180,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
@@ -191,7 +192,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: booking_id },
             }),
         };
@@ -204,7 +205,7 @@ const NotificationItem = memo(({ item }) => {
           ),
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
-              screens: Routes.SmartParkingBookingDetails,
+              screen: Routes.SmartParkingBookingDetails,
               params: { id: new_booking_id },
             }),
         };
@@ -216,10 +217,135 @@ 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':
+            return {
+              content: customColorText(
+                t('text_notification_content_air_quality_high'),
+                arrParams
+              ),
+              redirect: () =>
+                navigation.navigate(Routes.UnitStack, {
+                  screen: Routes.UnitSummary,
+                  params: {
+                    summaryId: summary_id,
+                    unitId,
+                  },
+                }),
+              iconContent: <Image source={Images.logo} style={styles.logo} />,
+            };
+          case 'turbidity':
+            return {
+              content: customColorText(
+                t('text_notification_content_turbility_high'),
+                arrParams
+              ),
+              redirect: () =>
+                navigation.navigate(Routes.UnitStack, {
+                  screen: Routes.UnitSummary,
+                  params: {
+                    summaryId: summary_id,
+                    unitId,
+                  },
+                }),
+              iconContent: <Image source={Images.logo} style={styles.logo} />,
+            };
+          case 'ph':
+            return {
+              content: customColorText(
+                t('text_notification_content_pH_index_high'),
+                arrParams
+              ),
+              redirect: () =>
+                navigation.navigate(Routes.UnitStack, {
+                  screen: Routes.UnitSummary,
+                  params: {
+                    summaryId: summary_id,
+                    unitId,
+                  },
+                }),
+              iconContent: <Image source={Images.logo} style={styles.logo} />,
+            };
+          case 'clo':
+            return {
+              content: customColorText(
+                t('text_notification_content_clo_high'),
+                arrParams
+              ),
+              redirect: () =>
+                navigation.navigate(Routes.UnitStack, {
+                  screen: Routes.UnitSummary,
+                  params: {
+                    summaryId: summary_id,
+                    unitId,
+                  },
+                }),
+              iconContent: <Image source={Images.logo} style={styles.logo} />,
+            };
+          case 'uv':
+            return {
+              content: customColorText(
+                t('text_notification_content_uv_index_high'),
+                arrParams
+              ),
+              redirect: () =>
+                navigation.navigate(Routes.UnitStack, {
+                  screen: Routes.UnitSummary,
+                  params: {
+                    summaryId: summary_id,
+                    unitId,
+                  },
+                }),
+              iconContent: <Image source={Images.logo} style={styles.logo} />,
+            };
+          case 'smoke':
+            return {
+              content: customColorText(
+                t('text_notification_content_smoke'),
+                arrParams
+              ),
+              redirect: () =>
+                navigation.navigate(Routes.UnitStack, {
+                  screen: Routes.DeviceDetail,
+                  params: {
+                    unitId,
+                    sensorId,
+                  },
+                }),
+              iconContent: <Image source={Images.logo} style={styles.logo} />,
+            };
+          case 'fire':
+            return {
+              content: customColorText(
+                t('text_notification_content_fire'),
+                arrParams
+              ),
+              redirect: () =>
+                navigation.navigate(Routes.UnitStack, {
+                  screen: Routes.DeviceDetail,
+                  params: {
+                    unitId,
+                    sensorId,
+                  },
+                }),
+              iconContent: <Image source={Images.logo} style={styles.logo} />,
+            };
+          default:
+            return {
+              content: customColorText(
+                t('this_notification_will_be_updated_soon')
+              ),
+              redirect: () => null,
+              iconContent: <Image source={Images.logo} style={styles.logo} />,
+            };
+        }
+
       case NOTIFICATION_TYPES.NOTIFY_REMOVE_UNIT:
         const unitOwerName = paramsJSON?.unit_owner_name;
         const textNotify = unitOwerName
@@ -272,6 +398,54 @@ 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,
+              },
+            });
+          },
+        };
+      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,
+              },
+            });
+          },
+        };
       default:
         return {
           content: customColorText(t('this_notification_will_be_updated_soon')),

package/src/screens/Notification/styles/NotificationItemStyles.js

@@ -27,9 +27,6 @@ export default StyleSheet.create({
   time: {
     marginTop: 12,
   },
-  textNotification: {
-    lineHeight: 26,
-  },
   iconNotification: {
     width: '46%',
   },
@@ -52,4 +49,7 @@ export default StyleSheet.create({
     height: 20,
     resizeMode: 'contain',
   },
+  textNotification: {
+    lineHeight: 23,
+  },
 });

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

@@ -62,7 +62,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 +76,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 +87,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 +122,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,7 @@ 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, imei } = route.params;
   const navigation = useNavigation();
   const [loading, setLoading] = useState(false);
 
@@ -14,47 +13,56 @@ 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 (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,
+      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,
+            },
           });
-        } else {
-          navigation.navigate(Routes.ConnectingGateway, {
-            new_chip,
-            ...route.params,
-          });
-        }
-      } else {
-        navigation.goBack();
+          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,
+                });
+              } else {
+                navigation.navigate(Routes.ConnectingGateway, {
+                  new_chip,
+                  ...route.params,
+                });
+              }
+            } else {
+              navigation.goBack();
+            }
+          }
+          break;
+        default:
+          navigation.goBack();
+          break;
       }
     },
-    [
-      chipName,
-      imei,
-      navigation,
-      phoneNumber,
-      route.params,
-      station,
-      unit_id,
-      wifiName,
-      wifiPass,
-    ]
+    [imei, navigation, route.params, unit_id]
   );
 
   return {

package/src/screens/SubUnit/AddSubUnit.js

@@ -182,7 +182,10 @@ const AddSubUnit = ({ route }) => {
               />
 
               {isAddUnit && (
-                <TouchableWithoutFeedback onPress={onChooseLocation}>
+                <TouchableWithoutFeedback
+                  testID={TESTID.ADD_SUB_UNIT_BUTTON_CHOOSE_LOCATION}
+                  onPress={onChooseLocation}
+                >
                   <View style={styles.wrapGeolocation}>
                     <Text style={styles.addWallpaper}>{t('geolocation')}</Text>
                     <Text

package/src/screens/SubUnit/__test__/AddSubUnit.test.js

@@ -199,4 +199,152 @@ describe('Test AddSubUnit', () => {
       visibilityTime: 1000,
     });
   });
+
+  test('test create Unit', async () => {
+    const response = {
+      success: true,
+      status: 200,
+      data: {
+        id: 2,
+      },
+    };
+    route.params = {
+      ...route.params,
+      location: 'Unit address',
+      isAddUnit: true,
+    };
+
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+
+    const instance = tree.root;
+    const viewButtonBottom = await makeValidateData(instance);
+
+    await act(async () => {
+      await viewButtonBottom.props.onRightClick();
+    });
+    expect(axios.post).toHaveBeenCalled();
+    expect(mockedNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+      screen: Routes.UnitDetail,
+      params: {
+        unitId: response.data.id,
+        routeName: Routes.DashboardStack,
+      },
+    });
+  });
+
+  test('test choose Location', async () => {
+    route.params = {
+      ...route.params,
+      location: '',
+      isAddUnit: true,
+    };
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+
+    const instance = tree.root;
+    const buttonChooseLocation = instance.find(
+      (el) => el.props.testID === TESTID.ADD_SUB_UNIT_BUTTON_CHOOSE_LOCATION
+    );
+    act(() => {
+      buttonChooseLocation.props.onPress();
+    });
+    expect(mockedNavigate).toHaveBeenCalledWith(Routes.AddLocationMaps);
+  });
+
+  test('test create Unit Fail', async () => {
+    const response = {
+      success: false,
+      status: 400,
+    };
+    route.params = {
+      ...route.params,
+      location: 'Unit address',
+      isAddUnit: true,
+    };
+
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+
+    const instance = tree.root;
+    const viewButtonBottom = await makeValidateData(instance);
+
+    await act(async () => {
+      await viewButtonBottom.props.onRightClick();
+    });
+    expect(axios.post).toHaveBeenCalled();
+    expect(Toast.show).toHaveBeenCalledWith({
+      type: 'error',
+      position: 'bottom',
+      text1: getTranslate('en', 'text_create_unit_fail'),
+      visibilityTime: 1000,
+    });
+  });
+
+  test('test create sub-unit type AddHassiDevice', async () => {
+    const response = {
+      status: 200,
+      success: true,
+      data: {},
+    };
+    route.params = {
+      ...route.params,
+      addType: 'AddHassiDevice',
+    };
+
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const viewButtonBottom = await makeValidateData(instance);
+    await act(async () => {
+      await viewButtonBottom.props.onRightClick();
+    });
+    expect(axios.post).toHaveBeenCalled();
+    expect(mockedGoBack).toHaveBeenCalled();
+  });
+
+  test('test create sub-unit type AddNewGateway', async () => {
+    const response = {
+      status: 200,
+      success: true,
+      data: {},
+    };
+    route.params = {
+      ...route.params,
+      addType: 'AddNewGateway',
+    };
+
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const viewButtonBottom = await makeValidateData(instance);
+    await act(async () => {
+      await viewButtonBottom.props.onRightClick();
+    });
+    expect(axios.post).toHaveBeenCalled();
+    expect(mockedNavigate).toHaveBeenCalledWith(Routes.AddCommonSelectSubUnit, {
+      ...route.params,
+    });
+  });
 });