@eohjsc/react-native-smart-city 0.7.3 → 0.7.4

package/src/screens/Automate/MultiUnits.js

@@ -25,9 +25,12 @@ const MultiUnits = () => {
   const isFocused = useIsFocused();
   const { navigate } = useNavigation();
   const { params = {}, name: currentRouteName } = useRoute();
-  const { unit, newAutomate } = params;
+  const { unit = {} } = params;
+  const { id: unitId, name } = unit;
   const [data, setData] = useState([]);
   const permissions = useBackendPermission();
+  const { smart_script_for_multi_unit, max_automations_per_unit } =
+    permissions || {};
 
   const [tabActive, setTabActive] = useState(AUTOMATE_TABS.SCENARIO);
 
@@ -37,8 +40,8 @@ const MultiUnits = () => {
 
   const getData = useCallback(
     async (fetchParams) => {
-      if (unit?.id) {
-        await fetchWithCache(API.UNIT.AUTOMATE(unit?.id), {}, (response) => {
+      if (unitId) {
+        await fetchWithCache(API.UNIT.AUTOMATE(unitId), {}, (response) => {
           const { success, data: automateData } = response;
           success && setData(automateData);
         });
@@ -50,7 +53,7 @@ const MultiUnits = () => {
         success && setData(automateData);
       }
     },
-    [unit?.id]
+    [unitId]
   );
 
   const onPressTabName = (tab) => () => {
@@ -62,32 +65,26 @@ const MultiUnits = () => {
       navigate(Routes.UnitStack, {
         screen: Routes.ScriptDetail,
         params: {
-          id: item?.id,
-          unitId: unit?.id,
           preAutomate: item,
         },
       });
     },
-    [navigate, unit?.id]
+    [navigate]
   );
 
-  useEffect(() => {
-    newAutomate && onPressItem(newAutomate);
-  }, [newAutomate, onPressItem]);
-
   const handleOnAddNew = useCallback(() => {
-    if (unit?.id) {
-      if (permissions?.max_automations_per_unit <= data.length) {
+    if (unitId) {
+      if (max_automations_per_unit <= data.length) {
         ToastBottomHelper.error(
           t('reach_max_automations_per_unit', {
-            length: permissions.max_automations_per_unit,
+            length: max_automations_per_unit,
           }),
           '',
           7000
         );
         return;
       }
-    } else if (!permissions?.smart_script_for_multi_unit) {
+    } else if (!smart_script_for_multi_unit) {
       ToastBottomHelper.error(
         t('no_permission_smart_script_for_multi_unit'),
         '',
@@ -99,7 +96,7 @@ const MultiUnits = () => {
       navigate(Routes.UnitStack, {
         screen: Routes.ScenarioName,
         params: {
-          automate: { type: AUTOMATE_TYPE.ONE_TAP, unit: unit?.id },
+          automate: { type: AUTOMATE_TYPE.ONE_TAP, unit: unitId },
           closeScreen: currentRouteName,
         },
       });
@@ -107,9 +104,9 @@ const MultiUnits = () => {
     }
 
     navigate(Routes.UnitStack, {
-      screen: Routes.AddUnknownTypeSmart,
+      screen: Routes.AddAutomationTypeSmart,
       params: {
-        automate: { unit: unit?.id },
+        automate: { unit: unitId },
         closeScreen: currentRouteName,
       },
     });
@@ -117,11 +114,11 @@ const MultiUnits = () => {
     currentRouteName,
     data.length,
     navigate,
-    permissions?.max_automations_per_unit,
-    permissions?.smart_script_for_multi_unit,
+    max_automations_per_unit,
+    smart_script_for_multi_unit,
     t,
     tabActive,
-    unit?.id,
+    unitId,
   ]);
 
   const renderContent = useMemo(() => {
@@ -166,7 +163,7 @@ const MultiUnits = () => {
   return (
     <View style={styles.wrap}>
       <WrapHeaderScrollable
-        title={unit?.id ? unit?.name : t('multi_units_automate')}
+        title={unitId ? name : t('multi_units_automate')}
         headerAniStyle={styles.headerAniStyle}
       >
         <View style={styles.wrapContent}>

package/src/screens/Automate/OneTap/__test__/AddNewOneTap.test.js

@@ -1,16 +1,16 @@
-import React from 'react';
 import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
 import { Platform, TextInput, TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 
-import AddNewOneTap from '../index';
+import { useNavigation, useRoute } from '@react-navigation/native';
+import { API } from '../../../../configs';
 import { AccessibilityLabel } from '../../../../configs/Constants';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
-import Routes from '../../../../utils/Route';
 import api from '../../../../utils/Apis/axios';
-import { API } from '../../../../configs';
-import { useNavigation, useRoute } from '@react-navigation/native';
+import Routes from '../../../../utils/Route';
+import AddNewOneTap from '../index';
 
 const wrapComponent = (route) => {
   useRoute.mockReturnValue(route);
@@ -81,7 +81,8 @@ describe('test OneTap', () => {
       merge: true,
       name: Routes.ScriptDetail,
       params: {
-        newAutomate: {
+        closeScreen: Routes.ScriptDetail,
+        preAutomate: {
           id: 1,
           script: { id: 1, name: 'William Miller' },
           type: 'one_tap',
@@ -114,7 +115,7 @@ describe('test OneTap', () => {
     await act(async () => {
       await item[0].props.onPress();
     });
-    expect(global.mockedNavigate).not.toBeCalled();
+    expect(global.mockedNavigate).not.toHaveBeenCalled();
   });
 
   it('test onClose have automateId', async () => {
@@ -122,8 +123,13 @@ describe('test OneTap', () => {
     let route = {
       params: {
         closeScreen: Routes.ScriptDetail,
+        automate: {
+          unit: 1,
+        },
+        unitId: 1,
       },
     };
+
     mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(400);
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -136,6 +142,10 @@ describe('test OneTap', () => {
     await act(async () => {
       header.props.onPress();
     });
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
+      unitId: 1,
+      automate: { unit: 1 },
+      closeScreen: Routes.ScriptDetail,
+    });
   });
 });

package/src/screens/Automate/Scenario/__test__/AddNewOneTap.test.js

@@ -1,16 +1,16 @@
-import React from 'react';
 import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
 import { Platform, TextInput, TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 
-import ScenarioName from '../ScenarioName';
+import { useNavigation, useRoute } from '@react-navigation/native';
+import { API } from '../../../../configs';
 import { AccessibilityLabel } from '../../../../configs/Constants';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
-import Routes from '../../../../utils/Route';
 import api from '../../../../utils/Apis/axios';
-import { API } from '../../../../configs';
-import { useNavigation, useRoute } from '@react-navigation/native';
+import Routes from '../../../../utils/Route';
+import ScenarioName from '../ScenarioName';
 
 const wrapComponent = (route) => {
   useRoute.mockReturnValue(route);
@@ -103,7 +103,7 @@ describe('test OneTap', () => {
     await act(async () => {
       await item[0].props.onPress();
     });
-    expect(global.mockedNavigate).not.toBeCalled();
+    expect(global.mockedNavigate).not.toHaveBeenCalled();
   });
 
   it('test onClose have automateId', async () => {
@@ -111,6 +111,10 @@ describe('test OneTap', () => {
     let route = {
       params: {
         closeScreen: Routes.ScriptDetail,
+        automate: {
+          unit: 1,
+        },
+        unitId: 1,
       },
     };
     mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(400);
@@ -125,6 +129,10 @@ describe('test OneTap', () => {
     await act(async () => {
       header.props.onPress();
     });
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
+      unitId: 1,
+      automate: { unit: 1 },
+      closeScreen: 'ScriptDetail',
+    });
   });
 });

package/src/screens/Automate/ScriptDetail/Components/AddActionScript.js

@@ -11,7 +11,7 @@ import Event from '../../../../../assets/images/Event.svg';
 import Notify from '../../../../../assets/images/Notify.svg';
 import Delay from '../../../../../assets/images/Delay.svg';
 import { TouchableOpacity } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { Text } from '../../../../commons';
 import Routes from '../../../../utils/Route';
 import AccessibilityLabel from '../../../../configs/AccessibilityLabel';
@@ -40,6 +40,7 @@ const AddActionScript = memo(
               closeScreen: currentScreenName,
               numberActionCanAdd:
                 max_actions_per_automation - numberActionAdded,
+              routeName: unit ? null : Routes.SelectControlDevices,
             };
 
             navigate(
@@ -54,10 +55,17 @@ const AddActionScript = memo(
           image: <Notify />,
           onClick: () => {
             setIsVisible(false);
-            navigate(Routes.SetupScriptNotify, {
-              automate,
-              unitId: unit,
-            });
+            if (unit) {
+              navigate(Routes.SetupScriptNotify, {
+                automate,
+                unitId: unit,
+              });
+            } else {
+              navigate(Routes.SelectUnit, {
+                automate,
+                routeName: Routes.SetupScriptNotify,
+              });
+            }
           },
         },
         {
@@ -109,7 +117,7 @@ const AddActionScript = memo(
                   <View style={styles.wapItem}>
                     <View style={styles.imageItem}>{item.image}</View>
                     <Text style={styles.textItem}>{item.text}</Text>
-                    <AntDesign name="right" />
+                    <IconOutline name="right" />
                   </View>
                 </TouchableOpacity>
               </View>

package/src/screens/Automate/ScriptDetail/Components/RenameScript.js

@@ -14,14 +14,11 @@ const RenameScript = ({ automate, setAutomate, isVisible, setIsVisible }) => {
   const transY = useKeyboardAnimated();
 
   const renameScript = useCallback(async () => {
-    const { success, data: script } = await axiosPatch(
-      API.AUTOMATE.SCRIPT(automate.id),
-      {
-        name: inputName,
-      }
-    );
+    const { success } = await axiosPatch(API.AUTOMATE.SCRIPT(automate.id), {
+      name: inputName,
+    });
     if (success) {
-      setAutomate((prev) => ({ ...prev, name: script.name }));
+      setAutomate((prev) => ({ ...prev, name: inputName }));
       ToastBottomHelper.success(t('rename_successfully'));
     } else {
       ToastBottomHelper.error(t('rename_failed'));

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

@@ -8,7 +8,6 @@ import MockAdapter from 'axios-mock-adapter';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
 import ScriptDetail from '../index';
-import MenuActionMore from '../../../../commons/MenuActionMore';
 import AlertAction from '../../../../commons/AlertAction';
 import _TextInput from '../../../../commons/Form/TextInput';
 import {
@@ -18,12 +17,12 @@ import {
 import { API } from '../../../../configs';
 import Routes from '../../../../utils/Route';
 import WrapHeaderScrollable from '../../../../commons/Sharing/WrapHeaderScrollable';
-import ItemAutomate from '../../../../commons/Automate/ItemAutomate';
 import api from '../../../../utils/Apis/axios';
 import Text from '../../../../commons/Text';
 import { ToastBottomHelper } from '../../../../utils/Utils';
 import { getTranslate } from '../../../../utils/I18n';
 import AddActionScript from '../Components/AddActionScript';
+import ItemConditionScriptDetail from '../../../../commons/Automate/ItemConditionScriptDetail';
 
 const wrapComponent = (route, storeData = {}) => (
   <SCProvider initState={mockSCStore(storeData)}>
@@ -101,7 +100,10 @@ describe('Test ScriptDetail', () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const menu = instance.findByType(MenuActionMore);
+    const menu = instance.find(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.MENU_POPPER_MORE
+    );
     const alertAction = instance.findAllByType(AlertAction)[0];
     const rename = menu.props.listMenuItem[0];
 
@@ -127,7 +129,10 @@ describe('Test ScriptDetail', () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const menu = instance.findByType(MenuActionMore);
+    const menu = instance.find(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.MENU_POPPER_MORE
+    );
     const alertAction = instance.findAllByType(AlertAction)[0];
     const rename = menu.props.listMenuItem[0];
 
@@ -153,9 +158,9 @@ describe('Test ScriptDetail', () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const menu = instance.findByProps({
-      accessibilityLabel: AccessibilityLabel.ICON_MORE,
-    });
+    const menu = instance.find(
+      (el) => el.props.accessibilityLabel === AccessibilityLabel.ICON_MORE
+    );
 
     await act(async () => {
       await menu.props.onPress();
@@ -173,7 +178,7 @@ describe('Test ScriptDetail', () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const itemAutomate = instance.findByType(ItemAutomate);
+    const itemAutomate = instance.findByType(ItemConditionScriptDetail);
 
     await act(async () => {
       await itemAutomate.props.onPress();
@@ -188,7 +193,10 @@ describe('Test ScriptDetail', () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const menu = instance.findByType(MenuActionMore);
+    const menu = instance.find(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.MENU_POPPER_MORE
+    );
     const alertAction = instance.findAllByType(AlertAction)[1];
     const deleteItem = menu.props.listMenuItem[2];
 
@@ -222,7 +230,10 @@ describe('Test ScriptDetail', () => {
     await act(async () => {
       await buttonStar.props.onPress();
     });
-    const menu = instance.findByType(MenuActionMore);
+    const menu = instance.find(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.MENU_POPPER_MORE
+    );
     const addFavorite = menu.props.listMenuItem[1];
     mock.onPost(API.AUTOMATE.STAR_SCRIPT(1)).reply(200);
     await act(async () => {
@@ -308,6 +319,8 @@ describe('Test ScriptDetail', () => {
         unitId: route.params.preAutomate.unit,
         automateId: route.params.preAutomate.id,
         numberActionCanAdd: 2,
+        closeScreen: undefined,
+        routeName: null,
       }
     );
     mockedNavigate.mockClear();
@@ -344,7 +357,7 @@ describe('Test ScriptDetail', () => {
     const instance = tree.root;
     const switchButton = instance.findByType(Switch);
     await act(async () => {
-      await switchButton.props.onChange(false);
+      await switchButton.props.onValueChange(false);
     });
     const buttonAddScript = instance.findAll(
       (el) =>
@@ -442,7 +455,10 @@ describe('Test ScriptDetail', () => {
         tree = await create(wrapComponent(route));
       });
       const instance = tree.root;
-      const menu = instance.findByType(MenuActionMore);
+      const menu = instance.find(
+        (el) =>
+          el.props.accessibilityLabel === AccessibilityLabel.MENU_POPPER_MORE
+      );
       const gotoActivityLog = menu.props.listMenuItem[1];
 
       await act(async () => {
@@ -490,7 +506,7 @@ describe('Test ScriptDetail', () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const itemAutomate = instance.findByType(ItemAutomate);
+    const itemAutomate = instance.findByType(ItemConditionScriptDetail);
     expect(itemAutomate.findAllByType(Text)[1].props.children).toEqual(
       'Light Value higher than 3'
     );
@@ -498,6 +514,15 @@ describe('Test ScriptDetail', () => {
     await act(async () => {
       itemAutomate.findByType(TouchableOpacity).props.onPress();
     });
+    const menuActionMore = instance.find(
+      (el) =>
+        el.props.accessibilityLabel ===
+        AccessibilityLabel.MENU_ACTION_LIST_TOUCHABLE
+    );
+    await act(async () => {
+      menuActionMore.props.onItemClick({ doAction: jest.fn() });
+      menuActionMore.props.listMenuItem[0].doAction();
+    });
     expect(global.mockedNavigate).toBeCalled();
   });
 
@@ -513,7 +538,7 @@ describe('Test ScriptDetail', () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const itemAutomate = instance.findByType(ItemAutomate);
+    const itemAutomate = instance.findByType(ItemConditionScriptDetail);
     expect(itemAutomate.findAllByType(Text)[1].props.children).toEqual(
       'Light Value equal 3'
     );
@@ -535,7 +560,7 @@ describe('Test ScriptDetail', () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const itemAutomate = instance.findByType(ItemAutomate);
+    const itemAutomate = instance.findByType(ItemConditionScriptDetail);
     expect(itemAutomate.findAllByType(Text)[1].props.children).toEqual(
       'Light Value lower than 3'
     );
@@ -557,7 +582,7 @@ describe('Test ScriptDetail', () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const itemAutomate = instance.findByType(ItemAutomate);
+    const itemAutomate = instance.findByType(ItemConditionScriptDetail);
     expect(itemAutomate.findAllByType(Text)[1].props.children).toEqual(
       'Every day at 19:00'
     );
@@ -580,7 +605,7 @@ describe('Test ScriptDetail', () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const itemAutomate = instance.findByType(ItemAutomate);
+    const itemAutomate = instance.findByType(ItemConditionScriptDetail);
     expect(itemAutomate.findAllByType(Text)[1].props.children).toEqual(
       'Mon, Tue, Thu, Sat at 19:00'
     );

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

@@ -1,12 +1,12 @@
-import React from 'react';
 import { act, renderHook } from '@testing-library/react-hooks';
-import { SCProvider } from '../../../../context';
-import { mockSCStore } from '../../../../context/mockStore';
-import { useStarredScript } from '../hooks/useStarredScript';
 import MockAdapter from 'axios-mock-adapter';
-import api from '../../../../utils/Apis/axios';
+import React from 'react';
 import { API } from '../../../../configs';
+import { SCProvider } from '../../../../context';
 import { Action } from '../../../../context/actionType';
+import { mockSCStore } from '../../../../context/mockStore';
+import api from '../../../../utils/Apis/axios';
+import { useStarredScript } from '../hooks/useStarredScript';
 
 const mockedSetAction = jest.fn();
 const mock = new MockAdapter(api.axiosInstance);
@@ -42,6 +42,6 @@ describe('Test useStarredScript', () => {
     await act(async () => {
       await result.current.unstarScript();
     });
-    expect(mockedSetAction).toBeCalledWith(Action.UNSTAR_SCRIPTS, [2]);
+    expect(mockedSetAction).toHaveBeenCalledWith(Action.UNSTAR_SCRIPTS, [2]);
   });
 });