@eohjsc/react-native-smart-city 0.7.22 → 0.7.24

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

@@ -44,7 +44,15 @@ describe('test AddNewAutoSmart', () => {
     expect(global.mockedNavigate).toHaveBeenCalledWith(
       Routes.SelectMonitorDevices,
       {
-        automate: { unit: 1, type: 'value_change' },
+        automate: {
+          type: 'value_change',
+          conditions: [
+            {
+              type: 'value_change',
+            },
+          ],
+          unit: 1,
+        },
         closeScreen: undefined,
         unitId: 1,
       }
@@ -64,7 +72,15 @@ describe('test AddNewAutoSmart', () => {
     expect(items[2].props.isSelected).toBeTruthy();
 
     expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.SetSchedule, {
-      automate: { type: 'schedule', unit: 1 },
+      automate: {
+        type: 'schedule',
+        conditions: [
+          {
+            type: 'schedule',
+          },
+        ],
+        unit: 1,
+      },
       closeScreen: undefined,
       unitId: 1,
     });

package/src/screens/Automate/Components/InputName.js

@@ -7,13 +7,13 @@ import { AccessibilityLabel } from '../../../configs/Constants';
 import _TextInput from '../../../commons/Form/TextInput';
 import styles from './InputNameStyles';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
-import { axiosPost, axiosPut } from '../../../utils/Apis/axios';
+import { axiosPost } from '../../../utils/Apis/axios';
 import NewActionWrapper from '../../Automate/AddNewAction/NewActionWrapper';
 import Routes from '../../../utils/Route';
 
 const InputName = ({ title, placeholder }) => {
   const { automate = {}, closeScreen } = useRoute().params;
-  const { id: automateNameId, name: automateName } = automate;
+  const { name: automateName } = automate;
   const t = useTranslations();
   const { navigate } = useNavigation();
   const [name, setName] = useState(automateName);
@@ -31,9 +31,10 @@ const InputName = ({ title, placeholder }) => {
       name: name,
     };
 
-    const { success, data } = automateNameId
-      ? await axiosPut(API.AUTOMATE.UPDATE_AUTOMATE(automateNameId), params)
-      : await axiosPost(API.AUTOMATE.CREATE_AUTOMATE(), params);
+    const { success, data } = await axiosPost(
+      API.AUTOMATE.CREATE_AUTOMATE_V2(),
+      params
+    );
 
     if (success) {
       navigate({
@@ -46,7 +47,7 @@ const InputName = ({ title, placeholder }) => {
       });
     }
     setProcessing(false);
-  }, [processing, automate, name, automateNameId, navigate, closeScreen]);
+  }, [processing, automate, name, navigate, closeScreen]);
 
   return (
     <NewActionWrapper

package/src/screens/Automate/Constants.js

@@ -0,0 +1,12 @@
+export const REPEAT_OPTIONS = {
+  ONCE: 'once',
+  EVERYDAY: 'every_day',
+  EVERYWEEK: 'every_week',
+  TIMERANGE: 'time_range',
+  INTERVAL: 'interval',
+};
+
+export const TIME_RANGE_REPEAT_OPTIONS = {
+  EVERYDAY: 'every_day',
+  EVERYWEEK: 'every_week',
+};

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

@@ -1,13 +1,14 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 
 import NewActionWrapper from '../AddNewAction/NewActionWrapper';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
-import { axiosGet, axiosPut } from '../../../utils/Apis/axios';
+import { axiosGet } from '../../../utils/Apis/axios';
 import { API } from '../../../configs';
 import { ToastBottomHelper } from '../../../utils/Utils';
 import Routes from '../../../utils/Route';
+import useAction from '../hooks/useAction';
 import RenderActionItem from '../AddNewAction/RenderActionItem';
 import { useBackendPermission } from '../../../utils/Permission/backend';
 import AccessibilityLabel from '../../../configs/AccessibilityLabel';
@@ -19,30 +20,23 @@ const UpdateActionScript = ({ route }) => {
     unitId,
     device,
     automateId,
-    numberActionAdded,
-    scriptItemId,
+    activatedScript,
+    scriptItems,
     closeScreen,
   } = route.params;
   const permissions = useBackendPermission();
   const { max_actions_per_automation } = permissions || {};
-  const [data, setData] = useState([]);
-  const [actions, setActions] = useState([]);
   const [processing, setProcessing] = useState(false);
 
-  const numberActionCanAdd = useMemo(() => {
-    return max_actions_per_automation - numberActionAdded;
-  }, [max_actions_per_automation, numberActionAdded]);
-
-  const fetchData = useCallback(async () => {
-    const { success, data: automateData } = await axiosGet(
-      API.DEVICE.DISPLAY_ACTIONS(device.id)
-    );
+  const { displayActions, saveActions, onSelectAction, onUpdateSubmit } =
+    useAction(device, scriptItems, activatedScript);
 
-    success && setData(automateData);
-  }, [device.id]);
+  const numberActionCanAdd = useMemo(() => {
+    return max_actions_per_automation - scriptItems.length;
+  }, [max_actions_per_automation, scriptItems.length]);
 
   const onSave = useCallback(async () => {
-    if (actions.length > numberActionCanAdd) {
+    if (saveActions.length > numberActionCanAdd + 1) {
       ToastBottomHelper.error(
         `${t('you_can_only_add_more', { number: numberActionCanAdd })} ${t(
           numberActionCanAdd > 1 ? 'actions' : 'action'
@@ -53,18 +47,11 @@ const UpdateActionScript = ({ route }) => {
       return;
     }
     setProcessing(true);
-    let list_action = [...actions];
-    list_action = list_action.map((item) => ({
-      action: item.action,
-      data: item.data,
-    }));
-    const { success } = await axiosPut(
-      API.AUTOMATE.UPDATE_SCRIPT_ACTION(automateId),
-      {
-        id: scriptItemId,
-        list_action,
-        unit: unitId,
-      }
+
+    const success = await onUpdateSubmit(
+      automateId,
+      activatedScript.id,
+      unitId
     );
 
     if (success) {
@@ -84,38 +71,20 @@ const UpdateActionScript = ({ route }) => {
       setProcessing(false);
     }
   }, [
-    actions,
     numberActionCanAdd,
     automateId,
-    scriptItemId,
+    activatedScript.id,
+    saveActions.length,
     unitId,
-    t,
+    onUpdateSubmit,
     navigate,
+    t,
   ]);
 
-  const handleOnSelectAction = (action) => {
-    setActions((prevActions) => {
-      const index = prevActions.findIndex(
-        (item) => item.index === action.index
-      );
-      if (index !== -1) {
-        const newActions = [...prevActions];
-        newActions[index] = action;
-        return newActions;
-      } else {
-        return [...prevActions, action];
-      }
-    });
-  };
-
-  useEffect(() => {
-    fetchData();
-  }, [fetchData]);
-
   return (
     <NewActionWrapper
       closeScreen={closeScreen}
-      canNext={actions.length}
+      canNext={saveActions.length}
       onNext={onSave}
       nextTitle={t('update_now')}
       name={t('choose_action')}
@@ -123,14 +92,14 @@ const UpdateActionScript = ({ route }) => {
       showLoading={processing}
     >
       <View>
-        {!!data.length &&
-          data.map((item, index) => (
+        {!!displayActions.length &&
+          displayActions.map((item, index) => (
             <RenderActionItem
               key={`action_item_${index}`}
               device={device}
               item={item}
               index={index}
-              handleOnSelectAction={handleOnSelectAction}
+              handleOnSelectAction={onSelectAction}
               t={t}
             />
           ))}

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,
       }
     );