@eohjsc/react-native-smart-city 0.3.21 → 0.3.24

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

@@ -7,7 +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 } from '../../../configs/Constants';
+import {
+  NOTIFICATION_TYPES,
+  SENSOR_TYPE,
+  EMERGENCY_TYPE,
+} from '../../../configs/Constants';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { axiosPost } from '../../../utils/Apis/axios';
 import Routes from '../../../utils/Route';
@@ -18,28 +22,14 @@ const NotificationItem = memo(({ item }) => {
   const { id, icon, created_at, is_read, params, content_code } = item;
   const [isRead, setIsRead] = useState(is_read);
   const timeFormat = moment(created_at).format('LT DD/MM/YYYY');
-  const regex = useMemo(() => {
-    return /\B'|'\B/g;
-  }, []);
-
-  const paramsJSON = useMemo(() => {
-    if (typeof params === 'object') {
-      return params;
-    }
-    // TODO return this later
-    let stringParams = JSON.stringify(params);
-    stringParams = stringParams.replace(regex, '"');
-    stringParams = stringParams.substring(1, stringParams.length - 1);
-    return JSON.parse(stringParams);
-  }, [params, regex]);
 
   let arrParams = useMemo(() => {
     const values = [];
-    Object.entries(paramsJSON).forEach(([key, value]) => {
+    Object.entries(params).forEach(([key, value]) => {
       values.push(value);
     });
     return values;
-  }, [paramsJSON]);
+  }, [params]);
 
   const customColorText = (text, colorParams) => {
     return text.split('**').map((str, i) =>
@@ -56,9 +46,9 @@ const NotificationItem = memo(({ item }) => {
   };
 
   const renderItem = useCallback(() => {
-    const booking_id = paramsJSON.booking_id && paramsJSON.booking_id;
-    const unitId = paramsJSON?.unit_id;
-    const sensorId = paramsJSON?.sensor_id;
+    const booking_id = params?.booking_id && params?.booking_id;
+    const unitId = params?.unit_id;
+    const sensorId = params?.sensor_id;
     switch (content_code) {
       case NOTIFICATION_TYPES.NOTIFY_INVITE_MEMBER:
         return {
@@ -177,7 +167,7 @@ const NotificationItem = memo(({ item }) => {
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
               screen: Routes.SmartParkingBookingDetails,
-              params: { id: paramsJSON.violated_booking_id || booking_id },
+              params: { id: params?.violated_booking_id || booking_id },
             }),
         };
       case NOTIFICATION_TYPES.MOVE_CAR_WITHOUT_PAY_VIOLATION:
@@ -213,7 +203,7 @@ const NotificationItem = memo(({ item }) => {
           redirect: () =>
             navigation.navigate(Routes.SmartParkingStack, {
               screen: Routes.SmartParkingBookingDetails,
-              params: { id: paramsJSON.booking_id_new },
+              params: { id: params?.booking_id_new },
             }),
         };
       case NOTIFICATION_TYPES.STOP_VIOLATION_FREE_PARKING_ZONE:
@@ -229,7 +219,7 @@ const NotificationItem = memo(({ item }) => {
             }),
         };
       case NOTIFICATION_TYPES.NOTIFY_INDICATOR:
-        switch (paramsJSON.sensor_type) {
+        switch (params?.sensor_type) {
           case SENSOR_TYPE.AIR_QUALITY:
             return {
               content: customColorText(
@@ -240,7 +230,7 @@ const NotificationItem = memo(({ item }) => {
                 navigation.navigate(Routes.UnitStack, {
                   screen: Routes.UnitSummary,
                   params: {
-                    summaryId: paramsJSON.summary_id,
+                    summaryId: params?.summary_id,
                     unitId,
                   },
                 }),
@@ -256,7 +246,7 @@ const NotificationItem = memo(({ item }) => {
                 navigation.navigate(Routes.UnitStack, {
                   screen: Routes.UnitSummary,
                   params: {
-                    summaryId: paramsJSON.summary_id,
+                    summaryId: params?.summary_id,
                     unitId,
                   },
                 }),
@@ -272,7 +262,7 @@ const NotificationItem = memo(({ item }) => {
                 navigation.navigate(Routes.UnitStack, {
                   screen: Routes.UnitSummary,
                   params: {
-                    summaryId: paramsJSON.summary_id,
+                    summaryId: params?.summary_id,
                     unitId,
                   },
                 }),
@@ -288,7 +278,7 @@ const NotificationItem = memo(({ item }) => {
                 navigation.navigate(Routes.UnitStack, {
                   screen: Routes.UnitSummary,
                   params: {
-                    summaryId: paramsJSON.summary_id,
+                    summaryId: params?.summary_id,
                     unitId,
                   },
                 }),
@@ -304,7 +294,7 @@ const NotificationItem = memo(({ item }) => {
                 navigation.navigate(Routes.UnitStack, {
                   screen: Routes.UnitSummary,
                   params: {
-                    summaryId: paramsJSON.summary_id,
+                    summaryId: params?.summary_id,
                     unitId,
                   },
                 }),
@@ -387,7 +377,7 @@ const NotificationItem = memo(({ item }) => {
       case NOTIFICATION_TYPES.NOTIFY_REMOVE_UNIT:
         return {
           content: customColorText(
-            paramsJSON?.unit_owner_name
+            params?.unit_owner_name
               ? t('text_notification_content_remove_unit_to_member')
               : t('text_notification_content_remove_unit_to_owner'),
             arrParams
@@ -482,7 +472,7 @@ const NotificationItem = memo(({ item }) => {
               screen: Routes.UnitDetail,
               params: {
                 unitId,
-                stationId: paramsJSON?.sub_unit_id,
+                stationId: params?.sub_unit_id,
               },
             });
           },
@@ -512,6 +502,49 @@ const NotificationItem = memo(({ item }) => {
             <IconComponent icon={'home'} style={styles.backgroundSummer} />
           ),
         };
+      case NOTIFICATION_TYPES.NOTIFY_EMERGENCY:
+        switch (params?.type) {
+          case EMERGENCY_TYPE.CREATED:
+            return {
+              content: customColorText(
+                t('text_notification_content_emergency'),
+                arrParams
+              ),
+              redirect: () =>
+                navigation.navigate(Routes.UnitStack, {
+                  screen: Routes.DeviceDetail,
+                  params: {
+                    unitId,
+                    sensorId,
+                  },
+                }),
+              iconContent: <Image source={Images.logo} style={styles.logo} />,
+            };
+          case EMERGENCY_TYPE.RESOLVE:
+            return {
+              content: customColorText(
+                t('text_notification_content_emergency_resolve'),
+                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} />,
+            };
+        }
       default:
         return {
           content: customColorText(t('this_notification_will_be_updated_soon')),
@@ -519,7 +552,7 @@ const NotificationItem = memo(({ item }) => {
           iconContent: <Image source={Images.logo} style={styles.logo} />,
         };
     }
-  }, [arrParams, content_code, navigation, paramsJSON, t]);
+  }, [arrParams, content_code, navigation, params, t]);
 
   const { content, redirect, iconContent } = renderItem() || {};
 

package/src/screens/PlayBackCamera/index.js

@@ -62,6 +62,16 @@ const PlayBackCamera = () => {
     dateTemp = date;
   }, [selected]);
 
+  const getHourWithTimeZone = useCallback(
+    // eslint-disable-next-line no-shadow
+    (hour) => {
+      const hourWithTimezone =
+        parseInt(hour, 10) + parseInt(item?.configuration?.time_zone || 0, 10);
+      return hourWithTimezone < 10 ? '0' + hourWithTimezone : hourWithTimezone;
+    },
+    [item?.configuration?.time_zone]
+  );
+
   const onChangeValue = useCallback(
     (value, selectedTime) => {
       if (!isFirstTime) {
@@ -87,7 +97,7 @@ const PlayBackCamera = () => {
           setUri(
             `${playback.split('=')[0]}=${date[0]}${date[1]}${
               date[2]
-            }T${h}${m}${s}Z`
+            }T${getHourWithTimeZone(h)}${m}${s}Z`
           );
         }
         const to = setTimeout(() => {
@@ -96,7 +106,13 @@ const PlayBackCamera = () => {
         }, 100);
       }
     },
-    [arrHourTemp, item?.configuration, now]
+    [
+      arrHourTemp,
+      getHourWithTimeZone,
+      item?.configuration?.playback,
+      item?.configuration?.uri,
+      now,
+    ]
   );
 
   useEffect(() => {
@@ -111,9 +127,9 @@ const PlayBackCamera = () => {
       setUri(item?.configuration?.uri);
     } else {
       setUri(
-        `${playback.split('=')[0]}=${date[0]}${date[1]}${date[2]}T${hour.h}${
-          hour.m
-        }${hour.s}Z`
+        `${playback.split('=')[0]}=${date[0]}${date[1]}${
+          date[2]
+        }T${getHourWithTimeZone(hour.h)}${hour.m}${hour.s}Z`
       );
     }
     const to = setTimeout(() => {
@@ -121,7 +137,7 @@ const PlayBackCamera = () => {
       clearTimeout(to);
     }, 100);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selected]);
+  }, [selected, getHourWithTimeZone]);
 
   useEffect(() => {
     // eslint-disable-next-line react-hooks/rules-of-hooks

package/src/screens/ScriptDetail/hooks/useStarredScript.js

@@ -14,14 +14,14 @@ export const useStarredScript = (automate) => {
 
   const starScript = useCallback(async () => {
     const { success } = await axiosPost(API.AUTOMATE.STAR_SCRIPT(automate?.id));
-    success && setAction(Action.STAR_SCRIPT, automate?.script?.id);
+    success && setAction(Action.STAR_SCRIPTS, [automate?.script?.id]);
   }, [automate, setAction]);
 
   const unstarScript = useCallback(async () => {
     const { success } = await axiosPost(
       API.AUTOMATE.UNSTAR_SCRIPT(automate?.id)
     );
-    success && setAction(Action.UNSTAR_SCRIPT, automate?.script?.id);
+    success && setAction(Action.UNSTAR_SCRIPTS, [automate?.script?.id]);
   }, [automate, setAction]);
 
   return {

package/src/screens/SubUnit/AddSubUnit.js

@@ -83,7 +83,7 @@ const AddSubUnit = ({ route }) => {
         awaitCreate.current = true;
         const dataObj = { name: roomName, background: wallpaper };
         const formData = createFormData(dataObj, ['background']);
-        const { success } = await axiosPost(
+        const { success, data } = await axiosPost(
           API.SUB_UNIT.CREATE_SUB_UNIT(unit.id),
           formData,
           {
@@ -107,6 +107,7 @@ const AddSubUnit = ({ route }) => {
               params: {
                 unitId: unit.id,
                 unitData: unit,
+                stationId: data.id,
                 isAddSubUnit: true,
                 routeName: Routes.DashboardStack,
               },

package/src/screens/Unit/AddMenu.js

@@ -66,6 +66,10 @@ const AddMenu = memo(({ unit, afterItemClick, showAdd, setHideAdd }) => {
         route: Routes.SmartAccount,
         text: t('name_smart_account'),
         image: <SmartAccount width={43} height={43} />, // TODO change icon
+        data: {
+          unit_id: unit?.id,
+          unit_name: unit?.name,
+        },
         type: Routes.SmartAccount,
       },
     ];

package/src/screens/Unit/{SelectFavoritesDevices.js → SelectAddToFavorites.js}

@@ -15,14 +15,15 @@ import NavBar from '../../commons/NavBar';
 import BottomButtonView from '../../commons/BottomButtonView';
 import { FullLoading } from '../../commons';
 import Device from '../AddNewAction/Device';
+import AutomateScript from './components/AutomateScript';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { SCContext } from '../../context';
 import { Action } from '../../context/actionType';
 import { axiosGet, axiosPost } from '../../utils/Apis/axios';
 import { API, Colors } from '../../configs';
-import styles from './SelectFavoritesDevicesStyles';
+import styles from './SelectAddToFavoritesStyles';
 
-const SelectFavoritesDevices = memo(({ route }) => {
+const SelectAddToFavorites = memo(({ route }) => {
   const t = useTranslations();
   const { goBack } = useNavigation();
   const { unitId } = route.params;
@@ -31,43 +32,69 @@ const SelectFavoritesDevices = memo(({ route }) => {
   const [listMenuItem, setListMenuItem] = useState([]);
   const [indexStation, setIndexStation] = useState(0);
   const [stations, setStations] = useState([]);
-  const [selectedIds, setSelectedIds] = useState([]);
+  const [automates, setAutomates] = useState([]);
+
+  const [selectedDeviceIds, setSelectedDeviceIds] = useState([]);
+  const [selectedScriptIds, setSelectedScriptIds] = useState([]);
   const [loading, setLoading] = useState(true);
 
   const fetchData = useCallback(async () => {
     setLoading(true);
-    const { success, data } = await axiosGet(API.UNIT.DEVICES(unitId));
-    if (success) {
-      const newData = data.filter((item) => item.devices.length > 0);
+    const { success: successDevice, data: dataDevice } = await axiosGet(
+      API.UNIT.DEVICES_NOT_FAVORITES(unitId)
+    );
+    const { success: successAutomate, data: dataAutomate } = await axiosGet(
+      API.UNIT.AUTOMATE_SCRIPTS_NOT_STARRED(unitId)
+    );
+    if (successDevice && successAutomate) {
+      const newData = dataDevice.filter((item) => item.devices.length > 0);
+      if (dataAutomate.length) {
+        newData.unshift({
+          isSmart: true,
+          name: t('smart'),
+        });
+      }
       const listMenu = newData.map((item, index) => ({
         text: item.name,
         station: item,
         index: index,
       }));
       setStations(newData);
+      setAutomates(dataAutomate);
       setListMenuItem(listMenu);
       setListStation(listMenu);
     }
     setLoading(false);
-  }, [unitId]);
+  }, [unitId, t]);
 
-  const addDevicesToFavorites = useCallback(async () => {
-    if (selectedIds.length === 0) {
+  const addToFavorites = useCallback(async () => {
+    if (!selectedDeviceIds.length && !selectedScriptIds.length) {
       return;
     }
     setLoading(true);
-    const { success } = await axiosPost(
-      API.UNIT.ADD_DEVICES_TO_FAVORITES(unitId),
-      {
-        devices: selectedIds,
-      }
-    );
-    if (success) {
-      setAction(Action.ADD_DEVICES_TO_FAVORITES, selectedIds);
+
+    let response, success1, success2;
+
+    if (selectedDeviceIds.length) {
+      response = await axiosPost(API.UNIT.ADD_DEVICES_TO_FAVORITES(unitId), {
+        devices: selectedDeviceIds,
+      });
+      success1 = response.success;
+    }
+    if (selectedScriptIds.length) {
+      response = await axiosPost(API.UNIT.STAR_AUTOMATE_SCRIPTS(unitId), {
+        scripts: selectedScriptIds,
+      });
+      success2 = response.success;
+    }
+    success1 && setAction(Action.ADD_DEVICES_TO_FAVORITES, selectedDeviceIds);
+    success2 && setAction(Action.STAR_SCRIPTS, selectedScriptIds);
+    if (success1 || success2) {
       goBack();
     }
+
     setLoading(false);
-  }, [unitId, selectedIds, setAction, goBack]);
+  }, [unitId, selectedDeviceIds, selectedScriptIds, setAction, goBack]);
 
   useEffect(() => {
     fetchData();
@@ -83,7 +110,7 @@ const SelectFavoritesDevices = memo(({ route }) => {
 
   const onSelectDevice = useCallback(
     (device) => {
-      setSelectedIds((ids) => {
+      setSelectedDeviceIds((ids) => {
         const index = ids.indexOf(device.id);
         if (index !== -1) {
           return ids.filter((id) => id !== device.id);
@@ -91,7 +118,20 @@ const SelectFavoritesDevices = memo(({ route }) => {
         return [...ids, device.id];
       });
     },
-    [setSelectedIds]
+    [setSelectedDeviceIds]
+  );
+
+  const onSelectAutomateScript = useCallback(
+    (automate) => {
+      setSelectedScriptIds((ids) => {
+        const index = ids.indexOf(automate?.script?.id);
+        if (index !== -1) {
+          return ids.filter((id) => id !== automate?.script?.id);
+        }
+        return [...ids, automate?.script?.id];
+      });
+    },
+    [setSelectedScriptIds]
   );
 
   const rightComponent = useMemo(
@@ -132,13 +172,24 @@ const SelectFavoritesDevices = memo(({ route }) => {
         )}
 
         <View style={styles.boxDevices}>
-          {stations[indexStation]?.devices &&
-            stations[indexStation].devices.map((device) => (
+          {stations[indexStation]?.isSmart &&
+            automates.map((automate, index) => (
+              <AutomateScript
+                key={`automate_script_${index}`}
+                automate={automate}
+                onPress={onSelectAutomateScript}
+                isSelected={selectedScriptIds.includes(automate?.script?.id)}
+              />
+            ))}
+          {!stations[indexStation]?.isSmart &&
+            stations[indexStation]?.devices &&
+            stations[indexStation].devices.map((device, index) => (
               <Device
+                key={`device_${index}`}
                 svgMain={device.icon || 'sensor'}
                 title={device.name}
                 sensor={device}
-                isSelectDevice={selectedIds.includes(device.id)}
+                isSelectDevice={selectedDeviceIds.includes(device.id)}
                 onPress={onSelectDevice}
               />
             ))}
@@ -148,12 +199,16 @@ const SelectFavoritesDevices = memo(({ route }) => {
       <BottomButtonView
         style={styles.bottomButtonView}
         mainTitle={t('done')}
-        onPressMain={addDevicesToFavorites}
-        typeMain={selectedIds.length === 0 ? 'disabled' : 'primary'}
+        onPressMain={addToFavorites}
+        typeMain={
+          !selectedDeviceIds.length && !selectedScriptIds.length
+            ? 'disabled'
+            : 'primary'
+        }
       />
       {loading && <FullLoading />}
     </View>
   );
 });
 
-export default SelectFavoritesDevices;
+export default SelectAddToFavorites;

package/src/screens/Unit/__test__/CheckSendEmail.test.js

@@ -45,6 +45,18 @@ jest.mock('react-native-onesignal', () => {
   };
 });
 
+jest.mock('@react-navigation/native', () => {
+  return {
+    ...jest.requireActual('@react-navigation/native'),
+    useNavigation: () => ({
+      navigate: jest.fn(),
+      goBack: jest.fn(),
+    }),
+    useFocusEffect: jest.fn(),
+    useIsFocused: () => true,
+  };
+});
+
 const wrapComponent = (route, unitData, account) => (
   <SCProvider initState={mockSCStore({})}>
     <UnitDetail

package/src/screens/Unit/__test__/Detail.test.js

@@ -51,6 +51,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockedNavigate,
     }),
+    useFocusEffect: jest.fn(),
   };
 });
 
@@ -252,7 +253,6 @@ describe('Test UnitDetail', () => {
               icon_kit: '',
               id: 73,
               is_managed_by_backend: true,
-              is_other_device: false,
               name: 'Multi-Air Quality',
               quick_action: null,
             },
@@ -278,7 +278,6 @@ describe('Test UnitDetail', () => {
               icon_kit: '',
               id: 73,
               is_managed_by_backend: true,
-              is_other_device: false,
               name: 'HR',
               quick_action: null,
             },
@@ -398,7 +397,7 @@ describe('Test UnitDetail', () => {
         el.type === TouchableOpacity
     );
 
-    expect(goDetailButton).toHaveLength(2);
+    expect(goDetailButton).toHaveLength(1);
     await act(async () => {
       await goDetailButton[0].props.onPress();
     });