@eohjsc/react-native-smart-city 0.2.45 → 0.2.46

package/src/screens/Automate/__test__/MultiUnits.test.js

@@ -126,13 +126,13 @@ describe('Test MultiUnits', () => {
     expect(mockedNavigate).toBeCalledWith(Routes.UnitStack, {
       screen: Routes.ScriptDetail,
       params: {
+        automate: response.data[1],
         id: response.data[1].id,
         name: response.data[1].script?.name,
         type: response.data[1].type,
         havePermission: false,
         unit: null,
         isMultiUnits: true,
-        textCondition: 'Light Value lower than 0',
       },
     });
     const ItemAddNews = instance.findAllByType(ItemAddNew);
@@ -145,6 +145,7 @@ describe('Test MultiUnits', () => {
         type: AUTOMATE_TYPE.VALUE_CHANGE,
         isAutomateTab: true,
         isMultiUnits: true,
+        unit: { id: undefined },
       },
     });
   });
@@ -219,6 +220,7 @@ describe('Test MultiUnits', () => {
         type: AUTOMATE_TYPE.ONE_TAP_ONLY,
         isAutomateTab: true,
         isMultiUnits: true,
+        unit: { id: undefined },
       },
     });
   });
@@ -234,249 +236,4 @@ describe('Test MultiUnits', () => {
     const WrapHeaderScrollables = instance.findAllByType(WrapHeaderScrollable);
     expect(WrapHeaderScrollables[0].props.title).toEqual('');
   });
