@eohjsc/react-native-smart-city 0.4.59 → 0.4.61

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

@@ -12,10 +12,9 @@ import TitleCheckBox from '../../../Sharing/Components/TitleCheckBox';
 import Text from '../../../../commons/Text';
 import t from '../../../../hooks/Common/useTranslations';
 import Routes from '../../../../utils/Route';
-import CheckBoxCustom from '../../../Sharing/Components/CheckBoxCustom';
-import BottomButtonView from '../../../../commons/BottomButtonView';
-import { ToastBottomHelper } from '../../../../utils/Utils';
 import { useNavigation } from '@react-navigation/native';
+import { TouchableWithoutFeedback } from 'react-native';
+import GridItem from '../../../../commons/Grid/GridItem';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -56,10 +55,10 @@ describe('Test ChooseConfig', () => {
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
-    const checkBoxs = tree.root.findAllByType(TitleCheckBox);
+    const checkBoxs = tree.root.findAllByType(GridItem);
     expect(checkBoxs).toHaveLength(2);
-    expect(checkBoxs[0].props.isChecked).toBeFalsy();
-    expect(checkBoxs[1].props.isChecked).toBeFalsy();
+    expect(checkBoxs[0].props.selected).toBeFalsy();
+    expect(checkBoxs[1].props.selected).toBeFalsy();
   });
 
   it('choose config', async () => {
@@ -69,11 +68,11 @@ describe('Test ChooseConfig', () => {
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
-    const checkBoxs = tree.root.findAllByType(TitleCheckBox);
+    const checkBoxs = tree.root.findAllByType(GridItem);
     await act(async () => {
-      await checkBoxs[0].findByType(CheckBoxCustom).props.onPress();
+      await checkBoxs[0].findByType(TouchableWithoutFeedback).props.onPress();
     });
-    expect(checkBoxs[0].props.isChecked).toBeTruthy();
+    expect(checkBoxs[0].props.selected).toBeTruthy();
   });
 
   it('test fetchData with data and default', async () => {
@@ -93,17 +92,19 @@ describe('Test ChooseConfig', () => {
         })
       );
     });
-    const checkBoxs = tree.root.findAllByType(TitleCheckBox);
-    expect(checkBoxs[1].props.isChecked).toBeTruthy();
+    const checkBoxs = tree.root.findAllByType(GridItem);
+    expect(checkBoxs[1].props.selected).toBeTruthy();
   });
 
   it('not checked but is default', async () => {
     mock.onGet(API.AUTOMATE.DISPLAY_CONFIGS(1)).reply(200, [
       {
         id: 1,
+        name: 'Config 1',
       },
       {
         id: 2,
+        name: 'Config 2',
       },
     ]);
     await act(async () => {
@@ -115,10 +116,10 @@ describe('Test ChooseConfig', () => {
       );
     });
     const conditionTexts = tree.root.findAll(
-      (el) => el.type === Text && el.props.type === 'H4'
+      (el) => el.type === Text && el.props.type === 'Body'
     );
-    expect(conditionTexts[0].props.children).toEqual(t('no_condition'));
-    expect(conditionTexts[1].props.children).not.toEqual(t('no_condition'));
+    expect(conditionTexts[0].props.children).toEqual(t('Config 1'));
+    expect(conditionTexts[1].props.children).toEqual(t('Config 2'));
   });
 
   it('go to setup', async () => {
@@ -130,80 +131,19 @@ describe('Test ChooseConfig', () => {
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
-    const conditionTouch = tree.root.findByProps({
-      accessibilityLabel: 'config-1',
-    });
-    await act(async () => {
-      conditionTouch.props.onPress();
-    });
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.SetupConfigCondition, {
-      item: { id: 1 },
-      closeScreen: undefined,
-      defaultCondition: undefined,
-    });
-  });
-
-  it('render condition from setup', async () => {
-    mock.onGet(API.AUTOMATE.DISPLAY_CONFIGS(1)).reply(200, [
-      {
-        id: 1,
-      },
-      {
-        id: 2,
-      },
-    ]);
-    await act(async () => {
-      tree = await renderer.create(
-        wrapComponent({
-          ...route,
-          params: {
-            ...route.params,
-            newCondition: { config: 2, value: 1 }, // condition from setup
-          },
-        })
+    const conditionTouch = tree.root.find((el) => {
+      return (
+        el.props.accessibilityLabel === 'config-1' &&
+        el.type === TouchableWithoutFeedback
       );
     });
-    const conditionTexts = tree.root.findAll(
-      (el) => el.type === Text && el.props.type === 'H4'
-    );
-    expect(conditionTexts[1].props.children).not.toEqual(t('no_condition'));
-  });
-
-  it('on save without select condition', async () => {
-    mock.onGet(API.AUTOMATE.DISPLAY_CONFIGS(1)).reply(200, [{ id: 1 }]);
     await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const button = tree.root.findByType(BottomButtonView);
-    const spyToastError = jest.spyOn(ToastBottomHelper, 'error');
-    await act(async () => {
-      await button.props.onPressMain();
+      conditionTouch.props.onPress();
     });
-    expect(spyToastError).toHaveBeenCalledWith(
-      t('please_choose_condition_before_continue')
-    );
-  });
 
-  it('on save with selected condition', async () => {
-    mock.onGet(API.AUTOMATE.DISPLAY_CONFIGS(1)).reply(400); // hack test to fail api data
-    await act(async () => {
-      tree = await renderer.create(
-        wrapComponent({
-          ...route,
-          params: {
-            ...route.params,
-            automate: { config_id: 1 },
-            newSensorData: [{ id: 1, value: 1 }],
-          },
-        })
-      );
-    });
-    const button = tree.root.findByType(BottomButtonView);
-    await act(async () => {
-      await button.props.onPressMain();
-    });
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.ValueChangeName, {
-      automate: { config_id: 1 },
+    expect(mockedNavigate).toHaveBeenCalledWith(Routes.SetupConfigCondition, {
+      automate: { config: 1 },
+      config: { id: 1 },
       closeScreen: undefined,
     });
   });

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

@@ -4,7 +4,6 @@ import MockAdapter from 'axios-mock-adapter';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
 import Device from '../Device';
-import BottomButtonView from '../../../../commons/BottomButtonView';
 import NavBar from '../../../../commons/NavBar';
 import API from '../../../../configs/API';
 import { AccessibilityLabel } from '../../../../configs/Constants';
@@ -63,20 +62,6 @@ describe('Test SelectMonitorDevices', () => {
     expect(navBar.props.listStation).toHaveLength(1);
   });
 
-  it('onPress continue', async () => {
-    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-
-    const bottomButton = instance.findByType(BottomButtonView);
-    await act(async () => {
-      bottomButton.props.onPressMain();
-    });
-    expect(mockedNavigate).toHaveBeenCalled();
-  });
-
   it('test onPressDevice', async () => {
     mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response);
     await act(async () => {
@@ -90,10 +75,8 @@ describe('Test SelectMonitorDevices', () => {
       device[0].props.onPress({ id: 1, name: 'sensor' });
     });
     expect(device[0].props.isSelectDevice).toBeTruthy();
-    await act(async () => {
-      device[0].props.onPress({ id: 1, name: 'sensor' });
-    });
-    expect(device[0].props.isSelectDevice).toBeFalsy();
+
+    expect(mockedNavigate).toHaveBeenCalled();
   });
 
   it('test onSnapItem', async () => {

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

@@ -1,15 +1,16 @@
 import React from 'react';
-import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
-import BottomButtonView from '../../../../commons/BottomButtonView';
 import SetupConfigCondition from '../SetupConfigCondition';
 import { useNavigation, useRoute } from '@react-navigation/native';
-import _TextInput from '../../../../commons/Form/TextInput';
 import { ToastBottomHelper } from '../../../../utils/Utils';
-import { ModalCustom } from '../../../../commons/Modal';
 import { Text } from '../../../../commons';
+import { Button, InputItem, Radio } from '@ant-design/react-native';
+import GridItem from '../../../../commons/Grid/GridItem';
+import { TouchableWithoutFeedback } from 'react-native';
+import Routes from '../../../../utils/Route';
+import { ModalCustom } from '../../../../commons/Modal';
 
 jest.mock('react', () => {
   return {
@@ -18,6 +19,19 @@ jest.mock('react', () => {
   };
 });
 
+const BOOLEAN_VALUE_EVALUATION_CONFIGURATION = {
+  id: 1,
+  template: 'boolean',
+  configuration: {
+    on: {
+      text: 'Case On',
+    },
+    off: {
+      text: 'Case Off',
+    },
+  },
+};
+
 const wrapComponent = (configuration, onPress) => (
   <SCProvider initState={mockSCStore({})}>
     <SetupConfigCondition />
@@ -35,19 +49,41 @@ describe('Test SetupConfigCondition', () => {
     mockGoBack.mockReset();
     useRoute.mockClear();
     spyToastError.mockClear();
+    mockNavigate.mockClear();
   });
 
-  it('Test render', async () => {
+  it('render range value evaluation', async () => {
     useRoute.mockReturnValue({
       params: {
-        item: {
+        config: {
           id: 1,
-          value: 10,
-          range_min: 0,
-          range_max: 1000,
           decimal_behind: 0,
           title: 'is below (<)',
           sensor_type: 'air_quality',
+          value_evaluations: [
+            {
+              template: 'range',
+              configuration: {
+                ranges: [
+                  {
+                    evaluate: {
+                      text: 'Case 1',
+                    },
+                  },
+                  {
+                    evaluate: {
+                      text: 'Case 2',
+                    },
+                  },
+                  {
+                    evaluate: {
+                      text: 'Case 3',
+                    },
+                  },
+                ],
+              },
+            },
+          ],
         },
         sensorData: [],
       },
@@ -57,60 +93,48 @@ describe('Test SetupConfigCondition', () => {
     });
     const instance = tree.root;
 
-    await act(async () => {
-      instance.findAllByType(TouchableOpacity)[0].props.onPress();
-      instance.findAllByType(TouchableOpacity)[1].props.onPress();
-      instance.findAllByType(TouchableOpacity)[2].props.onPress();
-    });
+    const gridItems = instance.findAllByType(GridItem);
 
-    const touchableOpacities = instance.findAllByType(TouchableOpacity);
-    expect(mockNavigate).toBeCalled();
+    expect(gridItems[0].findByType(Text).props.children).toEqual('Case 1');
+    expect(gridItems[1].findByType(Text).props.children).toEqual('Case 2');
+    expect(gridItems[2].findByType(Text).props.children).toEqual('Case 3');
+  });
 
-    await act(async () => {
-      touchableOpacities[4].props.onPress();
+  it('render boolean value evaluation', async () => {
+    useRoute.mockReturnValue({
+      params: {
+        config: {
+          id: 1,
+          title: 'is below (<)',
+          sensor_type: 'air_quality',
+          value_evaluations: [BOOLEAN_VALUE_EVALUATION_CONFIGURATION],
+        },
+        sensorData: [],
+      },
     });
-    const inputs = instance.findAllByType(_TextInput);
-    expect(inputs).toHaveLength(1);
     await act(async () => {
-      inputs[0].props.onChange('128');
+      tree = await create(wrapComponent());
     });
+    const instance = tree.root;
 
-    const BottomButtonViews = instance.findAllByType(BottomButtonView);
-    expect(BottomButtonViews).toHaveLength(1);
-    await act(async () => {
-      BottomButtonViews[0].props.onPressMain();
-    });
-    expect(mockGoBack).toBeCalled();
+    const gridItems = instance.findAllByType(GridItem);
+    expect(gridItems).toHaveLength(3);
+    expect(gridItems[0].findByType(Text).props.children).toEqual('Case Off');
+    expect(gridItems[1].findByType(Text).props.children).toEqual('Case On');
+    expect(gridItems[2].findByType(Text).props.children).toEqual(
+      'Customize...'
+    );
   });
 
-  it('render range value evaluation', async () => {
+  it('choose config value evaluation', async () => {
     useRoute.mockReturnValue({
       params: {
-        item: {
+        automate: {},
+        config: {
           id: 1,
-          decimal_behind: 0,
           title: 'is below (<)',
           sensor_type: 'air_quality',
-          evaluate_configuration: {
-            ranges: [
-              {
-                evaluate: {
-                  text: 'Case 1',
-                },
-              },
-              {
-                evaluate: {
-                  text: 'Case 2',
-                },
-              },
-              {
-                evaluate: {
-                  text: 'Case 3',
-                },
-              },
-            ],
-          },
-          evaluate_template: 'range',
+          value_evaluations: [BOOLEAN_VALUE_EVALUATION_CONFIGURATION],
         },
         sensorData: [],
       },
@@ -120,40 +144,29 @@ describe('Test SetupConfigCondition', () => {
     });
     const instance = tree.root;
 
+    const gridItems = instance.findAllByType(GridItem);
+
     await act(async () => {
-      instance
-        .findByProps({ accessibilityLabel: 'open-modal' })
-        .props.onPress();
+      gridItems[0].findByType(TouchableWithoutFeedback).props.onPress();
     });
 
-    const modalCustom = instance.find(
-      (el) => el.type === ModalCustom && el.props.isVisible
-    );
-    const texts = modalCustom.findAllByType(Text);
-    expect(texts).toHaveLength(3);
-    expect(texts[0].props.children).toEqual('Case 1');
-    expect(texts[1].props.children).toEqual('Case 2');
-    expect(texts[2].props.children).toEqual('Case 3');
+    expect(mockNavigate).toBeCalledWith(Routes.ValueChangeName, {
+      automate: {
+        condition: 'value_evaluation',
+        value: [1, 0],
+      },
+      closeScreen: undefined,
+    });
   });
 
-  it('render boolean value evaluation', async () => {
+  it('choose config custom condition', async () => {
     useRoute.mockReturnValue({
       params: {
-        item: {
+        automate: {},
+        config: {
           id: 1,
           title: 'is below (<)',
-          sensor_type: 'air_quality',
-          evaluate_configuration: {
-            on: {
-              text: 'Case On',
-            },
-            off: {
-              text: 'Case Off',
-            },
-          },
-          evaluate_template: 'boolean',
         },
-        sensorData: [],
       },
     });
     await act(async () => {
@@ -161,19 +174,43 @@ describe('Test SetupConfigCondition', () => {
     });
     const instance = tree.root;
 
+    const gridItems = instance.findAllByType(GridItem);
+
     await act(async () => {
-      instance
-        .findByProps({ accessibilityLabel: 'open-modal' })
-        .props.onPress();
+      gridItems[0].findByType(TouchableWithoutFeedback).props.onPress();
     });
 
-    const modalCustom = instance.find(
-      (el) => el.type === ModalCustom && el.props.isVisible
-    );
-    const texts = modalCustom.findAllByType(Text);
-    expect(texts).toHaveLength(2);
-    expect(texts[1].props.children).toEqual('Case On');
-    expect(texts[0].props.children).toEqual('Case Off');
+    const modal = instance.findAllByType(ModalCustom)[0];
+    expect(modal.props.isVisible).toBeTruthy();
+
+    await act(async () => {
+      modal.props.onBackdropPress();
+    });
+    expect(modal.props.isVisible).toBeFalsy();
+
+    await act(async () => {
+      instance.findAllByType(Radio.RadioItem)[0].props.onChange();
+    });
+
+    const input = instance.findByType(InputItem);
+
+    await act(async () => {
+      input.props.onChange('123');
+    });
+
+    const bottomButtonView = instance.findByType(Button);
+
+    await act(async () => {
+      bottomButtonView.props.onPress();
+    });
+
+    expect(mockNavigate).toBeCalledWith(Routes.ValueChangeName, {
+      automate: {
+        condition: '<',
+        value: 123,
+      },
+      closeScreen: undefined,
+    });
   });
 
   const testConditionValue = async (value, message) => {
@@ -185,22 +222,23 @@ describe('Test SetupConfigCondition', () => {
           title: 'is below (<)',
           sensor_type: 'air_quality',
         },
+        automate: {},
       },
     });
     await act(async () => {
       tree = await create(wrapComponent());
     });
     const instance = tree.root;
-    const input = instance.findByType(_TextInput);
+    const input = instance.findByType(InputItem);
 
     await act(async () => {
       input.props.onChange(value);
     });
 
-    const bottomButtonView = instance.findByType(BottomButtonView);
+    const bottomButtonView = instance.findByType(Button);
 
     await act(async () => {
-      bottomButtonView.props.onPressMain();
+      bottomButtonView.props.onPress();
     });
 
     if (message === null) {
@@ -213,11 +251,4 @@ describe('Test SetupConfigCondition', () => {
   it('Test render when have input not number', async () => {
     await testConditionValue('abc', 'Please enter a number');
   });
-
-  it('Test render when have input value must be 6 digits or less', async () => {
-    await testConditionValue(
-      '123456789',
-      'Value must be less than or equal to 8 characters'
-    );
-  });
 });

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

@@ -12,10 +12,6 @@ const smartTypes = [
     type: AUTOMATE_TYPE.SCHEDULE,
     route: Routes.SetSchedule,
   },
-  {
-    type: AUTOMATE_TYPE.EVENT,
-    route: Routes.SelectMonitorDevices,
-  },
 ];
 
 const AddAutomationTypeSmart = ({ route }) => {

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

@@ -4,9 +4,7 @@ import { useNavigation } from '@react-navigation/native';
 import { HeaderCustom } from '../../../commons/Header';
 import styles from './styles/AddNewAutoSmartStyles';
 import Text from '../../../commons/Text';
-import BottomButtonView from '../../../commons/BottomButtonView';
 import ItemAutomate from '../../../commons/Automate/ItemAutomate';
-import { AccessibilityLabel } from '../../../configs/Constants';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import Routes from '../../../utils/Route';
 
@@ -21,23 +19,31 @@ const AddTypeSmart = ({ smartTypes, route }) => {
       : -1
   );
 
-  const handleOnContinue = useCallback(() => {
-    const dataAutomate = smartTypes[selectedIndex];
-    const params = {
-      automate: {
-        ...automate,
-        type: dataAutomate?.type,
-      },
-      closeScreen: closeScreen,
-    };
+  const handleOnContinue = useCallback(
+    (index) => {
+      const dataAutomate = smartTypes[index];
+      const params = {
+        automate: {
+          ...automate,
+          type: dataAutomate?.type,
+        },
+        closeScreen: closeScreen,
+      };
 
-    if (!automate?.unit) {
-      navigate(Routes.SelectUnit, params);
-      return;
-    }
+      if (!automate?.unit) {
+        navigate(Routes.SelectUnit, params);
+        return;
+      }
 
-    navigate(dataAutomate.route, params);
-  }, [smartTypes, selectedIndex, automate, closeScreen, navigate]);
+      navigate(dataAutomate.route, params);
+    },
+    [smartTypes, automate, closeScreen, navigate]
+  );
+
+  const onSelectType = (index) => {
+    setSelectedIndex(index);
+    handleOnContinue(index);
+  };
 
   return (
     <View style={styles.wrap}>
@@ -57,20 +63,11 @@ const AddTypeSmart = ({ smartTypes, route }) => {
               key={item?.type?.toString()}
               index={index}
               selectedIndex={selectedIndex}
-              setSelectedIndex={setSelectedIndex}
+              setSelectedIndex={onSelectType}
             />
           ))}
         </View>
       </View>
-      <BottomButtonView
-        accessibilityLabelPrefix={
-          AccessibilityLabel.PREFIX.BUTTON_ADD_AUTO_SMART
-        }
-        onPressMain={handleOnContinue}
-        style={styles.bottomButton}
-        mainTitle={t('continue')}
-        typeMain={selectedIndex === -1 ? 'disabled' : 'primary'}
-      />
     </View>
   );
 };

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

@@ -16,10 +16,6 @@ const smartTypes = [
     type: AUTOMATE_TYPE.SCHEDULE,
     route: Routes.SetSchedule,
   },
-  {
-    type: AUTOMATE_TYPE.EVENT,
-    route: Routes.SelectMonitorDevices,
-  },
 ];
 
 const AddUnknownTypeSmart = ({ route }) => {

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

@@ -3,7 +3,6 @@ import { act, create } from 'react-test-renderer';
 import AddUnknownTypeSmart from '../AddUnknownTypeSmart';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
-import { AccessibilityLabel } from '../../../../configs/Constants';
 import ItemAutomate from '../../../../commons/Automate/ItemAutomate';
 import Routes from '../../../../utils/Route';
 import { TouchableOpacity } from 'react-native';
@@ -34,7 +33,7 @@ describe('test AddNewAutoSmart', () => {
     });
     const instance = tree.root;
     const items = instance.findAllByType(ItemAutomate);
-    expect(items).toHaveLength(4);
+    expect(items).toHaveLength(3);
 
     const touchItem = items[1].findByType(TouchableOpacity);
 
@@ -42,17 +41,6 @@ describe('test AddNewAutoSmart', () => {
       await touchItem.props.onPress();
     });
 
-    const bottomButton = instance.find(
-      (item) =>
-        item.props.accessibilityLabel ===
-        `${AccessibilityLabel.PREFIX.BUTTON_ADD_AUTO_SMART}${AccessibilityLabel.BOTTOM_VIEW_MAIN}`
-    );
-    expect(bottomButton).toBeDefined();
-
-    await act(async () => {
-      await bottomButton.props.onPress();
-    });
-
     expect(mockNavigate).toBeCalledWith(Routes.SelectMonitorDevices, {
       automate: { unit: 1, type: 'value_change' },
       closeScreen: undefined,
@@ -71,14 +59,6 @@ describe('test AddNewAutoSmart', () => {
     });
     expect(items[2].props.isSelected).toBeTruthy();
 
-    const bottomButton = instance.find(
-      (item) =>
-        item.props.accessibilityLabel ===
-        `${AccessibilityLabel.PREFIX.BUTTON_ADD_AUTO_SMART}${AccessibilityLabel.BOTTOM_VIEW_MAIN}`
-    );
-    await act(async () => {
-      await bottomButton.props.onPress();
-    });
     expect(mockNavigate).toHaveBeenCalledWith(Routes.SetSchedule, {
       automate: { type: 'schedule', unit: 1 },
       closeScreen: undefined,