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

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

@@ -1,14 +1,13 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback } from 'react';
 import { View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 
 import { useTranslations } from '../../../hooks/Common/useTranslations';
-import { axiosGet, axiosPost } from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
 import Routes from '../../../utils/Route';
 import NewActionWrapper from './NewActionWrapper';
 import moment from 'moment';
 import { ToastBottomHelper } from '../../../utils/Utils';
+import useAction from '../hooks/useAction';
 import RenderActionItem from './RenderActionItem';
 
 const ChooseAction = ({ route }) => {
@@ -18,24 +17,16 @@ const ChooseAction = ({ route }) => {
     unitId,
     device,
     automateId,
+    scriptItems,
     numberActionCanAdd,
     multiUnit = {},
   } = route.params;
-  const [data, setData] = useState([]);
-  const [actions, setActions] = useState([]);
 
-  const fetchData = useCallback(async () => {
-    const { success, data: automateData } = await axiosGet(
-      API.DEVICE.DISPLAY_ACTIONS(device.id)
-    );
-
-    if (success) {
-      setData(automateData);
-    }
-  }, [device.id]);
+  const { displayActions, saveActions, onSelectAction, onAddSubmit } =
+    useAction(device, scriptItems);
 
   const onSave = useCallback(async () => {
-    if (actions.length > numberActionCanAdd) {
+    if (saveActions.length > numberActionCanAdd) {
       ToastBottomHelper.error(
         `${t('you_can_only_add_more', { number: numberActionCanAdd })} ${t(
           numberActionCanAdd > 1 ? 'actions' : 'action'
@@ -45,18 +36,8 @@ const ChooseAction = ({ route }) => {
       );
       return;
     }
-    let list_action = [...actions];
-    list_action = list_action.map((item) => ({
-      action: item.action,
-      data: item.data,
-    }));
-    const { success } = await axiosPost(
-      API.AUTOMATE.ADD_SCRIPT_ACTION(automateId),
-      {
-        list_action,
-        unit: unitId || multiUnit.id,
-      }
-    );
+
+    const success = await onAddSubmit(automateId, unitId || multiUnit.id);
 
     success &&
       navigate({
@@ -65,50 +46,32 @@ const ChooseAction = ({ route }) => {
         params: { saveAt: moment().valueOf() },
       });
   }, [
-    actions,
     numberActionCanAdd,
     automateId,
+    saveActions.length,
     unitId,
     multiUnit.id,
+    onAddSubmit,
     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
-      canNext={actions.length}
+      canNext={saveActions.length}
       onNext={onSave}
       nextTitle={t('save')}
       name={t('set_up {name}', { name: device?.name })}
     >
       <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}
             />
           ))}
@@ -116,4 +79,5 @@ const ChooseAction = ({ route }) => {
     </NewActionWrapper>
   );
 };
+
 export default ChooseAction;

package/src/screens/Automate/AddNewAction/SelectControlDevices.js

@@ -10,8 +10,9 @@ const SelectControlDevices = ({ route }) => {
   const t = useTranslations();
   const {
     unitId,
-    closeScreen,
     automateId,
+    closeScreen,
+    scriptItems,
     numberActionCanAdd,
     multiUnit = {},
   } = route.params || {};
@@ -54,13 +55,22 @@ const SelectControlDevices = ({ route }) => {
       navigate(Routes.ChooseAction, {
         unitId,
         automateId,
-        device: selectedDevice,
         closeScreen,
+        device: selectedDevice,
+        scriptItems,
         numberActionCanAdd,
         multiUnit,
       });
     },
-    [navigate, unitId, automateId, closeScreen, numberActionCanAdd, multiUnit]
+    [
+      navigate,
+      unitId,
+      automateId,
+      closeScreen,
+      scriptItems,
+      numberActionCanAdd,
+      multiUnit,
+    ]
   );
 
   if (loading) {

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

@@ -52,6 +52,10 @@ const SetupConfigCondition = () => {
   const { navigate } = useNavigation();
   const { params = {} } = useRoute();
   const { config, automate, closeScreen, unitId } = params;
+  const [conditionData, setConditionData] = useState({
+    type: AUTOMATE_TYPE.VALUE_CHANGE,
+    config: automate.config,
+  });
   const [selectedCondition, setSelectedCondition] = useState(undefined);
   const [customCondition, setCustomCondition] = useState(undefined);
   const [isShowModal, setIsShowModal] = useState(false);
@@ -86,67 +90,77 @@ const SetupConfigCondition = () => {
 
   const setupCustomCondition = () => {
     setSelectedCondition('custom');
-    automate.value = NaN;
+    setConditionData((prev) => ({
+      ...prev,
+      value: NaN,
+    }));
     setIsShowModal(true);
   };
 
-  const handleNavigate = useCallback(async () => {
-    if (!isCreateCondition && !isUpdateCondition) {
-      navigate(Routes.ValueChangeName, {
-        automate,
-        closeScreen,
-        unitId,
-      });
-      return;
-    }
-    const data = {
-      type: AUTOMATE_TYPE.VALUE_CHANGE,
-      condition: automate.condition,
-      config: automate.config,
-      value: automate.value,
-    };
-    const apiCall = isCreateCondition
-      ? await axiosPost(API.AUTOMATE.ADD_CONDITION(automate.id), data)
-      : await axiosPut(
-          API.AUTOMATE.UPDATE_CONDITION(automate.id, isUpdateCondition),
-          data
-        );
+  const handleNavigate = useCallback(
+    async (data) => {
+      if (!isCreateCondition && !isUpdateCondition) {
+        navigate(Routes.ValueChangeName, {
+          automate: {
+            ...automate,
+            conditions: [data],
+          },
+          closeScreen,
+          unitId,
+        });
+        return;
+      }
 
-    const { success } = apiCall;
-
-    if (success) {
-      ToastBottomHelper.success(
-        isCreateCondition
-          ? t('add_condition_success')
-          : t('edit_condition_success')
-      );
-      navigate({
-        name: Routes.ScriptDetail,
-        params: { preAutomate: automate },
-      });
-    }
-  }, [
-    automate,
-    closeScreen,
-    isCreateCondition,
-    isUpdateCondition,
-    navigate,
-    t,
-    unitId,
-  ]);
+      const apiCall = isCreateCondition
+        ? await axiosPost(API.AUTOMATE.ADD_CONDITION(automate.id), data)
+        : await axiosPut(
+            API.AUTOMATE.UPDATE_CONDITION(automate.id, isUpdateCondition),
+            data
+          );
+
+      const { success } = apiCall;
+
+      if (success) {
+        ToastBottomHelper.success(
+          isCreateCondition
+            ? t('add_condition_success')
+            : t('edit_condition_success')
+        );
+        navigate({
+          name: Routes.ScriptDetail,
+          params: { preAutomate: automate },
+        });
+      }
+    },
+    [
+      automate,
+      closeScreen,
+      isCreateCondition,
+      isUpdateCondition,
+      navigate,
+      t,
+      unitId,
+    ]
+  );
 
   const setupCondition = async (condition) => {
-    automate.condition = condition?.condition;
-    automate.value = condition?.value;
     setSelectedCondition(condition);
-    handleNavigate();
+    const data = {
+      ...conditionData,
+      condition: condition?.condition,
+      value: condition?.value,
+    };
+    handleNavigate(data);
   };
 
   const resetCustomizeCondition = useCallback(() => {
-    automate.condition = null;
-    automate.value = NaN;
+    setConditionData((prev) => ({
+      ...prev,
+      condition: null,
+      value: NaN,
+    }));
     setCustomCondition(undefined);
-  }, [automate]);
+  }, []);
 
   useFocusEffect(
     useCallback(() => {
@@ -197,7 +211,10 @@ const SetupConfigCondition = () => {
                 <GridItem
                   key={`GridItem${index}`}
                   onPress={() => {
-                    automate.condition = item.value;
+                    setConditionData((prev) => ({
+                      ...prev,
+                      condition: item.value,
+                    }));
                     setCustomCondition(item.value);
                   }}
                   selected={item.value === customCondition}
@@ -217,7 +234,10 @@ const SetupConfigCondition = () => {
               placeholder={t('value')}
               onChange={(value) => {
                 const floatValue = parseFloat(value.replace(',', '.'));
-                automate.value = floatValue;
+                setConditionData((prev) => ({
+                  ...prev,
+                  value: floatValue,
+                }));
               }}
               textInputStyle={styles.numberInput}
               wrapStyle={styles.wrapTextInput}
@@ -229,12 +249,12 @@ const SetupConfigCondition = () => {
             title={t('continue')}
             accessibilityLabel={AccessibilityLabel.BUTTON_CONTINUE}
             onPress={async () => {
-              if (isNaN(automate.value) || !automate.condition) {
+              if (isNaN(conditionData.value) || !conditionData.condition) {
                 ToastBottomHelper.error(t('please_enter_a_number'), '', 3000);
                 return;
               }
               setIsShowModal(false);
-              handleNavigate();
+              handleNavigate(conditionData);
             }}
             style={styles.buttonContinue}
             textSemiBold={false}

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__/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,