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

package/src/screens/Automate/AddNewAction/__test__/ChooseAction.test.js

@@ -38,16 +38,45 @@ describe('Test ChooseAction', () => {
         stationName: 'stationName',
         automateId: 1,
         scriptName: 'scriptName test',
+        scriptItems: [],
       },
     };
   });
 
   test('test onSave have automateId', async () => {
+    const response = [
+      {
+        id: 1,
+        title: '',
+        template: 'on_off_button_action_template',
+        configuration: {
+          allow_config_store_value: true,
+          config: 1,
+          action_on: '94ae262d-46e3-42ff-9d10-516831ecc830',
+          action_off: '6b5e49ce-22b3-49c3-bf61-0202970ce587',
+        },
+      },
+    ];
+    mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response);
     mock.onPost(API.AUTOMATE.ADD_SCRIPT_ACTION(1)).reply(200);
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
+
+    const cards = instance.findAllByType(SelectActionCard);
+    await act(async () => {
+      cards.map((card) => card.props.onPress());
+    });
+    const onButton = instance.find(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.ON_BUTTON &&
+        el.type === TouchableOpacity
+    );
+    await act(async () => {
+      await onButton.props.onPress();
+    });
+
     const bottomButton = instance.findByType(BottomButtonView);
     await act(async () => {
       bottomButton.props.onPressMain();
@@ -56,12 +85,39 @@ describe('Test ChooseAction', () => {
   });
 
   it('test onSave fail not permission', async () => {
+    const response = [
+      {
+        id: 1,
+        title: '',
+        template: 'on_off_button_action_template',
+        configuration: {
+          allow_config_store_value: true,
+          config: 1,
+          action_on: '94ae262d-46e3-42ff-9d10-516831ecc830',
+          action_off: '6b5e49ce-22b3-49c3-bf61-0202970ce587',
+        },
+      },
+    ];
+    mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response);
     mock.onPost(API.AUTOMATE.ADD_SCRIPT_ACTION(1)).reply(404);
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
 
+    const cards = instance.findAllByType(SelectActionCard);
+    await act(async () => {
+      cards.map((card) => card.props.onPress());
+    });
+    const onButton = instance.find(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.ON_BUTTON &&
+        el.type === TouchableOpacity
+    );
+    await act(async () => {
+      await onButton.props.onPress();
+    });
+
     const bottomButton = instance.findByType(BottomButtonView);
     await act(async () => {
       bottomButton.props.onPressMain();
@@ -87,7 +143,8 @@ describe('Test ChooseAction', () => {
       config2 = 2,
       config3 = 3,
       config4 = 4,
-      config5 = 5;
+      config5 = 5,
+      config6 = 6;
     const response = [
       {
         id: 1,
@@ -97,7 +154,7 @@ describe('Test ChooseAction', () => {
           allow_config_store_value: true,
           config: config1,
           action_on: '94ae262d-46e3-42ff-9d10-516831ecc830',
-          action_off: '94ae262d-46e3-42ff-9d10-516831ecc830',
+          action_off: 'd988f6f6-1347-480b-8912-e986d0b7fb76',
         },
       },
       {
@@ -169,6 +226,17 @@ describe('Test ChooseAction', () => {
           ],
         },
       },
+      {
+        id: 6,
+        title: 'Power',
+        template: 'OnOffSimpleActionTemplate',
+        configuration: {
+          allow_config_store_value: true,
+          config: config6,
+          action_on: 'a9b9fcc5-a939-4163-95c9-03b0011d46c5',
+          action_off: '2863b435-788f-4a86-bca8-7005763709e5',
+        },
+      },
     ];
     mock.onGet(API.DEVICE.DISPLAY_ACTIONS(1)).reply(200, response);
     await act(async () => {
@@ -182,14 +250,14 @@ describe('Test ChooseAction', () => {
       cards.map((card) => card.props.onPress());
     });
 
-    const simpleActionOn = instance.find(
+    const simpleActionOn = instance.findAll(
       (el) =>
         el.props.accessibilityLabel ===
           AccessibilityLabel.ON_OFF_SIMPLE_ACTION_ON &&
         el.type === TouchableOpacity
     );
     await act(async () => {
-      await simpleActionOn.props.onPress();
+      await simpleActionOn[0].props.onPress();
     });
 
     const selectOptions = instance.findAll(
@@ -243,7 +311,18 @@ describe('Test ChooseAction', () => {
       await chooseMode.props.onPress(response[4].configuration.options[0]);
     });
 
+    const simpleActionToggle = instance.findAll(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.ON_OFF_SIMPLE_ACTION_TOGGLE &&
+        el.type === TouchableOpacity
+    );
+    await act(async () => {
+      await simpleActionToggle[1].props.onPress();
+    });
+
     mock.onPost(API.AUTOMATE.ADD_SCRIPT_ACTION(1)).reply(200);
+    mock.onPost(API.AUTOMATE.ADD_SCRIPT_TOGGLE(1)).reply(200);
     const buttonSave = instance.find(
       (el) =>
         el.props.accessibilityLabel === AccessibilityLabel.BOTTOM_VIEW_MAIN &&
@@ -253,6 +332,8 @@ describe('Test ChooseAction', () => {
       await buttonSave.props.onPress();
     });
 
+    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: [
@@ -263,6 +344,7 @@ describe('Test ChooseAction', () => {
               config_id: config1,
               config_value: 1,
             },
+            order: 1,
           },
           {
             action: '05195362-75de-4db5-9e5e-98fef9d4910c',
@@ -272,6 +354,7 @@ describe('Test ChooseAction', () => {
               config_id: config2,
               config_value: 1,
             },
+            order: 2,
           },
           {
             action: 'b498234c-6c1a-452d-a1d1-87a314c20528',
@@ -280,6 +363,7 @@ describe('Test ChooseAction', () => {
               config_id: config3,
               config_value: 29,
             },
+            order: 3,
           },
           {
             action: '11111111-6c1a-452d-a1d1-87a314c20528',
@@ -288,10 +372,35 @@ describe('Test ChooseAction', () => {
               config_id: config4,
               config_value: 28,
             },
+            order: 4,
           },
           {
             action: '800ff454-4e2a-4a38-bad6-1bded728193e',
             data: { config_id: config5, config_value: 1 },
+            order: 5,
+          },
+        ],
+      })
+    );
+    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: 'a9b9fcc5-a939-4163-95c9-03b0011d46c5',
+            action_off: '2863b435-788f-4a86-bca8-7005763709e5',
+            config: config6,
+            action_on_data: {
+              state: 1,
+              config_id: config6,
+              config_value: 1,
+            },
+            action_off_data: {
+              state: 0,
+              config_id: config6,
+              config_value: 0,
+            },
+            order: 6,
           },
         ],
       })
@@ -365,6 +474,7 @@ describe('Test ChooseAction', () => {
               config_id: config1,
               config_value: 0,
             },
+            order: 1,
           },
         ],
       })

package/src/screens/Automate/AddNewAction/__test__/ChooseConfig.test.js

@@ -1,20 +1,19 @@
-import React from 'react';
 import renderer, { act } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
 
+import { API } from '../../../../configs';
 import ChooseConfig from '../ChooseConfig';
-import { SCProvider } from '../../../../context';
-import { mockSCStore } from '../../../../context/mockStore';
 import { DEVICE_TYPE } from '../../../../configs/Constants';
-import api from '../../../../utils/Apis/axios';
-import { API } from '../../../../configs';
-import TitleCheckBox from '../../../Sharing/Components/TitleCheckBox';
+import GridItem from '../../../../commons/Grid/GridItem';
+import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
+import Routes from '../../../../utils/Route';
+import { SCProvider } from '../../../../context';
 import Text from '../../../../commons/Text';
+import { TouchableWithoutFeedback } from 'react-native';
+import api from '../../../../utils/Apis/axios';
+import { mockSCStore } from '../../../../context/mockStore';
 import t from '../../../../hooks/Common/useTranslations';
-import Routes from '../../../../utils/Route';
 import { useNavigation } from '@react-navigation/native';
-import { TouchableWithoutFeedback } from 'react-native';
-import GridItem from '../../../../commons/Grid/GridItem';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -44,7 +43,6 @@ describe('Test ChooseConfig', () => {
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
-    expect(tree.root.findAllByType(TitleCheckBox)).toHaveLength(0);
     expect(mock.history.get).toHaveLength(1);
   });
 

package/src/screens/Automate/AddNewAction/__test__/SetupConfigCondition.test.js

@@ -14,6 +14,7 @@ import { ToastBottomHelper } from '../../../../utils/Utils';
 import SetupConfigCondition from '../SetupConfigCondition';
 import AccessibilityLabel from '../../../../configs/AccessibilityLabel';
 import { API } from '../../../../configs';
+import { AUTOMATE_TYPE } from '../../../../configs/Constants';
 import api from '../../../../utils/Apis/axios';
 import MockAdapter from 'axios-mock-adapter';
 
@@ -172,7 +173,9 @@ describe('Test SetupConfigCondition', () => {
     );
     useRoute.mockReturnValue({
       params: {
-        automate: {},
+        automate: {
+          config: 1,
+        },
         config: {
           id: 1,
           name: 'config name',
@@ -193,12 +196,20 @@ describe('Test SetupConfigCondition', () => {
       gridItems[0].findByType(TouchableWithoutFeedback).props.onPress();
     });
 
-    expect(global.mockedNavigate).toBeCalledWith(Routes.ValueChangeName, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ValueChangeName, {
       automate: {
-        condition: 'value_evaluation',
-        value: [1, 0],
+        conditions: [
+          {
+            condition: 'value_evaluation',
+            type: AUTOMATE_TYPE.VALUE_CHANGE,
+            config: 1,
+            value: [1, 0],
+          },
+        ],
+        config: 1,
       },
       closeScreen: undefined,
+      unitId: undefined,
     });
   });
 
@@ -213,7 +224,9 @@ describe('Test SetupConfigCondition', () => {
     );
     useRoute.mockReturnValue({
       params: {
-        automate: {},
+        automate: {
+          config: 1,
+        },
         config: {
           id: 1,
           name: 'config name',
@@ -262,10 +275,18 @@ describe('Test SetupConfigCondition', () => {
 
     expect(global.mockedNavigate).toBeCalledWith(Routes.ValueChangeName, {
       automate: {
-        condition: '<',
-        value: value,
+        conditions: [
+          {
+            condition: '<',
+            type: AUTOMATE_TYPE.VALUE_CHANGE,
+            config: 1,
+            value: value,
+          },
+        ],
+        config: 1,
       },
       closeScreen: undefined,
+      unitId: undefined,
     });
   };
 
@@ -395,10 +416,18 @@ describe('Test SetupConfigCondition', () => {
       gridItems[0].props.onPress();
     });
 
+    expect(mock.history.post).toHaveLength(1);
+    expect(mock.history.post[0].data).toEqual(
+      JSON.stringify({
+        type: AUTOMATE_TYPE.VALUE_CHANGE,
+        condition: 'value_evaluation',
+        value: [1, 0],
+      })
+    );
     expect(global.mockedNavigate).toBeCalledWith({
       name: 'ScriptDetail',
       params: {
-        preAutomate: { condition: 'value_evaluation', id: 1, value: [1, 0] },
+        preAutomate: { id: 1 },
       },
     });
   });

package/src/screens/Automate/AddNewAutoSmart/AddTypeSmart.js

@@ -29,6 +29,11 @@ const AddTypeSmart = ({ smartTypes, route }) => {
         automate: {
           ...automate,
           type: dataAutomate?.type,
+          conditions: [
+            {
+              type: dataAutomate?.type,
+            },
+          ],
         },
         unitId: unit,
         closeScreen: closeScreen,

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

@@ -0,0 +1,31 @@
+import { act, create } from 'react-test-renderer';
+
+import AddAutomationTypeSmart from '../AddAutomationTypeSmart';
+import AddTypeSmart from '../AddTypeSmart';
+import React from 'react';
+import { SCProvider } from '../../../../context';
+import { mockSCStore } from '../../../../context/mockStore';
+
+const wrapComponent = (route) => (
+  <SCProvider initState={mockSCStore({})}>
+    <AddAutomationTypeSmart route={route} />
+  </SCProvider>
+);
+
+describe('test AddNewAutoSmart', () => {
+  let tree;
+  let route = {
+    params: {
+      automate: { unit: 1 },
+    },
+  };
+
+  it('test render AddNewAutoSmart', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const items = instance.findAllByType(AddTypeSmart);
+    expect(items).toHaveLength(1);
+  });
+});

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}
             />
           ))}