@eohjsc/react-native-smart-city 0.7.16 → 0.7.18

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.7.16",
+  "version": "0.7.18",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/Unit/__test__/SharedUnit.test.js

@@ -109,6 +109,63 @@ describe('Test SharedUnit', () => {
     });
   });
 
+  it('Test remove pin and start shared unit', async () => {
+    const navigation = useNavigation();
+    item.is_pin = true;
+    item.is_star = true;
+    const mockedRenewItem = jest.fn();
+    await act(async () => {
+      tree = await create(
+        wrapComponent(item, navigation, undefined, mockedRenewItem)
+      );
+    });
+    const instance = tree.root;
+
+    const iconAddPinSharedUnit = instance.findAll(
+      (el) =>
+        el.props.accessibilityLabel ===
+        AccessibilityLabel.ICON_ADD_PIN_SHARED_UNIT + '-69'
+    );
+    const iconAddStarSharedUnit = instance.findAll(
+      (el) =>
+        el.props.accessibilityLabel ===
+        AccessibilityLabel.ICON_ADD_STAR_SHARED_UNIT + '-69'
+    );
+
+    const iconRemovePinSharedUnit = instance.find(
+      (el) =>
+        el.props.accessibilityLabel ===
+        AccessibilityLabel.ICON_REMOVE_PIN_SHARED_UNIT + '-69'
+    );
+    mock.onPost(API.UNIT.UNPIN_UNIT(3)).reply(200);
+    await act(async () => {
+      iconRemovePinSharedUnit.props.onPress();
+    });
+    mock.onPost(API.UNIT.UNPIN_UNIT(3)).reply(400);
+    await act(async () => {
+      iconRemovePinSharedUnit.props.onPress();
+    });
+    expect(mockedRenewItem).toHaveBeenCalledTimes(1);
+
+    const iconRemoveStarSharedUnit = instance.find(
+      (el) =>
+        el.props.accessibilityLabel ===
+        AccessibilityLabel.ICON_REMOVE_STAR_SHARED_UNIT + '-69'
+    );
+    mock.onPost(API.UNIT.UNSTAR_UNIT(3)).reply(200);
+    await act(async () => {
+      iconRemoveStarSharedUnit.props.onPress();
+    });
+    mock.onPost(API.UNIT.UNSTAR_UNIT(3)).reply(400);
+    await act(async () => {
+      iconRemoveStarSharedUnit.props.onPress();
+    });
+
+    expect(mockedRenewItem).toHaveBeenCalledTimes(2);
+    expect(iconAddPinSharedUnit).toHaveLength(0);
+    expect(iconAddStarSharedUnit).toHaveLength(0);
+  });
+
   // it('test create SharedUnit unit without unit owner', async () => {
   //   const navigation = useNavigation();
   //   delete unit.owner_name;

package/src/configs/AccessibilityLabel.js