-
-  it('Test render textCondition', async () => {
-    const response = {
-      status: 200,
-      data: [
-        {
-          id: 1,
-          user: 223,
-          type: 'schedule',
-          config: null,
-          value: null,
-          activate_at: '2021-09-22T14:16:54Z',
-          condition: null,
-          script: {
-            id: 1,
-            name: 'Tap to up down up down coc coc coc coc coc',
-            icon: null,
-            icon_kit:
-              'https://eoh-gateway-backend.eoh.io/_Category_Sensors_Type_Garage_door_StyleC_olorful.png',
-          },
-          repeat: 'once',
-          date_repeat: '2022-01-02',
-          time_repeat: '09:10:00',
-          weekday_repeat: ['1', '2', '4', '6'],
-        },
-        {
-          id: 299,
-          user: 223,
-          type: 'value_change',
-          config: 'Light Value',
-          value: 0,
-          activate_at: null,
-          condition: '>',
-          script: {
-            id: 300,
-            name: 'p14',
-            icon: null,
-            icon_kit: null,
-          },
-          repeat: 'once',
-          date_repeat: '2022-01-02',
-          time_repeat: '09:10:00',
-          weekday_repeat: ['1', '2', '4', '6'],
-        },
-        {
-          id: 300,
-          user: 223,
-          type: 'value_change',
-          config: 'Light Value',
-          value: 0,
-          activate_at: null,
-          condition: '=',
-          script: {
-            id: 300,
-            name: 'p15',
-            icon: null,
-            icon_kit: null,
-          },
-          repeat: 'once',
-          date_repeat: '2022-01-02',
-          time_repeat: '09:10:00',
-          weekday_repeat: ['1', '2', '4', '6'],
-        },
-        {
-          id: 301,
-          user: 223,
-          type: 'schedule',
-          config: null,
-          value: null,
-          activate_at: '2021-09-22T14:16:54Z',
-          condition: null,
-          script: {
-            id: 1,
-            name: 'Tap to up down up down coc coc coc coc coc',
-            icon: null,
-            icon_kit:
-              'https://eoh-gateway-backend.eoh.io/_Category_Sensors_Type_Garage_door_StyleC_olorful.png',
-          },
-          repeat: 'once',
-          date_repeat: '2022-01-02',
-          time_repeat: '09:10:00',
-          weekday_repeat: ['1', '2', '4', '6'],
-        },
-        {
-          id: 302,
-          user: 223,
-          type: 'schedule',
-          config: null,
-          value: null,
-          activate_at: '2021-09-22T14:16:54Z',
-          condition: null,
-          script: {
-            id: 1,
-            name: 'Tap to up down up down coc coc coc coc coc',
-            icon: null,
-            icon_kit:
-              'https://eoh-gateway-backend.eoh.io/_Category_Sensors_Type_Garage_door_StyleC_olorful.png',
-          },
-          repeat: 'every_day',
-          date_repeat: '2022-01-02',
-          time_repeat: '09:10:00',
-          weekday_repeat: ['1', '2', '4', '6'],
-        },
-        {
-          id: 302,
-          user: 223,
-          type: 'schedule',
-          config: null,
-          value: null,
-          activate_at: '2021-09-22T14:16:54Z',
-          condition: null,
-          script: {
-            id: 1,
-            name: 'Tap to up down up down coc coc coc coc coc',
-            icon: null,
-            icon_kit:
-              'https://eoh-gateway-backend.eoh.io/_Category_Sensors_Type_Garage_door_StyleC_olorful.png',
-          },
-          repeat: 'every_week',
-          date_repeat: '2022-01-02',
-          time_repeat: '09:10:00',
-          weekday_repeat: ['1', '2', '4', '6'],
-        },
-      ],
-    };
-    await axios.get.mockImplementation(async () => {
-      return response;
-    });
-    useRoute.mockReturnValue({
-      params: {
-        isMultiUnits: true,
-        unitName: null,
-        unit: null,
-      },
-    });
-    useState.mockImplementationOnce(() => [response.data, mockSetState]);
-    useState.mockImplementationOnce(() => [
-      getTranslate('en', 'Automation'),
-      mockSetState,
-    ]);
-    await act(() => {
-      tree = create(wrapComponent());
-    });
-    const instance = tree.root;
-    const WrapHeaderScrollables = instance.findAllByType(WrapHeaderScrollable);
-    expect(WrapHeaderScrollables[0].props.title).toEqual(
-      getTranslate('en', 'multi_units_automate')
-    );
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
-    act(() => {
-      TouchableOpacities[2].props.onPress();
-    });
-    expect(mockSetState).toBeCalledWith(getTranslate('en', 'Automation'));
-    const ItemOneTaps = instance.findAllByType(ItemOneTap);
-    act(() => {
-      ItemOneTaps[0].props.onPressItem();
-    });
-    expect(mockedNavigate).toBeCalledWith(Routes.UnitStack, {
-      screen: Routes.ScriptDetail,
-      params: {
-        id: response.data[0].id,
-        name: response.data[0].script?.name,
-        type: response.data[0].type,
-        havePermission: false,
-        unit: null,
-        isMultiUnits: true,
-        textCondition: '09:10 02/01/2022',
-      },
-    });
-    act(() => {
-      ItemOneTaps[1].props.onPressItem();
-    });
-    expect(mockedNavigate).toBeCalledWith(Routes.UnitStack, {
-      screen: Routes.ScriptDetail,
-      params: {
-        id: response.data[1].id,
-        name: response.data[1].script?.name,
-        type: response.data[1].type,
-        havePermission: false,
-        unit: null,
-        isMultiUnits: true,
-        textCondition: 'Light Value higher than 0',
-      },
-    });
-    act(() => {
-      ItemOneTaps[2].props.onPressItem();
-    });
-    expect(mockedNavigate).toBeCalledWith(Routes.UnitStack, {
-      screen: Routes.ScriptDetail,
-      params: {
-        id: response.data[2].id,
-        name: response.data[2].script?.name,
-        type: response.data[2].type,
-        havePermission: false,
-        unit: null,
-        isMultiUnits: true,
-        textCondition: 'Light Value equal 0',
-      },
-    });
-    act(() => {
-      ItemOneTaps[3].props.onPressItem();
-    });
-    expect(mockedNavigate).toBeCalledWith(Routes.UnitStack, {
-      screen: Routes.ScriptDetail,
-      params: {
-        id: response.data[3].id,
-        name: response.data[3].script?.name,
-        type: response.data[3].type,
-        havePermission: false,
-        unit: null,
-        isMultiUnits: true,
-        textCondition: '09:10 02/01/2022',
-      },
-    });
-    act(() => {
-      ItemOneTaps[4].props.onPressItem();
-    });
-    expect(mockedNavigate).toBeCalledWith(Routes.UnitStack, {
-      screen: Routes.ScriptDetail,
-      params: {
-        id: response.data[4].id,
-        name: response.data[4].script?.name,
-        type: response.data[4].type,
-        havePermission: false,
-        unit: null,
-        isMultiUnits: true,
-        textCondition: 'Every day at 09:10',
-      },
-    });
-    act(() => {
-      ItemOneTaps[5].props.onPressItem();
-    });
-    expect(mockedNavigate).toBeCalledWith(Routes.UnitStack, {
-      screen: Routes.ScriptDetail,
-      params: {
-        id: response.data[5].id,
-        name: response.data[5].script?.name,
-        type: response.data[5].type,
-        havePermission: false,
-        unit: null,
-        isMultiUnits: true,
-        textCondition: 'Tue, Wed, Fri, Sun',
-      },
-    });
-  });
 });

