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

package/src/screens/Device/detail.js

@@ -70,9 +70,13 @@ const DeviceDetail = ({ route }) => {
   // eslint-disable-next-line no-unused-vars
   const [configValues, setConfigValues] = useConfigGlobalState('configValues');
 
-  const { unit, sensor, isGGHomeConnected, station } = route.params;
-  const [isFavourite, setIsFavourite] = useState(sensor.is_favourite);
-  const { isOwner } = useIsOwnerOfUnit(unit.user_id);
+  const { unitData, unitId, sensorData, sensorId, isGGHomeConnected } =
+    route.params;
+  const [unit, setUnit] = useState(unitData || { id: unitId });
+  const [sensor, setSensor] = useState(sensorData || { id: sensorId });
+  const [station, setStation] = useState(sensor?.station);
+  const [isFavourite, setIsFavourite] = useState(sensor?.is_favourite);
+  const { isOwner } = useIsOwnerOfUnit(unit?.user_id);
   const [sensorName, setSensorName] = useState(sensor?.name);
   const [lockShowing, acquireLockShowing, releaseLockShowing] = useBoolean();
   const [showWindDirection, setShowWindDirection] = useState(false);
@@ -108,7 +112,7 @@ const DeviceDetail = ({ route }) => {
 
   const addToFavorites = useCallback(async () => {
     const { success } = await axiosPost(
-      API.SENSOR.ADD_TO_FAVOURITES(unit.id, sensor.station.id, sensor.id)
+      API.SENSOR.ADD_TO_FAVOURITES(unit?.id, sensor?.station?.id, sensor?.id)
     );
     if (success) {
       setIsFavourite(true);
@@ -117,7 +121,11 @@ const DeviceDetail = ({ route }) => {
 
   const removeFromFavorites = useCallback(async () => {
     const { success } = await axiosPost(
-      API.SENSOR.REMOVE_FROM_FAVOURITES(unit.id, sensor.station.id, sensor.id)
+      API.SENSOR.REMOVE_FROM_FAVOURITES(
+        unit?.id,
+        sensor?.station.id,
+        sensor?.id
+      )
     );
     if (success) {
       setIsFavourite(false);
@@ -129,9 +137,39 @@ const DeviceDetail = ({ route }) => {
   );
 
   const canManageSubUnit = useMemo(() => {
-    return currentUserId === unit.user_id;
+    return currentUserId === unit?.user_id;
   }, [currentUserId, unit]);
 
+  const fetchUnitDetail = useCallback(async () => {
+    const { success, data } = await axiosGet(API.UNIT.UNIT_DETAIL(unit?.id));
+    if (success) {
+      setUnit(data);
+    }
+  }, [unit?.id]);
+
+  useEffect(() => {
+    if (!unitData && unitId) {
+      fetchUnitDetail();
+    }
+  }, [fetchUnitDetail, unitData, unitId]);
+
+  const fetchSensorDetail = useCallback(async () => {
+    const { success, data } = await axiosGet(
+      API.SENSOR.SENSOR_DETAIL(sensor?.id)
+    );
+    if (success) {
+      setSensor(data);
+      setSensorName(data.name);
+      setStation(data.station);
+    }
+  }, [sensor?.id]);
+
+  useEffect(() => {
+    if (!sensorData && sensorId) {
+      fetchSensorDetail();
+    }
+  }, [fetchSensorDetail, sensorData, sensorId]);
+
   const fetchDataDeviceDetail = useCallback(async () => {
     if (!token) {
       return;
@@ -141,7 +179,7 @@ const DeviceDetail = ({ route }) => {
     }
 
     const displayResult = await axiosGet(
-      API.SENSOR.DISPLAY(sensor.id),
+      API.SENSOR.DISPLAY(sensor?.id),
       {},
       true
     );
@@ -168,7 +206,7 @@ const DeviceDetail = ({ route }) => {
     setLoading((preState) => ({ ...preState, displayTemplate: false }));
 
     const controlResult = await axiosGet(
-      API.SENSOR.REMOTE_CONTROL_OPTIONS(sensor.id),
+      API.SENSOR.REMOTE_CONTROL_OPTIONS(sensor?.id),
       {},
       true
     );
@@ -212,12 +250,12 @@ const DeviceDetail = ({ route }) => {
       menuItems.push({
         route: Routes.ActivityLog,
         data: {
-          id: sensor.id,
+          id: sensor?.id,
           type: 'action',
           share: unit,
           filterEnabled: {
             date: true,
-            user: Boolean(unit.id),
+            user: Boolean(unit?.id),
           },
         },
         text: t('activity_log'),
@@ -352,7 +390,7 @@ const DeviceDetail = ({ route }) => {
 
     const fetchValues = async () => {
       const { success, data } = await axiosGet(
-        API.SENSOR.DISPLAY_VALUES_V2(sensor.id),
+        API.SENSOR.DISPLAY_VALUES_V2(sensor?.id),
         {
           params: params,
         }
@@ -365,7 +403,7 @@ const DeviceDetail = ({ route }) => {
       }
       setLoading((preState) => ({ ...preState, isConnected: false }));
     };
-    if (sensor.is_managed_by_backend && !sensor.is_other_device) {
+    if (sensor?.is_managed_by_backend && !sensor?.is_other_device) {
       const updateInterval = setInterval(() => fetchValues(), 5000);
       fetchValues();
       return () => clearInterval(updateInterval);
@@ -405,12 +443,12 @@ const DeviceDetail = ({ route }) => {
     ).length > 0;
 
   const onSetupContacts = useCallback(() => {
-    const group = unit.group;
+    const group = unit?.group;
     navigation.navigate(Routes.EmergencyContactsStack, {
       screen: Routes.EmergencyContactsList,
-      params: { unitId: unit.id, group },
+      params: { unitId: unit?.id, group },
     });
-  }, [navigation, unit.group, unit.id]);
+  }, [navigation, unit?.group, unit?.id]);
 
   // replace isConnected=True to see template
   const renderSensorConnected = () => {
@@ -448,12 +486,12 @@ const DeviceDetail = ({ route }) => {
 
   const getDataFromLocal = async () => {
     const displayData = await getLocalData(
-      `@CACHE_REQUEST_${API.SENSOR.DISPLAY(sensor.id)}`
+      `@CACHE_REQUEST_${API.SENSOR.DISPLAY(sensor?.id)}`
     );
     displayData && setDisplay(JSON.parse(displayData));
 
     const controlOptionData = await getLocalData(
-      `@CACHE_REQUEST_${API.SENSOR.REMOTE_CONTROL_OPTIONS(sensor.id)}`
+      `@CACHE_REQUEST_${API.SENSOR.REMOTE_CONTROL_OPTIONS(sensor?.id)}`
     );
     controlOptionData && setControlOptions(JSON.parse(controlOptionData));
     setLoading((preState) => ({ ...preState, displayTemplate: false }));
@@ -557,7 +595,7 @@ const DeviceDetail = ({ route }) => {
           onSendNowAlert={onSendNowAlert}
           onHide={releaseLockShowing}
           unit={unit}
-          station={sensor.station}
+          station={sensor?.station}
         />
 
         <AlertSent
@@ -566,7 +604,7 @@ const DeviceDetail = ({ route }) => {
           onPressMain={onViewDetails}
           onHide={releaseLockShowing}
           unit={unit}
-          station={sensor.station}
+          station={sensor?.station}
         />
       </WrapHeaderScrollable>
       {isShowEmergencyResolve && (
@@ -605,7 +643,7 @@ const DeviceDetail = ({ route }) => {
             type="H4"
             style={styles.textName}
           >
-            {unit.name} - {sensor.station.name}
+            {unit?.name} - {sensor?.station?.name}
           </Text>
           <IconFill
             testID={TESTID.BUTTON_POPUP_RESOLVED_ICON}

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

@@ -1,12 +1,14 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
 import { TouchableOpacity } from 'react-native';
+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 Routes from '../../../utils/Route';
+import { API } from '../../../configs';
 
 const wrapComponent = (item) => (
   <SCProvider initState={mockSCStore({})}>
@@ -14,6 +16,8 @@ const wrapComponent = (item) => (
   </SCProvider>
 );
 
+jest.mock('axios');
+
 const mockNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
   return {
@@ -27,6 +31,7 @@ jest.mock('@react-navigation/native', () => {
 describe('test NotificationItem', () => {
   let item = {};
   beforeEach(() => {
+    mockNavigate.mockClear();
     item = {
       id: 1,
       content_code: '',
@@ -41,19 +46,84 @@ describe('test NotificationItem', () => {
   });
   let tree;
   const listCase = [
-    NOTIFICATION_TYPES.REMIND_TO_MAKE_PAYMENT,
-    NOTIFICATION_TYPES.EXPIRE_PARKING_SESSION,
-    NOTIFICATION_TYPES.REMIND_TO_SCAN_QR_CODE,
-    NOTIFICATION_TYPES.USER_CANCEL,
-    NOTIFICATION_TYPES.SYSTEM_CANCEL_NO_PAYMENT,
-    NOTIFICATION_TYPES.BOOKING_SUCCESSFULLY,
-    NOTIFICATION_TYPES.PARKING_COMPLETED,
-    NOTIFICATION_TYPES.BOOKING_EXPIRED_AND_VIOLATION_CREATED,
-    NOTIFICATION_TYPES.MOVE_CAR_WITHOUT_PAY_VIOLATION,
-    NOTIFICATION_TYPES.PAY_FINE_SUCCESSFULLY,
+    {
+      content_code: NOTIFICATION_TYPES.REMIND_TO_MAKE_PAYMENT,
+      screen: Routes.SmartParkingBookingDetails,
+      params: { id: 1 },
+    },
+    {
+      content_code: NOTIFICATION_TYPES.EXPIRE_PARKING_SESSION,
+      screen: Routes.SmartParkingBookingDetails,
+      params: { id: 1 },
+    },
+    {
+      content_code: NOTIFICATION_TYPES.REMIND_TO_SCAN_QR_CODE,
+      screen: Routes.SmartParkingBookingDetails,
+      params: { id: 1 },
+    },
+    {
+      content_code: NOTIFICATION_TYPES.USER_CANCEL,
+      screen: Routes.MyBookingList,
+      params: { tab: 1 },
+    },
+    {
+      content_code: NOTIFICATION_TYPES.SYSTEM_CANCEL_NO_PAYMENT,
+      screen: Routes.MyBookingList,
+      params: { tab: 1 },
+    },
+    {
+      content_code: NOTIFICATION_TYPES.BOOKING_SUCCESSFULLY,
+      screen: Routes.SmartParkingBookingDetails,
+      params: { id: 1 },
+    },
+    {
+      content_code: NOTIFICATION_TYPES.PARKING_COMPLETED,
+      screen: Routes.MyBookingList,
+      params: { tab: 1 },
+    },
+    {
+      content_code: NOTIFICATION_TYPES.BOOKING_EXPIRED_AND_VIOLATION_CREATED,
+      screen: Routes.SmartParkingBookingDetails,
+      params: { id: 1 },
+    },
+    {
+      content_code: NOTIFICATION_TYPES.MOVE_CAR_WITHOUT_PAY_VIOLATION,
+      screen: Routes.SmartParkingBookingDetails,
+      params: { id: 1 },
+    },
+    {
+      content_code: NOTIFICATION_TYPES.PAY_FINE_SUCCESSFULLY,
+      screen: Routes.SmartParkingBookingDetails,
+      params: { id: 1 },
+    },
   ];
 
-  for (const content_code of listCase) {
+  for (const notify of listCase) {
+    test(`create ItemNotification ${notify.content_code}`, () => {
+      item.content_code = notify.content_code;
+      act(() => {
+        tree = create(wrapComponent(item));
+      });
+      const instance = tree.root;
+      const button = instance.findByType(TouchableOpacity);
+      act(() => {
+        button.props.onPress();
+      });
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.SmartParkingStack, {
+        screens: notify.screen,
+        params: notify.params,
+      });
+    });
+  }
+
+  const listCase2 = [
+    NOTIFICATION_TYPES.NOTIFY_REMOVE_UNIT,
+    NOTIFICATION_TYPES.NOTIFY_REMOVE_MEMBER,
+    NOTIFICATION_TYPES.NOTIFY_MEMBER_LEAVE_UNIT,
+    'default case',
+  ];
+
+  for (const content_code of listCase2) {
     test(`create ItemNotification ${content_code}`, () => {
       item.content_code = content_code;
       act(() => {
@@ -64,12 +134,114 @@ describe('test NotificationItem', () => {
       act(() => {
         button.props.onPress();
       });
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.SmartParkingStack, {
-        screens: Routes.SmartParkingBookingDetails,
+      expect(mockNavigate).not.toHaveBeenCalled();
+    });
+  }
+
+  const listSensorType = ['air_quality', 'turbidity', 'ph', 'clo', 'uv'];
+  for (const sensorType of listSensorType) {
+    test(`create ItemNotification NOTIFY_INDICATOR sensor_type ${sensorType}`, () => {
+      item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;
+      item.params = JSON.stringify({
+        unit_name: 'EoH Office',
+        status: 'Very Poor',
+        sensor_type: sensorType,
+        unit_id: 5,
+        summary_id: 11,
+        sensor_id: '',
+      });
+
+      act(() => {
+        tree = create(wrapComponent(item));
+      });
+      const instance = tree.root;
+      const button = instance.findByType(TouchableOpacity);
+      act(() => {
+        button.props.onPress();
+      });
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+        screen: Routes.UnitSummary,
+        params: {
+          summaryId: 11,
+          unitId: 5,
+        },
+      });
+    });
+  }
+
+  const listSensorType2 = ['smoke', 'fire'];
+  for (const sensorType of listSensorType2) {
+    test(`create ItemNotification NOTIFY_INDICATOR sensor_type ${sensorType}`, () => {
+      item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;
+      item.params = JSON.stringify({
+        unit_name: 'Lavida Smart Home',
+        status: '',
+        sensor_type: sensorType,
+        unit_id: 70,
+        summary_id: '',
+        sensor_id: 394,
+      });
+
+      act(() => {
+        tree = create(wrapComponent(item));
+      });
+      const instance = tree.root;
+      const button = instance.findByType(TouchableOpacity);
+      act(() => {
+        button.props.onPress();
+      });
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+        screen: Routes.DeviceDetail,
         params: {
-          id: 1,
+          unitId: 70,
+          sensorId: 394,
         },
       });
     });
   }
+
+  test('test onClick Item Notify', () => {
+    item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;
+    item.params = JSON.stringify({
+      unit_name: 'EoH Office',
+      status: 'Very Poor',
+      sensor_type: 'air_quality',
+      unit_id: 5,
+      summary_id: 11,
+      sensor_id: '',
+    });
+    item.is_read = false;
+    act(() => {
+      tree = create(wrapComponent(item));
+    });
+    const instance = tree.root;
+    const button = instance.findByType(TouchableOpacity);
+    act(() => {
+      button.props.onPress();
+    });
+    expect(axios.post).toHaveBeenCalledWith(API.NOTIFICATION.SET_READ(1));
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+      screen: Routes.UnitSummary,
+      params: {
+        summaryId: 11,
+        unitId: 5,
+      },
+    });
+  });
+
+  test('test render Notify not in any case', () => {
+    item.content_code = 'NEW CASE';
+    item.params = JSON.stringify({
+      unit_id: 1,
+    });
+    act(() => {
+      tree = create(wrapComponent(item));
+    });
+    const instance = tree.root;
+    const button = instance.findByType(TouchableOpacity);
+    act(() => {
+      button.props.onPress();
+    });
+    expect(mockNavigate).not.toHaveBeenCalledWith();
+  });
 });

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 {
@@ -220,6 +221,131 @@ const NotificationItem = memo(({ item }) => {
               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

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/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