@eohjsc/react-native-smart-city 0.7.21 → 0.7.23

package/src/screens/Automate/EditActionsList/__tests__/UpdateActionScript.test.js

@@ -20,7 +20,7 @@ const mockedPermission = jest.fn();
 
 jest.mock('../../../../utils/Permission/backend', () => ({
   useBackendPermission: () => ({
-    max_actions_per_automation: 1,
+    max_actions_per_automation: 2,
   }),
 }));
 
@@ -33,12 +33,27 @@ let response = [
       text_off: 'text_off',
       action_on: 'action_on',
       action_off: 'action_off',
+      config: 9,
+      is_on_value: [1],
     },
   },
   {
+    title: 'Trigger',
     template: 'one_button_action_template',
     configuration: { text: 'text', action: 'action' },
   },
+  {
+    title: 'Garage',
+    template: 'three_button_action_template',
+    configuration: {
+      action1: 'garage open',
+      action2: 'garage close',
+      action3: 'garage stop',
+      text1: 'Open',
+      text2: 'Close',
+      text3: 'Stop',
+    },
+  },
 ];
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -48,35 +63,38 @@ const wrapComponent = (route) => (
 
 describe('Test UpdateActionScript', () => {
   let tree;
-  let route = {
-    params: {
-      unitId: 1,
-      automateId: 1,
-      scriptItemId: 1,
-      numberActionAdded: 0,
-      device: { id: 1 },
-    },
-  };
+  let activatedScript;
+  let route;
+
   beforeEach(() => {
+    activatedScript = {
+      id: 1,
+      action_script: {
+        id: 1,
+        action_name: 'ON',
+        data: null,
+        end_device_id: 2,
+        sensor_name: 'LED',
+        station_name: 'Room',
+        unit_name: 'EoH Office',
+      },
+      toggle_script: null,
+      order: 1,
+    };
+    route = {
+      params: {
+        unitId: 1,
+        automateId: 1,
+        activatedScript,
+        scriptItems: [activatedScript],
+        device: { id: 1 },
+      },
+    };
     useRoute.mockReturnValue({
       params: {},
     });
     mockedPermission.mockClear();
-  });
-
-  it('test update action script', async () => {
-    mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response);
-    mock.onPut(API.AUTOMATE.UPDATE_SCRIPT_ACTION(1)).reply(200);
-    mock.onGet(API.AUTOMATE.SCRIPT_ITEMS(1)).reply(200, { script_items: [] });
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    await showAllCards(instance);
-    await selectActionOn(instance);
-    await pressSaveButton(instance);
-
-    expect(global.mockedNavigate).toHaveBeenCalled();
+    mock.reset();
   });
 
   const pressSaveButton = async (instance) => {
@@ -90,20 +108,6 @@ describe('Test UpdateActionScript', () => {
     });
   };
 
-  it('test update action script fail', async () => {
-    mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response);
-    mock.onPut(API.AUTOMATE.UPDATE_SCRIPT_ACTION(1)).reply(400);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    await showAllCards(instance);
-    await selectActionOn(instance);
-    await pressSaveButton(instance);
-
-    expect(global.mockedNavigate).not.toHaveBeenCalled();
-  });
-
   const selectActionOn = async (instance) => {
     const buttonOn = instance.findAll(
       (el) =>
@@ -126,6 +130,17 @@ describe('Test UpdateActionScript', () => {
     });
   };
 
+  const selectActionToggle = async (instance) => {
+    const buttonToggle = instance.findAll(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.TOGGLE_BUTTON &&
+        el.type === TouchableOpacity
+    );
+    await act(async () => {
+      buttonToggle[0].props.onPress();
+    });
+  };
+
   const selectActionOne = async (instance) => {
     const buttonOne = instance.findAll(
       (el) =>
@@ -137,6 +152,243 @@ describe('Test UpdateActionScript', () => {
     });
   };
 
+  const selectActionFirstThreeTemplate = async (instance) => {
+    const buttonOne = instance.findAll(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.BUTTON_TEMPLATE_1 &&
+        el.type === TouchableOpacity
+    );
+    await act(async () => {
+      buttonOne[0].props.onPress();
+    });
+  };
+
+  it('test update action script', async () => {
+    mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response);
+    mock.onPut(API.AUTOMATE.UPDATE_SCRIPT_ACTION(1)).reply(200);
+    mock.onGet(API.AUTOMATE.SCRIPT_ITEMS(1)).reply(200, { script_items: [] });
+    await act(async () => {
+      tree = await renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    await showAllCards(instance);
+    await selectActionOn(instance);
+    await pressSaveButton(instance);
+
+    expect(mock.history.put).toHaveLength(1);
+    expect(mock.history.put[0].url).toEqual(
+      API.AUTOMATE.UPDATE_SCRIPT_ACTION(1)
+    );
+    expect(mock.history.put[0].data).toEqual(
+      JSON.stringify({
+        id: 1,
+        list_action: [
+          {
+            action: 'action_on',
+            data: null,
+            order: 1,
+          },
+        ],
+        number_action: 1,
+        unit: 1,
+      })
+    );
+    expect(global.mockedNavigate).toHaveBeenCalled();
+  });
+
+  it('test update action script to toggle script and add new action', async () => {
+    mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response);
+    mock.onDelete(API.AUTOMATE.DELETE_SCRIPT_ITEM(1, 1)).reply(200);
+    mock.onPost(API.AUTOMATE.ADD_SCRIPT_ACTION(1)).reply(200);
+    mock.onPost(API.AUTOMATE.ADD_SCRIPT_TOGGLE(1)).reply(200);
+    mock.onGet(API.AUTOMATE.SCRIPT_ITEMS(1)).reply(200, { script_items: [] });
+    await act(async () => {
+      tree = await renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    await showAllCards(instance);
+    await selectActionToggle(instance);
+    await selectActionOne(instance);
+    await pressSaveButton(instance);
+
+    expect(mock.history.delete).toHaveLength(1);
+    expect(mock.history.delete[0].url).toEqual(
+      API.AUTOMATE.DELETE_SCRIPT_ITEM(1, 1)
+    );
+    expect(mock.history.post).toHaveLength(2);
+    expect(mock.history.post[0].url).toEqual(API.AUTOMATE.ADD_SCRIPT_TOGGLE(1));
+    expect(mock.history.post[0].data).toEqual(
+      JSON.stringify({
+        list_action: [
+          {
+            action_on: 'action_on',
+            action_off: 'action_off',
+            config: 9,
+            action_on_data: null,
+            action_off_data: null,
+            is_on_values: [1],
+            order: 1,
+          },
+        ],
+        start_order: 1,
+        number_action: 2,
+        unit: 1,
+      })
+    );
+    expect(mock.history.post[1].url).toEqual(API.AUTOMATE.ADD_SCRIPT_ACTION(1));
+    expect(mock.history.post[1].data).toEqual(
+      JSON.stringify({
+        list_action: [
+          {
+            action: 'action',
+            data: null,
+            order: 2,
+          },
+        ],
+        unit: 1,
+      })
+    );
+    expect(global.mockedNavigate).toHaveBeenCalled();
+  });
+
+  it('test update toggle script', async () => {
+    activatedScript = {
+      ...activatedScript,
+      action_script: null,
+      toggle_script: {
+        id: 1,
+        end_device_id: 2,
+        sensor_name: 'LED',
+        station_name: 'Room',
+        unit_name: 'EoH Office',
+      },
+    };
+    route.params = {
+      ...route.params,
+      activatedScript,
+      scriptItems: [activatedScript],
+    };
+    mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response);
+    mock.onPut(API.AUTOMATE.UPDATE_SCRIPT_TOGGLE(1)).reply(200);
+    mock.onGet(API.AUTOMATE.SCRIPT_ITEMS(1)).reply(200, { script_items: [] });
+    await act(async () => {
+      tree = await renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    await showAllCards(instance);
+    await selectActionToggle(instance);
+    await pressSaveButton(instance);
+
+    expect(mock.history.put).toHaveLength(1);
+    expect(mock.history.put[0].url).toEqual(
+      API.AUTOMATE.UPDATE_SCRIPT_TOGGLE(1)
+    );
+    expect(mock.history.put[0].data).toEqual(
+      JSON.stringify({
+        id: 1,
+        list_action: [
+          {
+            action_on: 'action_on',
+            action_off: 'action_off',
+            config: 9,
+            action_on_data: null,
+            action_off_data: null,
+            is_on_values: [1],
+            order: 1,
+          },
+        ],
+        number_action: 1,
+        unit: 1,
+      })
+    );
+    expect(global.mockedNavigate).toHaveBeenCalled();
+  });
+
+  it('test update toggle script to action script and add new toggle', async () => {
+    activatedScript = {
+      ...activatedScript,
+      action_script: null,
+      toggle_script: {
+        id: 1,
+        end_device_id: 2,
+        sensor_name: 'LED',
+        station_name: 'Room',
+        unit_name: 'EoH Office',
+      },
+    };
+    route.params = {
+      ...route.params,
+      activatedScript,
+      scriptItems: [activatedScript],
+    };
+    mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response);
+    mock.onDelete(API.AUTOMATE.DELETE_SCRIPT_ITEM(1, 1)).reply(200);
+    mock.onPost(API.AUTOMATE.ADD_SCRIPT_ACTION(1)).reply(200);
+    mock.onPost(API.AUTOMATE.ADD_SCRIPT_TOGGLE(1)).reply(200);
+    mock.onGet(API.AUTOMATE.SCRIPT_ITEMS(1)).reply(200, { script_items: [] });
+    await act(async () => {
+      tree = await renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    await showAllCards(instance);
+    await selectActionOne(instance);
+    await selectActionToggle(instance);
+    await pressSaveButton(instance);
+
+    expect(mock.history.delete).toHaveLength(1);
+    expect(mock.history.delete[0].url).toEqual(
+      API.AUTOMATE.DELETE_SCRIPT_ITEM(1, 1)
+    );
+    expect(mock.history.post).toHaveLength(2);
+    expect(mock.history.post[0].url).toEqual(API.AUTOMATE.ADD_SCRIPT_ACTION(1));
+    expect(mock.history.post[0].data).toEqual(
+      JSON.stringify({
+        list_action: [
+          {
+            action: 'action',
+            data: null,
+            order: 2,
+          },
+        ],
+        start_order: 2,
+        number_action: 2,
+        unit: 1,
+      })
+    );
+    expect(mock.history.post[1].url).toEqual(API.AUTOMATE.ADD_SCRIPT_TOGGLE(1));
+    expect(mock.history.post[1].data).toEqual(
+      JSON.stringify({
+        list_action: [
+          {
+            action_on: 'action_on',
+            action_off: 'action_off',
+            config: 9,
+            action_on_data: null,
+            action_off_data: null,
+            is_on_values: [1],
+            order: 1,
+          },
+        ],
+        unit: 1,
+      })
+    );
+    expect(global.mockedNavigate).toHaveBeenCalled();
+  });
+
+  it('test update action script fail', async () => {
+    mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response);
+    mock.onPut(API.AUTOMATE.UPDATE_SCRIPT_ACTION(1)).reply(400);
+    await act(async () => {
+      tree = await renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    await showAllCards(instance);
+    await selectActionOn(instance);
+    await pressSaveButton(instance);
+
+    expect(global.mockedNavigate).not.toHaveBeenCalled();
+  });
+
   it('test can not update because adding too many times allowed', async () => {
     mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response);
     const spyToast = jest.spyOn(ToastBottomHelper, 'error');
@@ -145,13 +397,18 @@ describe('Test UpdateActionScript', () => {
     });
 
     const instance = tree.root;
-    expect(instance.findAllByType(RenderActionItem).length).toBe(2);
+    expect(instance.findAllByType(RenderActionItem).length).toBe(3);
     await showAllCards(instance);
     await selectActionOn(instance);
     await selectActionOff(instance);
     await selectActionOne(instance);
+    await selectActionFirstThreeTemplate(instance);
     await pressSaveButton(instance);
 
-    expect(spyToast).toHaveBeenCalled();
+    expect(spyToast).toHaveBeenCalledWith(
+      'You can only add more 1 action',
+      null,
+      3000
+    );
   });
 });

package/src/screens/Automate/EditActionsList/__tests__/index.test.js

@@ -170,12 +170,12 @@ describe('EditActionsList', () => {
       Routes.UpdateActionScript,
       {
         automateId: 1,
+        activatedScript: actionsList[0],
         closeScreen: Routes.EditActionsList,
         device: {
           id: 1,
         },
-        numberActionAdded: 4,
-        scriptItemId: 1,
+        scriptItems: actionsList,
         unitId: undefined,
       }
     );

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

@@ -144,19 +144,20 @@ const EditActionsList = () => {
       const paddedIndex = (index + 1).toString().padStart(2, '0');
       const {
         action_script,
+        toggle_script,
         notify_script,
         delay_script,
         email_script,
         sms_script,
       } = item;
-      if (action_script) {
+      if (action_script || toggle_script) {
         const {
           sensor_icon_kit,
           station_name,
           sensor_name,
           action_name,
           data: data_action,
-        } = action_script;
+        } = action_script || toggle_script;
 
         return (
           <CommonItem
@@ -178,7 +179,9 @@ const EditActionsList = () => {
                   {sensor_name}
                 </Text>
                 <Text numberOfLines={1} type="H4" color={Colors.Gray9}>
-                  {action_name} {data_action}
+                  {toggle_script
+                    ? t('toggle')
+                    : `${action_name} ${data_action || ''}`}
                 </Text>
               </>
             }
@@ -316,6 +319,7 @@ const EditActionsList = () => {
   const renderAction = useMemo(() => {
     const {
       action_script,
+      toggle_script,
       notify_script,
       delay_script,
       email_script,
@@ -323,17 +327,17 @@ const EditActionsList = () => {
       id: scriptItemId,
     } = scriptItem;
 
-    if (action_script) {
+    if (action_script || toggle_script) {
       onClosePopup();
       setScriptItem({});
       navigate(Routes.UpdateActionScript, {
         unitId,
         automateId: id,
+        activatedScript: scriptItem,
         device: {
-          id: action_script.end_device_id,
+          id: action_script?.end_device_id || toggle_script?.end_device_id,
         },
-        numberActionAdded: actionsList.length,
-        scriptItemId: scriptItemId,
+        scriptItems: actionsList,
         closeScreen: Routes.EditActionsList,
       });
     }
@@ -407,27 +411,35 @@ const EditActionsList = () => {
   );
 
   const renderMessageRemove = useMemo(() => {
-    const { action_script, notify_script, delay_script, email_script } =
-      itemRemove;
-    if (action_script) {
+    const {
+      action_script,
+      toggle_script,
+      notify_script,
+      delay_script,
+      email_script,
+    } = itemRemove;
+    if (action_script || toggle_script) {
+      const actionName = action_script?.action_name || t('toggle');
+      const stationName =
+        action_script?.station_name || toggle_script?.station_name;
       return (
         <ParsedText
           style={styles.messageDelete}
           parse={[
             {
-              pattern: new RegExp(itemRemove.action_script.action_name),
+              pattern: new RegExp(actionName),
               style: styles.textHighlight,
             },
             {
-              pattern: new RegExp(itemRemove.action_script.station_name),
+              pattern: new RegExp(stationName),
               style: styles.textHighlight,
             },
           ]}
           childrenProps={{ allowFontScaling: false }}
         >
           {t('message_delete_action', {
-            actionName: itemRemove.action_script.action_name,
-            stationName: itemRemove.action_script.station_name,
+            actionName: actionName,
+            stationName: stationName,
           })}
         </ParsedText>
       );

package/src/screens/Automate/MultiUnits.js

@@ -96,7 +96,15 @@ const MultiUnits = () => {
       navigate(Routes.UnitStack, {
         screen: Routes.ScenarioName,
         params: {
-          automate: { type: AUTOMATE_TYPE.ONE_TAP, unit: unitId },
+          automate: {
+            type: AUTOMATE_TYPE.ONE_TAP,
+            conditions: [
+              {
+                type: AUTOMATE_TYPE.ONE_TAP,
+              },
+            ],
+            unit: unitId,
+          },
           closeScreen: currentRouteName,
         },
       });

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

@@ -50,7 +50,7 @@ describe('test OneTap', () => {
       script: { id: 1, name: 'William Miller' },
     };
 
-    mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(200, response);
+    mock.onPost(API.AUTOMATE.CREATE_AUTOMATE_V2()).reply(200, response);
 
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -99,7 +99,7 @@ describe('test OneTap', () => {
       params: { type: 'one_tap' },
     };
 
-    mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(400);
+    mock.onPost(API.AUTOMATE.CREATE_AUTOMATE_V2()).reply(400);
 
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -130,7 +130,7 @@ describe('test OneTap', () => {
       },
     };
 
-    mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(400);
+    mock.onPost(API.AUTOMATE.CREATE_AUTOMATE_V2()).reply(400);
     await act(async () => {
       tree = await create(wrapComponent(route));
     });

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

@@ -20,14 +20,7 @@ import AccessibilityLabel from '../../../../configs/AccessibilityLabel';
 import { AUTOMATE_TYPE } from '../../../../configs/Constants';
 
 const AddActionScript = memo(
-  ({
-    automate,
-    isVisible,
-    setIsVisible,
-    numberActionAdded,
-    type,
-    navigate,
-  }) => {
+  ({ automate, isVisible, setIsVisible, scriptItems, type, navigate }) => {
     const t = useTranslations();
     const { id, unit } = automate;
 
@@ -46,9 +39,10 @@ const AddActionScript = memo(
             const navParams = {
               unitId: unit,
               automateId: id,
+              scriptItems: scriptItems,
               closeScreen: currentScreenName,
               numberActionCanAdd:
-                max_actions_per_automation - numberActionAdded,
+                max_actions_per_automation - scriptItems.length,
               routeName: unit ? null : Routes.SelectControlDevices,
             };
 
@@ -134,7 +128,7 @@ const AddActionScript = memo(
       id,
       max_actions_per_automation,
       navigate,
-      numberActionAdded,
+      scriptItems,
       setIsVisible,
       t,
       unit,

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

@@ -4,17 +4,15 @@ import AlertAction from '../../../../commons/AlertAction';
 import { axiosDelete } from '../../../../utils/Apis/axios';
 import { ToastBottomHelper } from '../../../../utils/Utils';
 import { useTranslations } from '../../../../hooks/Common/useTranslations';
-import { useNavigation } from '@react-navigation/native';
 
-const RenameScript = ({ automate, isVisible, setIsVisible }) => {
+const RenameScript = ({ automate, isVisible, setIsVisible, goBack }) => {
   const t = useTranslations();
-  const { goBack } = useNavigation();
 
   const deleteScript = useCallback(async () => {
     const { success } = await axiosDelete(API.AUTOMATE.SCRIPT(automate.id));
     if (success) {
       setIsVisible(false);
-      goBack();
+      goBack && goBack();
       ToastBottomHelper.success(t('removed_successfully'));
     } else {
       ToastBottomHelper.error(t('remove_failed'));