package/src/screens/Automate/__test__/index.test.js

@@ -152,6 +152,7 @@ describe('Test Automate', () => {
     expect(mockedNavigate).toBeCalledWith(Routes.UnitStack, {
       screen: Routes.ScriptDetail,
       params: {
+        automate: response.data[0].automates[0],
         isAutomateTab: true,
         isMultiUnits: true,
         name: 'script',

package/src/screens/Automate/index.js

@@ -69,6 +69,7 @@ const Automate = () => {
         havePermission: isOwner || idUser === item?.user,
         unit: { id },
         isAutomateTab: true,
+        automate: item,
         isMultiUnits: type === UNIT_TYPES.MULTI,
       },
     });

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

@@ -1,11 +1,11 @@
 import React, { memo, useCallback, useMemo, useState } from 'react';
-import { View, TouchableOpacity } from 'react-native';
+import { View, TouchableOpacity, Image } from 'react-native';
 import moment from 'moment';
 import { useNavigation } from '@react-navigation/native';
 
 import styles from '../styles/NotificationItemStyles';
 import Text from '../../../commons/Text';
-import { Colors, API } from '../../../configs';
+import { Colors, API, Images } from '../../../configs';
 import IconComponent from '../../../commons/IconComponent';
 import { NOTIFICATION_TYPES } from '../../../configs/Constants';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
@@ -18,14 +18,18 @@ 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;
+  }, []);
+
   let arrParams = useMemo(() => {
     const values = [];
-    const paramsJSON = JSON.parse(params.replace(/'/g, '"'));
+    const paramsJSON = JSON.parse(params.replace(regex, '"'));
     Object.entries(paramsJSON).forEach(([key, value]) => {
       values.push(value);
     });
     return values;
-  }, [params]);
+  }, [params, regex]);
 
   const customColorText = (text, params) => {
     return text.split('**').map((str, i) =>
@@ -42,7 +46,7 @@ const NotificationItem = memo(({ item }) => {
   };
 
   const renderItem = useCallback(() => {
-    const paramsJSON = JSON.parse(params.replace(/'/g, '"'));
+    const paramsJSON = JSON.parse(params.replace(regex, '"'));
     const booking_id = paramsJSON.booking_id && paramsJSON.booking_id;
     switch (content_code) {
       case NOTIFICATION_TYPES.NOTIFY_INVITE_MEMBER:
@@ -60,7 +64,12 @@ const NotificationItem = memo(({ item }) => {
               },
             });
           },
-          textInviteMember: t('accept_invitation'),
+          iconContent: (
+            <IconComponent
+              icon_outlined={'usergroup-add'}
+              style={styles.iconInviteMember}
+            />
+          ),
         };
       case NOTIFICATION_TYPES.REMIND_TO_MAKE_PAYMENT:
         return {
@@ -211,10 +220,19 @@ const NotificationItem = memo(({ item }) => {
               params: { id: booking_id },
             }),
         };
+      case NOTIFICATION_TYPES.REMINDER:
+        return {
+          content: customColorText(
+            t('text_notification_content_update_reminder'),
+            arrParams
+          ),
+          redirect: () => navigation.navigate(Routes.PersonalHealthStack),
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
     }
-  }, [arrParams, content_code, navigation, params, t]);
+  }, [arrParams, content_code, navigation, params, regex, t]);
 
-  const { content, redirect, textInviteMember } = renderItem() || {};
+  const { content, redirect, iconContent } = renderItem() || {};
 
   const onItemPress = useCallback(() => {
     if (!isRead) {
@@ -224,16 +242,15 @@ const NotificationItem = memo(({ item }) => {
     setIsRead(true);
   }, [id, isRead, redirect]);
 
+  if (!content) {
+    return null;
+  }
+
   return (
     <TouchableOpacity onPress={onItemPress}>
       <View style={[styles.container, !isRead && styles.backgroundGray]}>
         <View style={styles.wrapIcon}>
-          {textInviteMember ? (
-            <IconComponent
-              icon_outlined={'usergroup-add'}
-              style={styles.iconInviteMember}
-            />
-          ) : (
+          {iconContent || (
             <IconComponent iconKit={icon} style={styles.iconNotification} />
           )}
         </View>

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

@@ -47,4 +47,9 @@ export default StyleSheet.create({
     borderRadius: 50,
     width: 120,
   },
+  logo: {
+    width: 20,
+    height: 20,
+    resizeMode: 'contain',
+  },
 });

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

@@ -1,10 +1,19 @@
 import React from 'react';
 import { create, act } from 'react-test-renderer';
 import axios from 'axios';
+
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
 import ScanChipQR from '..';
 import QRScan from '../components/QRScan';
 import Routes from '../../../utils/Route';
 
+const wrapComponent = (route) => (
+  <SCProvider initState={mockSCStore({})}>
+    <ScanChipQR route={route} />
+  </SCProvider>
+);
+
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 
@@ -45,7 +54,7 @@ describe('test ScanChipQR', () => {
   test('create ScanChipQR', async () => {
     let tree;
     await act(async () => {
-      tree = await create(<ScanChipQR route={route} />);
+      tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
     const qrScan = instance.findAllByType(QRScan);
@@ -69,7 +78,7 @@ describe('test ScanChipQR', () => {
     let tree;
     const body = { id: 1, imei: 'IMEI_X', name: 'New Chip' };
     await act(async () => {
-      tree = await create(<ScanChipQR route={route} />);
+      tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
     const qrScan = instance.findByType(QRScan);
@@ -100,7 +109,7 @@ describe('test ScanChipQR', () => {
     let tree;
     const body = { id: 1, imei: 'IMEI_X', name: 'New Chip' };
     await act(async () => {
-      tree = await create(<ScanChipQR route={route} />);
+      tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
     const qrScan = instance.findByType(QRScan);

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

@@ -1,6 +1,9 @@
 import React from 'react';
 import { RNCamera } from 'react-native-camera';
 import { act, create } from 'react-test-renderer';
+
+import { SCProvider } from '../../../../../context';
+import { mockSCStore } from '../../../../../context/mockStore';
 import QRScan from '../index';
 
 const mockedPop = jest.fn();
@@ -17,6 +20,12 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
+const wrapComponent = (data) => (
+  <SCProvider initState={mockSCStore({})}>
+    <QRScan {...data} />
+  </SCProvider>
+);
+
 describe('Test QRScan', () => {
   let data;
 
@@ -32,7 +41,7 @@ describe('Test QRScan', () => {
 
   test('render QRScan', async () => {
     act(() => {
-      tree = create(<QRScan {...data} />);
+      tree = create(wrapComponent(data));
     });
     const instance = tree.root;
     const RNCam = instance.findAllByType(RNCamera);
@@ -41,7 +50,7 @@ describe('Test QRScan', () => {
 
   test('onBarCodeRead', async () => {
     act(() => {
-      tree = create(<QRScan {...data} />);
+      tree = create(wrapComponent(data));
     });
     const instance = tree.root;
     const RNCam = instance.findByType(RNCamera);

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

@@ -1,11 +1,20 @@
 import React from 'react';
 import { create, act } from 'react-test-renderer';
 import axios from 'axios';
+
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
 import ScanSensorQR from '..';
 import QRScan from '../../ScanChipQR/components/QRScan';
 import API from '../../../configs/API';
 import Routes from '../../../utils/Route';
 
+const wrapComponent = (route) => (
+  <SCProvider initState={mockSCStore({})}>
+    <ScanSensorQR route={route} />
+  </SCProvider>
+);
+
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 
@@ -46,7 +55,7 @@ describe('test ScanSensorQR', () => {
   test('create ScanSensorQR', async () => {
     let tree;
     await act(async () => {
-      tree = await create(<ScanSensorQR route={route} />);
+      tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
     const qrScan = instance.findAllByType(QRScan);
@@ -70,7 +79,7 @@ describe('test ScanSensorQR', () => {
     let tree;
     const body = { id: 1, imei: 'IMEI_X', name: 'New Chip' };
     await act(async () => {
-      tree = await create(<ScanSensorQR route={route} />);
+      tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
     const qrScan = instance.findByType(QRScan);
@@ -103,7 +112,7 @@ describe('test ScanSensorQR', () => {
     let tree;
     const body = { id: 1, imei: 'IMEI_X', name: 'New Chip' };
     await act(async () => {
-      tree = await create(<ScanSensorQR route={route} />);
+      tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
     const qrScan = instance.findByType(QRScan);

package/src/screens/ScriptDetail/__test__/index.test.js

@@ -16,6 +16,7 @@ import { API } from '../../../configs';
 import { TouchableOpacity } from 'react-native';
 import Routes from '../../../utils/Route';
 import WrapHeaderScrollable from '../../../commons/Sharing/WrapHeaderScrollable';
+import ItemAutomate from '../../../commons/Automate/ItemAutomate';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -297,4 +298,74 @@ describe('Test ScriptDetail', () => {
     `automate.${AUTOMATE_TYPE.ONE_TAP}`
   );
   _testGoToActivityLog(AUTOMATE_TYPE.VALUE_CHANGE, 'automate');
+
+  test('Test render textCondition value change >', async () => {
+    route.params = {
+      ...route.params,
+      type: AUTOMATE_TYPE.VALUE_CHANGE,
+      automate: {
+        repeat: 'once',
+        date_repeat: '2022-01-02',
+        time_repeat: '09:10:00',
+        weekday_repeat: ['1', '2', '4', '6'],
+        config_name: 'Light Value',
+        value: 3,
+        condition: '>',
+      },
+    };
+    await act(() => {
+      tree = create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const itemAutomate = instance.findByType(ItemAutomate);
+    expect(itemAutomate.props.textCondition).toEqual(
+      'Light Value higher than 3'
+    );
+  });
+
+  test('Test render textCondition value change =', async () => {
+    route.params = {
+      ...route.params,
+      type: AUTOMATE_TYPE.VALUE_CHANGE,
+      automate: {
+        repeat: 'once',
+        date_repeat: '2022-01-02',
+        time_repeat: '09:10:00',
+        weekday_repeat: ['1', '2', '4', '6'],
+        config_name: 'Light Value',
+        value: 3,
+        condition: '=',
+      },
+    };
+    await act(() => {
+      tree = create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const itemAutomate = instance.findByType(ItemAutomate);
+    expect(itemAutomate.props.textCondition).toEqual('Light Value equal 3');
+  });
+
+  test('Test render textCondition value change <', async () => {
+    route.params = {
+      ...route.params,
+      type: AUTOMATE_TYPE.VALUE_CHANGE,
+      automate: {
+        repeat: 'once',
+        date_repeat: '2022-01-02',
+        time_repeat: '09:10:00',
+        weekday_repeat: ['1', '2', '4', '6'],
+        config_name: 'Light Value',
+        value: 3,
+        condition: '<',
+      },
+    };
+    await act(() => {
+      tree = create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const itemAutomate = instance.findByType(ItemAutomate);
+    expect(itemAutomate.props.textCondition).toEqual(
+      'Light Value lower than 3'
+    );
+  });
 });