@@ -251,6 +251,10 @@ export default {
   AUTOMATE_TITLE_NOTIFY: 'AUTOMATE_TITLE_NOTIFY',
   AUTOMATE_MESSAGE_NOTIFY: 'AUTOMATE_MESSAGE_NOTIFY',
   AUTOMATE_INPUT_DELAY: 'AUTOMATE_INPUT_DELAY',
+  AUTOMATE_SHOW_LOCAL_CONTROL: 'AUTOMATE_SHOW_LOCAL_CONTROL',
+  AUTOMATE_DISABLE_LOCAL_CONTROL: 'AUTOMATE_DISABLE_LOCAL_CONTROL',
+  AUTOMATE_ENABLE_LOCAL_CONTROL: 'AUTOMATE_ENABLE_LOCAL_CONTROL',
+
   // Parking input maunaly spot
   PARKING_SPOT_INFO_BUTTON: 'PARKING_SPOT_INFO_BUTTON',
   PARKING_SPOT_CONFIRM_SPOT: 'PARKING_SPOT_CONFIRM_SPOT',

package/src/hooks/Common/useBlockBack.js

@@ -5,6 +5,7 @@ import { BackHandler, Platform } from 'react-native';
 export const useBlockBack = (actionBack) => {
   const navigation = useNavigation();
   const isListening = useRef(false);
+  const isBeforeRemoveHandled = useRef(false);
 
   const blockBack = useCallback(() => {
     actionBack && actionBack();
@@ -13,8 +14,15 @@ export const useBlockBack = (actionBack) => {
 
   const blockBeforeRemove = useCallback(
     (e) => {
-      e.preventDefault();
-      blockBack();
+      if (isBeforeRemoveHandled.current) {
+        return;
+      }
+      const { type } = e.data.action;
+      if (type === 'GO_BACK' || type === 'POP') {
+        isBeforeRemoveHandled.current = true;
+        e.preventDefault();
+        blockBack();
+      }
     },
     [blockBack]
   );

package/src/screens/Automate/ScriptDetail/Styles/indexStyles.js

@@ -183,8 +183,8 @@ export default StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
   },
-  width40: {
-    width: '40%',
+  width50: {
+    width: '50%',
   },
   popoverStyle: {
     width: '100%',

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

@@ -42,11 +42,16 @@ describe('Test ScriptDetail', () => {
   const mockAddListener = useNavigation().addListener;
   const mockedNavigate = useNavigation().navigate;
   const mockedDispatch = useNavigation().dispatch;
+  const mockedGetState = useNavigation().getState;
+
   beforeEach(() => {
     mockGoBack.mockClear();
     mockAddListener.mockClear();
     mockedNavigate.mockClear();
     mockedDispatch.mockClear();
+    mockedGetState.mockReturnValue({
+      routes: [{ name: 'Home' }],
+    });
     global.mockedNavigate.mockClear();
     mock.reset();
     route = {
@@ -111,12 +116,15 @@ describe('Test ScriptDetail', () => {
     };
   });
 
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
   const expectMockedDispatch = (screen, screenParams) => {
-    const mockState = {
-      routes: [{ name: 'Home' }],
-    };
-    const updatedState = mockedDispatch.mock.calls[0][0](mockState);
-    expect(updatedState).toEqual({
+    act(() => {
+      jest.runAllTimers();
+    });
+    expect(mockedDispatch).toHaveBeenCalledWith({
       type: 'RESET',
       payload: {
         index: 2,
@@ -136,6 +144,12 @@ describe('Test ScriptDetail', () => {
       },
     });
     expect(mockedDispatch).toHaveBeenCalledTimes(1);
+    mockedGetState.mockReturnValue({
+      routes: [
+        { name: 'Home' },
+        { name: Routes.ScriptDetail, params: route.params },
+      ],
+    });
     mockedDispatch.mockClear();
   };
 
@@ -359,6 +373,7 @@ describe('Test ScriptDetail', () => {
   });
 
   it('test press add action', async () => {
+    jest.useFakeTimers();
     data = [
       {
         id: 1,
@@ -425,6 +440,50 @@ describe('Test ScriptDetail', () => {
     expectMockedDispatch(Routes.SetupScriptDelay, {
       automate: route.params.preAutomate,
     });
+  });
+
+  it('test press add email and sms', async () => {
+    jest.useFakeTimers();
+    data = [
+      {
+        id: 1,
+        unit: 1,
+        script_items: null,
+      },
+    ];
+    mock.onGet(API.AUTOMATE.SCRIPT(1)).reply(200, data);
+    const auth = {
+      account: {
+        user: {
+          permissions: {
+            max_actions_per_automation: 2,
+          },
+        },
+      },
+    };
+    await act(async () => {
+      tree = await create(wrapComponent(route, { auth }));
+    });
+    const instance = tree.root;
+    const button = instance.find(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.BUTTON_ADD_SCRIPT_ACTION &&
+        el.type === TouchableOpacity
+    );
+    await act(async () => {
+      await button.props.onPress();
+    });
+    const texts = instance.findByType(AddActionScript);
+    expect(texts.props.isVisible).toBeTruthy();
+
+    const listScriptActions = instance.findAll(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.AUTOMATE_LIST_SCRIPT_ACTION &&
+        el.type === TouchableOpacity
+    );
+    expect(listScriptActions).toHaveLength(5);
     await act(async () => {
       await listScriptActions[3].props.onPress();
     });
@@ -433,6 +492,103 @@ describe('Test ScriptDetail', () => {
       automate: route.params.preAutomate,
       unitId: route.params.preAutomate.unit,
     });
+    await act(async () => {
+      await listScriptActions[4].props.onPress();
+    });
+
+    expectMockedDispatch(Routes.SetupScriptSms, {
+      automate: route.params.preAutomate,
+      unitId: route.params.preAutomate.unit,
+    });
+  });
+
+  it('test press add action when has closeScreen is present in stacks', async () => {
+    jest.useFakeTimers();
+    data = [
+      {
+        id: 1,
+        unit: 1,
+        script_items: null,
+      },
+    ];
+    mock.onGet(API.AUTOMATE.SCRIPT(1)).reply(200, data);
+    const auth = {
+      account: {
+        user: {
+          permissions: {
+            max_actions_per_automation: 2,
+          },
+        },
+      },
+    };
+    route.params.closeScreen = Routes.UnitDetail;
+    await act(async () => {
+      tree = await create(wrapComponent(route, { auth }));
+    });
+    const instance = tree.root;
+    const button = instance.find(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.BUTTON_ADD_SCRIPT_ACTION &&
+        el.type === TouchableOpacity
+    );
+    await act(async () => {
+      await button.props.onPress();
+    });
+    const texts = instance.findByType(AddActionScript);
+    expect(texts.props.isVisible).toBeTruthy();
+
+    const listScriptActions = instance.findAll(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.AUTOMATE_LIST_SCRIPT_ACTION &&
+        el.type === TouchableOpacity
+    );
+    expect(listScriptActions).toHaveLength(5);
+
+    mockedGetState.mockReturnValue({
+      routes: [
+        { name: 'Home' },
+        { name: Routes.UnitDetail, params: { unitId: 1 } },
+        { name: Routes.ScriptDetail, params: route.params },
+      ],
+    });
+    await act(async () => {
+      await listScriptActions[0].props.onPress();
+    });
+    await act(async () => {
+      jest.runAllTimers();
+    });
+    expect(mockedDispatch).toHaveBeenCalledWith({
+      type: 'RESET',
+      payload: {
+        index: 3,
+        routes: [
+          {
+            name: 'Home',
+          },
+          {
+            name: Routes.UnitDetail,
+            params: { unitId: 1 },
+          },
+          {
+            name: Routes.ScriptDetail,
+            params: route.params,
+          },
+          {
+            name: Routes.SelectControlDevices,
+            params: {
+              unitId: route.params.preAutomate.unit,
+              automateId: route.params.preAutomate.id,
+              numberActionCanAdd: 2,
+              closeScreen: undefined,
+              routeName: null,
+            },
+          },
+        ],
+      },
+    });
+    expect(mockedDispatch).toHaveBeenCalledTimes(1);
   });
 
   it('test press disable script', async () => {
@@ -573,6 +729,7 @@ describe('Test ScriptDetail', () => {
   _testGoToActivityLog(3, AUTOMATE_TYPE.VALUE_CHANGE, 'automate', undefined);
 
   it('Test render textCondition value change >', async () => {
+    jest.useFakeTimers();
     const automate = {
       can_edit: true,
       type: AUTOMATE_TYPE.VALUE_CHANGE,
@@ -613,33 +770,10 @@ describe('Test ScriptDetail', () => {
       menuActionMore.props.listMenuItem[2].doAction();
     });
 
-    const mockState = {
-      routes: [{ name: 'Home' }],
-    };
-    const updatedState = mockedDispatch.mock.calls[0][0](mockState);
-    expect(updatedState).toEqual({
-      type: 'RESET',
-      payload: {
-        index: 2,
-        routes: [
-          {
-            name: 'Home',
-          },
-          {
-            name: Routes.ScriptDetail,
-            params: route.params,
-          },
-          {
-            name: Routes.AddUnknownTypeSmart,
-            params: {
-              automate: automate,
-              closeScreen: undefined,
-            },
-          },
-        ],
-      },
+    expectMockedDispatch(Routes.AddUnknownTypeSmart, {
+      automate: automate,
+      closeScreen: undefined,
     });
-    expect(mockedDispatch).toHaveBeenCalledTimes(1);
 
     expect(menuActionMore.props.listMenuItem[0].text).toEqual('Device display');
     await act(async () => {
@@ -755,7 +889,10 @@ describe('Test ScriptDetail', () => {
 
     // beforeRemove test when swipe to back
     const navigation = useNavigation();
-    const beforeRemoveEvent = { preventDefault: jest.fn() };
+    const beforeRemoveEvent = {
+      preventDefault: jest.fn(),
+      data: { action: { type: 'GO_BACK' } },
+    };
     const beforeRemoveListener = navigation.addListener.mock.calls.find(
       ([event]) => event === 'beforeRemove'
     )[1];
@@ -771,6 +908,34 @@ describe('Test ScriptDetail', () => {
     });
   });
 
+  it('test skip block back when navigate on ios', async () => {
+    Platform.OS = 'ios';
+    route.params.closeScreen = Routes.UnitDetail;
+    route.params.preAutomate.unit = 2;
+
+    await act(async () => {
+      await create(wrapComponent(route));
+    });
+
+    // beforeRemove test when navigate
+    const navigation = useNavigation();
+    const beforeRemoveEvent = {
+      preventDefault: jest.fn(),
+      data: { action: { type: 'NAVIGATE' } },
+    };
+    const beforeRemoveListener = navigation.addListener.mock.calls.find(
+      ([event]) => event === 'beforeRemove'
+    )[1];
+
+    await act(async () => {
+      beforeRemoveListener(beforeRemoveEvent);
+    });
+
+    expect(mockAddListener).toHaveBeenCalled();
+    expect(beforeRemoveEvent.preventDefault).not.toHaveBeenCalled();
+    expect(mockedNavigate).not.toHaveBeenCalled();
+  });
+
   it('test navigate to UnitDetail on event hardwareBackPress', async () => {
     Platform.OS = 'android';
     jest.spyOn(BackHandler, 'addEventListener');
@@ -797,4 +962,64 @@ describe('Test ScriptDetail', () => {
       unitId: 2,
     });
   });
+
+  it('test enable local control', async () => {
+    mock.onPost(API.AUTOMATE.ENABLE_LOCAL_CONTROL(1)).reply(200);
+    mock
+      .onGet(API.DEV_MODE.GATEWAY.SHARED())
+      .reply(200, [{ name: 'Chip', id: 1 }]);
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const show_local_control = instance.find(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.AUTOMATE_SHOW_LOCAL_CONTROL &&
+        el.type === TouchableOpacity
+    );
+    await act(async () => {
+      await show_local_control.props.onPress();
+    });
+    const disable = instance.find(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.AUTOMATE_ENABLE_LOCAL_CONTROL &&
+        el.type === TouchableOpacity
+    );
+    await act(async () => {
+      await disable.props.onPress();
+    });
+
+    expect(mock.history.post[0].url).toEqual(
+      API.AUTOMATE.ENABLE_LOCAL_CONTROL(1)
+    );
+  });
+
+  it('test disable local control', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const show_local_control = instance.find(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.AUTOMATE_SHOW_LOCAL_CONTROL &&
+        el.type === TouchableOpacity
+    );
+    await act(async () => {
+      await show_local_control.props.onPress();
+    });
+    const disable = instance.find(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.AUTOMATE_DISABLE_LOCAL_CONTROL &&
+        el.type === TouchableOpacity
+    );
+    await act(async () => {
+      await disable.props.onPress();
+    });
+    expect(mock.history.post.length).toBe(0);
+  });
 });

package/src/screens/Automate/ScriptDetail/index.js

@@ -46,7 +46,7 @@ import { Card } from '../../../commons/CardShadow';
 const PreventDoubleTouch = withPreventDoubleClick(TouchableOpacity);
 
 const ScriptDetail = ({ route }) => {
-  const { dispatch, navigate, goBack } = useNavigation();
+  const { dispatch, navigate, goBack, getState } = useNavigation();
   const { params = {} } = route;
   const refMenuAction = useRef();
   const { childRef, showingPopover, showPopoverWithRef, hidePopover } =
@@ -114,38 +114,41 @@ const ScriptDetail = ({ route }) => {
 
   const handleNavigate = useCallback(
     (screen, screenParams) => {
-      dispatch((state) => {
-        const index = state.routes.findIndex((r) => r.name === closeScreen);
-        let routes = [];
-        if (!closeScreen) {
-          routes = state.routes;
-        } else if (index >= 0) {
-          routes = state.routes.slice(0, index + 1);
-        }
-        const hasScriptDetail = routes.some(
-          (r) => r.name === Routes.ScriptDetail
-        );
-
-        if (!hasScriptDetail) {
-          routes.push({
-            name: Routes.ScriptDetail,
-            params: route.params,
-          });
-        }
+      const state = getState();
+      const index = state.routes.findIndex((r) => r.name === closeScreen);
+      let routes = [];
+      if (!closeScreen) {
+        routes = state.routes;
+      } else if (index >= 0) {
+        routes = state.routes.slice(0, index + 1);
+      }
+      const hasScriptDetail = routes.some(
+        (r) => r.name === Routes.ScriptDetail
+      );
 
+      if (!hasScriptDetail) {
         routes.push({
-          name: screen,
-          params: screenParams,
+          name: Routes.ScriptDetail,
+          params: route.params,
         });
+      }
 
-        return CommonActions.reset({
-          ...state,
-          routes: routes,
-          index: routes.length - 1,
-        });
+      routes.push({
+        name: screen,
+        params: screenParams,
       });
+
+      setTimeout(() => {
+        dispatch(
+          CommonActions.reset({
+            routes: routes,
+            index: routes.length - 1,
+          })
+        );
+      }, 500); // Workaround: Fix crash on iOS when resetting the stack with dispatch.
+      // Delay added to ensure navigation state updates before dispatching reset.
     },
-    [closeScreen, dispatch, route.params]
+    [closeScreen, dispatch, getState, route.params]
   );
 
   const handleUpdateAutomate = useCallback(async () => {
@@ -267,7 +270,10 @@ const ScriptDetail = ({ route }) => {
       closeScreen === Routes.MultiUnits ||
       closeScreen === Routes.Automate
     ) {
-      navigate(closeScreen, {});
+      navigate({
+        name: closeScreen,
+        merge: true,
+      });
     } else {
       goBack();
     }
@@ -356,6 +362,10 @@ const ScriptDetail = ({ route }) => {
 
   const onPressSelectChip = useCallback(
     async (enable_local_control, item) => {
+      if (!enable_local_control && !local_control.chip_id_local_control) {
+        setIsShowLocalControl(false);
+        return;
+      }
       const { success } = await axiosPost(
         API.AUTOMATE.ENABLE_LOCAL_CONTROL(automateId),
         {
@@ -372,20 +382,23 @@ const ScriptDetail = ({ route }) => {
         });
       }
     },
-    [automateId]
+    [automateId, local_control.chip_id_local_control]
   );
 
   const renderLocalControl = useMemo(() => {
     if (!!can_edit && type !== AUTOMATE_TYPE.ONE_TAP) {
       return (
         <View style={styles.row}>
-          <Text type="H3" semibold style={styles.width40}>
+          <Text type="H3" semibold style={styles.width50}>
             {t('local_control')}
           </Text>
           <Card style={styles.card}>
             <TouchableOpacity
               style={styles.localControl}
               onPress={onShowLocalControl}
+              accessibilityLabel={
+                AccessibilityLabel.AUTOMATE_SHOW_LOCAL_CONTROL
+              }
             >
               <Text numberOfLines={1}>
                 {local_control.is_local_control
@@ -534,27 +547,35 @@ const ScriptDetail = ({ route }) => {
         onBackButtonPress={onCloseLocalControl}
         onBackdropPress={onCloseLocalControl}
       >
-        <View style={styles.popoverStyle}>
+        <View key={'localControl'} style={styles.popoverStyle}>
           <TouchableOpacity
             style={styles.textDisable}
+            key={'listChip'}
             onPress={() => {
               onPressSelectChip(false, {
                 id: local_control.chip_id_local_control,
                 name: local_control.chip_local_control,
               });
             }}
+            accessibilityLabel={
+              AccessibilityLabel.AUTOMATE_DISABLE_LOCAL_CONTROL
+            }
           >
             <Text>{t('disable')}</Text>
             {!local_control.is_local_control && (
               <IconOutline style={styles.checked} name={'check'} size={20} />
             )}
           </TouchableOpacity>
-          {listChipShared.map((item) => (
+          {listChipShared.map((item, index) => (
             <TouchableOpacity
+              key={'listChip' + index} // Add key fix warning
               style={styles.listChip}
               onPress={() => {
                 onPressSelectChip(true, item);
               }}
+              accessibilityLabel={
+                AccessibilityLabel.AUTOMATE_ENABLE_LOCAL_CONTROL
+              }
             >
               <Text>{item.name}</Text>
               {local_control.chip_id_local_control === item.id &&

package/src/utils/I18n/translations/vi.js

@@ -1081,7 +1081,7 @@ export default {
   automate: 'Tự động',
   smart: 'Thông minh',
   enable_this_script: 'Kích hoạt kịch bản này',
-  local_control: 'Điều khiển cục bộ',
+  local_control: 'Điều khiển tại biên',
   choose_gateway: 'Chọn gateway',
   this_script_has_been_disabled: 'Kịch bản này đã bị vô hiệu hoá',
   disable: 'Vô hiệu hóa',
@@ -1090,7 +1090,7 @@ export default {
   sms_alarm: 'Cảnh báo SMS',
   message_sms:
     'Nội dung cảnh báo: “Đang có tín hiệu báo cháy từ lầu 1, vui lòng kiểm tra.”',
-  only_in_local_control: 'Chỉ hoạt động ở chế độ điều khiển cục bộ',
+  only_in_local_control: 'Chỉ hoạt động ở chế độ điều khiển tại biên',
   send_app_notification: 'Gửi thông báo qua ứng dụng',
   delay_the_action: 'Trì hoãn hành động',
   wait: 'Chờ đợi',